summaryrefslogtreecommitdiffstats
path: root/abs/core/python_modules/python-pymedia/pymedia-1.3.7.3-amd64-gentoo.diff
blob: 801eccffc1e306a57cd49afe0bededb951f6d638 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
diff -ru pymedia-1.3.7.3/audio/inttypes.h pymedia-1.3.7.3-amd64/audio/inttypes.h
--- pymedia-1.3.7.3/audio/inttypes.h	2006-06-13 13:32:22.000000000 -0700
+++ pymedia-1.3.7.3-amd64/audio/inttypes.h	2008-03-26 08:05:57.000000000 -0700
@@ -2,6 +2,7 @@
 #if !defined( __INTTYPES_H__ )
 #define __INTTYPES_H__
 
+#include <stdint.h>
 #if defined( _STDINT_H )
 
 	typedef unsigned short UINT16;
diff -ru pymedia-1.3.7.3/setup.py pymedia-1.3.7.3-amd64/setup.py
--- pymedia-1.3.7.3/setup.py	2006-06-19 23:04:43.000000000 -0700
+++ pymedia-1.3.7.3-amd64/setup.py	2008-03-26 08:16:04.000000000 -0700
@@ -216,7 +216,7 @@
 		FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES
 else:
 		print 'Using UNIX configuration...\n'
-		disable_fPIC()
+		#disable_fPIC()
 		dep= config.Dependency_unix
 		inc_hunt = [ 
 			'/usr/include', 
@@ -224,13 +224,13 @@
 			'/usr/local/include', 
 			'/usr/local/include/lame',]
 		lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]
-		LIBS= []
+		LIBS= ['avcodec', 'avformat']
 		DEFINES+= [
 			('PATH_DEV_DSP', '"/dev/dsp"' ), 
 			('PATH_DEV_MIXER','"/dev/mixer"' ), 
 			('_FILE_OFFSET_BITS',64),
 			('ACCEL_DETECT',1),	
-			('HAVE_MMX', '1' ),
+			('HAVE_LRINTF', '1' ),
 		] 
 		if sys.platform== 'cygwin':
 			DEFINES+= [	
@@ -243,13 +243,13 @@
 				('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),
 			]
 
-		FILES[ 'video.vcodec' ][ 'libavcodec' ]+= MMX_FILES
+		FILES[ 'video.vcodec' ][ 'libavcodec' ]#+= MMX_FILES
 
 DEPS = [
 		dep('OGG', 'libogg-[1-9].*', 'ogg/ogg.h', 'libogg', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
 		dep('VORBIS', 'libvorbis-[1-9].*', 'vorbis/codec.h', 'libvorbis', 'CONFIG_VORBIS' ).configure(inc_hunt,lib_hunt),
 		dep('FAAD', 'libfaad2', 'faad.h', 'libfaad', 'CONFIG_FAAD').configure(inc_hunt,lib_hunt),
-		dep('MP3LAME', 'lame-3.95.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),
+		dep('MP3LAME', 'lame-3.96.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),
 		dep('VORBISENC', 'libvorbis-[1-9].*','vorbis/vorbisenc.h','libvorbisenc', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
 		dep('ALSA', 'libasound','alsa/asoundlib.h','libasound', 'CONFIG_ALSA').configure(inc_hunt,lib_hunt),
 ]
@@ -260,7 +260,7 @@
 DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]
 LIBS+= [ x.lib for x in DEPS ]
 
-choice = raw_input('Continue building '+MODULE_NAME+' ? [Y,n]:')
+choice = 'Y'
 if choice== 'n':
 		print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'
 		sys.exit()