[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51923] branches/soc-2011-tomato: Merging r51897 through r51922 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Nov 5 20:58:00 CET 2012
Revision: 51923
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51923
Author: nazgul
Date: 2012-11-05 19:57:59 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Merging r51897 through r51922 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51897
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51922
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh
branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py
branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp
branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
branches/soc-2011-tomato/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DelayReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DoubleReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EffectReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LoopReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ReverseReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SquareFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SumFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SumFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_SuperposeReader.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_VolumeFactory.h
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/intern/audaspace/SConscript
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_BufferReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileWriter.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_MixerFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ResampleReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerEntry.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerReader.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SilenceFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SinusFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/soc-2011-tomato/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/soc-2011-tomato/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
branches/soc-2011-tomato/intern/cycles/render/tile.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_util.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/SConscript
branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Converter/SConscript
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
Added Paths:
-----------
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Sequencer.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Sequencer.h
Removed Paths:
-------------
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_ReferenceHandler.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-51896
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-51922
Modified: branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh 2012-11-05 19:57:59 UTC (rev 51923)
@@ -715,7 +715,7 @@
# NOTE: this sounds strange, but make sure /dev/shm/ is writable by your user,
# otherwise syncronization primitives wouldn't be included into python
-if [[ "`stat -c '%a' /dev/shm/`" != "777" ]]; then
+if [[ "\`stat -c '%a' /dev/shm/\`" != "777" ]]; then
echo "Error checking syncronization primitives"
exit 1
fi
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -93,6 +93,14 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/lib/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
+ '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
WITH_BF_STATICJACK = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -93,6 +93,14 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/lib/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
+ '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
WITH_BF_STATICJACK = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
@@ -90,6 +90,13 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
@@ -90,6 +90,13 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2012-11-05 19:57:59 UTC (rev 51923)
@@ -34,7 +34,7 @@
SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
ENDIF()
-SET(PYTHON_VERSION 3.2 CACHE STRING "Python Version (major and minor only)")
+SET(PYTHON_VERSION 3.3 CACHE STRING "Python Version (major and minor only)")
MARK_AS_ADVANCED(PYTHON_VERSION)
Modified: branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py 2012-11-05 19:57:59 UTC (rev 51923)
@@ -5,7 +5,7 @@
python = "/usr"
abi_flags = "m" # Most common for linux distros
- version = "3.2"
+ version = "3.3"
# Determine ABI flags used on this system
include = os.path.join(python, "include")
Modified: branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp
===================================================================
--- branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp 2012-11-05 19:57:59 UTC (rev 51923)
@@ -1106,7 +1106,8 @@
}
// copy up to the end of the path.
- std::copy(base_loop.begin() + pos, base_loop.begin() + e1_1, std::back_inserter(out));
+ if (pos < e1_1)
+ std::copy(base_loop.begin() + pos, base_loop.begin() + e1_1, std::back_inserter(out));
CARVE_ASSERT(base_loop[e1_1] == p1.back());
std::copy(p1.rbegin(), p1.rend() - 1, std::back_inserter(out));
Modified: branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt 2012-11-05 19:49:30 UTC (rev 51922)
+++ branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt 2012-11-05 19:57:59 UTC (rev 51923)
@@ -28,6 +28,7 @@
set(INC_SYS
${PTHREADS_INCLUDE_DIRS}
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
@@ -115,11 +116,11 @@
intern/AUD_PyInit.h
intern/AUD_ReadDevice.cpp
intern/AUD_ReadDevice.h
- intern/AUD_Reference.h
- intern/AUD_ReferenceHandler.cpp
intern/AUD_ResampleFactory.h
intern/AUD_ResampleReader.cpp
intern/AUD_ResampleReader.h
+ intern/AUD_Sequencer.cpp
+ intern/AUD_Sequencer.h
intern/AUD_SequencerEntry.cpp
intern/AUD_SequencerEntry.h
intern/AUD_SequencerFactory.cpp
@@ -150,6 +151,7 @@
FX/AUD_DelayReader.h
FX/AUD_DoubleFactory.h
FX/AUD_DoubleReader.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list