[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38974] trunk/blender/build_files/buildbot /config: - Switch linux buildbot to FFmpeg-0.8.1

[Sergey Sharybin]

Revision: 38974
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38974
Author:   nazgul
Date:     2011-08-03 09:07:30 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
- Switch linux buildbot to FFmpeg-0.8.1
- Enable FFmpeg for blenderplayer for linux buildbot.

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
    trunk/blender/build_files/buildbot/config/user-config-x86_64.py

Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-08-03 08:02:54 UTC (rev 38973)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-08-03 09:07:30 UTC (rev 38974)
@@ -22,7 +22,7 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
 BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
     '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \

Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-08-03 08:02:54 UTC (rev 38973)
+++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-08-03 09:07:30 UTC (rev 38974)
@@ -13,8 +13,19 @@
 WITH_BF_COLLADA = False
 
 # FFMPEG configuration
-WITH_BF_FFMPEG = False
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
 
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True
 BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.2/libstdc++.a'

Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-08-03 08:02:54 UTC (rev 38973)
+++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-08-03 09:07:30 UTC (rev 38974)
@@ -13,8 +13,19 @@
 WITH_BF_COLLADA = False
 
 # FFMPEG configuration
-WITH_BF_FFMPEG = False
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
 
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True
 BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.2/libstdc++.a'

Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-08-03 08:02:54 UTC (rev 38973)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-08-03 09:07:30 UTC (rev 38974)
@@ -22,7 +22,7 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
 BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
     '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \