[patch] See comments 1 and 2 from ebuild #2

pymedia_libs.patch (text/plain), 2.87 KB, created by Mark Lee on 2005-10-29 22:57:45 UTC

--- setup.py.old	2005-10-26 17:59:46.000000000 -0700
+++ setup.py	2005-10-26 18:23:40.000000000 -0700
@@ -70,38 +70,6 @@
 			'acodec/acodec.c',
 			'mem.c'
 		),
-		'libavformat':
-		(
-			'utils.c',
-			'raw.c',
-			'avienc.c',
-			'asf.c',
-			'mov.c',
-			'aviobuf.c',
-			'ogg.c',
-			'wav.c',
-		),
-		'libavcodec':
-		(
-			'utils.c',
-			'wmadec.c',
-			'a52dec.c',
-			'liba52/bit_allocate.c',
-			'liba52/bitstream.c',
-			'liba52/downmix.c',
-			'liba52/imdct.c',
-			'liba52/parse.c',
-			'liba52/crc.c',
-			'faad.c',
-			'oggvorbis.c',
-			'common.c',
-			'mpegaudiodec.c',
-			'fft.c',
-			'mdct.c',
-			'mpegaudio.c',
-			'ac3enc.c',
-			'mp3lameaudio.c',
-		),
 	},
 	'video.muxer':
 	{
@@ -113,18 +81,6 @@
 			'mem.c',
 			'common.c'
 		),
-		'libavformat':
-		(
-			'cutils.c',
-			'utils.c',
-			'mov.c',
-			'avienc.c',
-			'avidec.c',
-			'asf.c',
-			'aviobuf.c',
-			'mpegts.c',
-			'mpeg.c',
-		),
 	},
 	'video.vcodec':
 	{
@@ -135,34 +91,6 @@
 			'mem.c',
 			'common.c'
 		),
-		'libavcodec':
-		[
-			'cabac.c',
-			'error_resilience.c',
-			'eval.c',
-			'golomb.c',
-			'h263.c',
-			'h263dec.c',
-			'h264.c',
-			'imgconvert.c',
-			'imgresample.c',
-			'jfdctfst.c',
-			'jfdctint.c',
-			'jrevdct.c',
-			'mjpeg.c',
-			'mpeg12.c',
-			'msmpeg4.c',
-			'rv10.c',
-			'simple_idct.c',
-			'svq1.c',
-			'utils.c',
-			'xvmcvideo.c',
-			'mpegvideo.c',
-			'dsputil.c',
-			'motion_est.c',
-			'ratecontrol.c',
-			'opts.c',
-		],
 	},
 	'removable.cd':
 	{
@@ -233,7 +161,7 @@
 			'/usr/local/include', 
 			'/usr/local/include/lame',]
 		lib_hunt = [ '/usr/lib', '/usr/local/lib', ]
-		LIBS= []
+		LIBS= ['avcodec', 'avformat']
 		DEFINES+= [
 			('PATH_DEV_DSP', '"/dev/dsp"' ), 
 			('PATH_DEV_MIXER','"/dev/mixer"' ), 
@@ -253,13 +181,11 @@
 			]
 			FILES.update( CLE266_HW )
 
-		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.9[56].*', '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),
 ]
 
@@ -269,7 +195,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()