[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36796] trunk/blender/build_files/buildbot /config: buildbot:

[Sergey Sharybin]

Revision: 36796
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36796
Author:   nazgul
Date:     2011-05-20 13:06:19 +0000 (Fri, 20 May 2011)
Log Message:
-----------
buildbot:
ffmpeg was compuled with faad now (aac support which keeps
libs gpl2 compatibile).
Updating library dependencies for buildbot rules.

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-i686.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-05-20 12:26:01 UTC (rev 36795)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-05-20 13:06:19 UTC (rev 36796)
@@ -29,7 +29,8 @@
     '${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}/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

Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-05-20 12:26:01 UTC (rev 36795)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-05-20 13:06:19 UTC (rev 36796)
@@ -29,7 +29,8 @@
     '${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}/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