Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > cc1449fd094f04e3bf58d09425996df5 > files > 15

blender-2.49b-11.3.mga1.src.rpm

diff -p -up blender-2.49/extern/ffmpeg/SConscript.legal blender-2.49/extern/ffmpeg/SConscript
--- blender-2.49/extern/ffmpeg/SConscript.legal	2009-03-22 21:59:32.000000000 +0100
+++ blender-2.49/extern/ffmpeg/SConscript	2009-05-30 22:53:00.000000000 +0200
@@ -9,7 +9,7 @@ root = "extern/ffmpeg"
 if env['OURPLATFORM'] == 'win32-mingw':
     ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
 else:
-    ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame --disable-bzlib --disable-outdevs --disable-demuxer=alsa"
+    ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --disable-bzlib --disable-outdevs --disable-demuxer=alsa"
     if env['OURPLATFORM'] == 'darwin':
         ffmpeg_switches += " --disable-mmx"
 
@@ -18,7 +18,7 @@ if env['WITH_BF_OGG']:
 
 #--enable-libx264
 extra_variables = { }
-extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ]
+extra_includes = [ ]
 #
 
 import sys
diff -p -up blender-2.49/extern/SConscript.legal blender-2.49/extern/SConscript
--- blender-2.49/extern/SConscript.legal	2009-02-25 13:07:51.000000000 +0100
+++ blender-2.49/extern/SConscript	2009-05-30 22:39:02.000000000 +0200
@@ -18,9 +18,9 @@ if env['WITH_BF_VERSE']:
     SConscript(['verse/dist/SConstruct'])
 
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
-    SConscript(['x264/SConscript'])
-    SConscript(['libmp3lame/SConscript'])
-    SConscript(['xvidcore/SConscript'])
+#    SConscript(['x264/SConscript'])
+#    SConscript(['libmp3lame/SConscript'])
+#    SConscript(['xvidcore/SConscript'])
     SConscript(['ffmpeg/SConscript'])
 
 if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':