[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39627] trunk/blender: FFmpeg library update:

Sergey Sharybin g.ulairi at gmail.com
Mon Aug 22 20:49:42 CEST 2011


Revision: 39627
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39627
Author:   nazgul
Date:     2011-08-22 18:49:42 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
FFmpeg library update:

- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/buildbot/slave_compile.py
    trunk/blender/build_files/buildbot/slave_pack.py
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/CMakeLists.txt	2011-08-22 18:49:42 UTC (rev 39627)
@@ -710,11 +710,11 @@
 				${LIBDIR}/ffmpeg/include/msvc
 			)
 			set(FFMPEG_LIBRARIES
-				${LIBDIR}/ffmpeg/lib/avcodec-52.lib
-				${LIBDIR}/ffmpeg/lib/avformat-52.lib
-				${LIBDIR}/ffmpeg/lib/avdevice-52.lib
-				${LIBDIR}/ffmpeg/lib/avutil-50.lib
-				${LIBDIR}/ffmpeg/lib/swscale-0.lib
+				${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+				${LIBDIR}/ffmpeg/lib/avformat-53.lib
+				${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+				${LIBDIR}/ffmpeg/lib/avutil-51.lib
+				${LIBDIR}/ffmpeg/lib/swscale-2.lib
 			)
 		endif()
 
@@ -841,7 +841,7 @@
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
-			set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+			set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
 

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -108,32 +108,12 @@
 
         sys.exit(0)
     else:
-        bitness = '32'
-        # Switch to new FFmpeg library
         if builder.find('win') != -1:
-            if builder.find('win32') != -1:
-                LCGDIR = '#../lib/windows'
-            elif builder.find('win64') != -1:
-                LCGDIR = '#../lib/win64'
+            bitness = '32'
+
+            if builder.find('win64') != -1:
                 bitness = '64'
 
-            all_ffmpeg_libs = ['avcodec-53',
-                               'avdevice-53',
-                               'avformat-53',
-                               'avutil-51',
-                               'swscale-2']
-
-            ffmpeg_lib = []
-            ffmpeg_dll = []
-
-            for lib in all_ffmpeg_libs:
-                ffmpeg_lib.append(lib + '.lib')
-                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
-
-            scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
-            scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
-            scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
-
             scons_options.append('BF_BITNESS=' + bitness)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/buildbot/slave_pack.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -72,32 +72,12 @@
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
     else:
-        bitness = '32'
-        # Switch to new FFmpeg library
         if builder.find('win') != -1:
-            if builder.find('win32') != -1:
-                LCGDIR = '#../lib/windows'
-            elif builder.find('win64') != -1:
-                LCGDIR = '#../lib/win64'
+            bitness = '32'
+
+            if builder.find('win64') != -1:
                 bitness = '64'
 
-            all_ffmpeg_libs = ['avcodec-53',
-                               'avdevice-53',
-                               'avformat-53',
-                               'avutil-51',
-                               'swscale-2']
-
-            ffmpeg_lib = []
-            ffmpeg_dll = []
-
-            for lib in all_ffmpeg_libs:
-                ffmpeg_lib.append(lib + '.lib')
-                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
-
-            scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
-            scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
-            scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
-
             scons_options.append('BF_BITNESS=' + bitness)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)

Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -126,7 +126,7 @@
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR + '/ffmpeg'
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
 

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -18,7 +18,7 @@
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
 

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -6,8 +6,8 @@
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.2'

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-08-22 18:49:42 UTC (rev 39627)
@@ -6,8 +6,8 @@
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.2'

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-08-22 18:47:40 UTC (rev 39626)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-08-22 18:49:42 UTC (rev 39627)
@@ -545,11 +545,11 @@
 	if(WITH_CODEC_FFMPEG)
 		install(
 			FILES
-				${LIBDIR}/ffmpeg/lib/avcodec-52.dll
-				${LIBDIR}/ffmpeg/lib/avformat-52.dll
-				${LIBDIR}/ffmpeg/lib/avdevice-52.dll
-				${LIBDIR}/ffmpeg/lib/avutil-50.dll
-				${LIBDIR}/ffmpeg/lib/swscale-0.dll
+				${LIBDIR}/ffmpeg/lib/avcodec-53.dll
+				${LIBDIR}/ffmpeg/lib/avformat-53.dll
+				${LIBDIR}/ffmpeg/lib/avdevice-53.dll
+				${LIBDIR}/ffmpeg/lib/avutil-51.dll
+				${LIBDIR}/ffmpeg/lib/swscale-2.dll
 			DESTINATION ${TARGETDIR}
 		)
 




More information about the Bf-blender-cvs mailing list