[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38988] branches/soc-2011-tomato: Merging r38951 through r38987 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Wed Aug 3 16:02:09 CEST 2011
Revision: 38988
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38988
Author: nazgul
Date: 2011-08-03 14:02:08 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Merging r38951 through r38987 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38951
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38987
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-tomato/build_files/buildbot/master.cfg
branches/soc-2011-tomato/build_files/buildbot/slave_compile.py
branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/python_api/blender-org/static/default.css_t
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-tomato/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/soc-2011-tomato/source/tools/MakeGLStipple.py
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-38950
+ /trunk/blender:36831-38987
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-08-03 14:02:08 UTC (rev 38988)
@@ -182,7 +182,7 @@
option(WITH_LIBMV "Enable libmv structure from motion library" ON)
# Misc
-option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" OFF)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/SConstruct 2011-08-03 14:02:08 UTC (rev 38988)
@@ -111,6 +111,11 @@
# handling cmd line arguments & config file
+# bitness stuff
+tempbitness = int(B.arguments.get('BF_BITNESS', bitness)) # default to bitness found as per starting python
+if tempbitness in (32, 64): # only set if 32 or 64 has been given
+ bitness = int(tempbitness)
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
@@ -659,11 +664,7 @@
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
if env['WITH_BF_FFMPEG']:
- dllsources += ['${BF_FFMPEG_LIBPATH}/avcodec-52.dll',
- '${BF_FFMPEG_LIBPATH}/avformat-52.dll',
- '${BF_FFMPEG_LIBPATH}/avdevice-52.dll',
- '${BF_FFMPEG_LIBPATH}/avutil-50.dll',
- '${BF_FFMPEG_LIBPATH}/swscale-0.dll']
+ dllsources += env['BF_FFMPEG_DLL'].split()
# Since the thumb handler is loaded by Explorer, architecture is
# strict: the x86 build fails on x64 Windows. We need to ship
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -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: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -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: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -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: branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -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 ' + \
Modified: branches/soc-2011-tomato/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-08-03 14:02:08 UTC (rev 38988)
@@ -116,6 +116,7 @@
add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
+add_builder(c, 'win64_scons', 'windows', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: branches/soc-2011-tomato/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/slave_compile.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/slave_compile.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -108,5 +108,33 @@
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 = '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)
sys.exit(retcode)
Modified: branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2011-08-03 13:34:49 UTC (rev 38987)
+++ branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2011-08-03 14:02:08 UTC (rev 38988)
@@ -72,6 +72,34 @@
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 = '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')
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list