Attachment #147406 for bug #70480

Lines 2-7 Link Here

(-)pymedia-1.3.7.3/audio/inttypes.h (+1 lines)
2	#if !defined( __INTTYPES_H__ )	2	#if !defined( __INTTYPES_H__ )
3	#define __INTTYPES_H__	3	#define __INTTYPES_H__
4		4
		5	#include <stdint.h>
5	#if defined( _STDINT_H )	6	#if defined( _STDINT_H )
6		7
7	typedef unsigned short UINT16;	8	typedef unsigned short UINT16;




		FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES
else:
		print 'Using UNIX configuration...\n'
		#disable_fPIC()
		dep= config.Dependency_unix
		inc_hunt = [ 
			'/usr/include', 

			'/usr/local/include', 
			'/usr/local/include/lame',]
		lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]
		LIBS= ['avcodec', 'avformat']
		DEFINES+= [
			('PATH_DEV_DSP', '"/dev/dsp"' ), 
			('PATH_DEV_MIXER','"/dev/mixer"' ), 
			('_FILE_OFFSET_BITS',64),
			('ACCEL_DETECT',1),	
			('HAVE_LRINTF', '1' ),
		] 
		if sys.platform== 'cygwin':
			DEFINES+= [	

				('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),
			]

		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.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),
]

DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]
LIBS+= [ x.lib for x in DEPS ]

choice = 'Y'
if choice== 'n':
		print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'
		sys.exit()

Return to bug 70480

Lines 216-222 Link Here

(-)pymedia-1.3.7.3/setup.py (-6 / +6 lines)
216	FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES	216	FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES
217	else:	217	else:
218	print 'Using UNIX configuration...\n'	218	print 'Using UNIX configuration...\n'
219	disable_fPIC()	219	#disable_fPIC()
220	dep= config.Dependency_unix	220	dep= config.Dependency_unix
221	inc_hunt = [	221	inc_hunt = [
222	'/usr/include',	222	'/usr/include',
Lines 224-236 Link Here
224	'/usr/local/include',	224	'/usr/local/include',
225	'/usr/local/include/lame',]	225	'/usr/local/include/lame',]
226	lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]	226	lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]
227	LIBS= []	227	LIBS= ['avcodec', 'avformat']
228	DEFINES+= [	228	DEFINES+= [
229	('PATH_DEV_DSP', '"/dev/dsp"' ),	229	('PATH_DEV_DSP', '"/dev/dsp"' ),
230	('PATH_DEV_MIXER','"/dev/mixer"' ),	230	('PATH_DEV_MIXER','"/dev/mixer"' ),
231	('_FILE_OFFSET_BITS',64),	231	('_FILE_OFFSET_BITS',64),
232	('ACCEL_DETECT',1),	232	('ACCEL_DETECT',1),
233	('HAVE_MMX', '1' ),	233	('HAVE_LRINTF', '1' ),
234	]	234	]
235	if sys.platform== 'cygwin':	235	if sys.platform== 'cygwin':
236	DEFINES+= [	236	DEFINES+= [
Lines 243-255 Link Here
243	('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),	243	('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),
244	]	244	]
245		245
246	FILES[ 'video.vcodec' ][ 'libavcodec' ]+= MMX_FILES	246	FILES[ 'video.vcodec' ][ 'libavcodec' ]#+= MMX_FILES
247		247
248	DEPS = [	248	DEPS = [
249	dep('OGG', 'libogg-[1-9].*', 'ogg/ogg.h', 'libogg', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),	249	dep('OGG', 'libogg-[1-9].*', 'ogg/ogg.h', 'libogg', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
250	dep('VORBIS', 'libvorbis-[1-9].*', 'vorbis/codec.h', 'libvorbis', 'CONFIG_VORBIS' ).configure(inc_hunt,lib_hunt),	250	dep('VORBIS', 'libvorbis-[1-9].*', 'vorbis/codec.h', 'libvorbis', 'CONFIG_VORBIS' ).configure(inc_hunt,lib_hunt),
251	dep('FAAD', 'libfaad2', 'faad.h', 'libfaad', 'CONFIG_FAAD').configure(inc_hunt,lib_hunt),	251	dep('FAAD', 'libfaad2', 'faad.h', 'libfaad', 'CONFIG_FAAD').configure(inc_hunt,lib_hunt),
252	dep('MP3LAME', 'lame-3.95.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),	252	dep('MP3LAME', 'lame-3.96.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),
253	dep('VORBISENC', 'libvorbis-[1-9].*','vorbis/vorbisenc.h','libvorbisenc', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),	253	dep('VORBISENC', 'libvorbis-[1-9].*','vorbis/vorbisenc.h','libvorbisenc', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
254	dep('ALSA', 'libasound','alsa/asoundlib.h','libasound', 'CONFIG_ALSA').configure(inc_hunt,lib_hunt),	254	dep('ALSA', 'libasound','alsa/asoundlib.h','libasound', 'CONFIG_ALSA').configure(inc_hunt,lib_hunt),
255	]	255	]
Lines 260-266 Link Here
260	DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]	260	DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]
261	LIBS+= [ x.lib for x in DEPS ]	261	LIBS+= [ x.lib for x in DEPS ]
262		262
263	choice = raw_input('Continue building '+MODULE_NAME+' ? [Y,n]:')	263	choice = 'Y'
264	if choice== 'n':	264	if choice== 'n':
265	print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'	265	print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'
266	sys.exit()	266	sys.exit()