[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39032] branches/soc-2011-salad: Merging r38952 through r39031 from trunk into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Thu Aug 4 19:47:30 CEST 2011
Revision: 39032
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39032
Author: nazgul
Date: 2011-08-04 17:47:29 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
Merging r38952 through r39031 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38952
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39031
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/SConstruct
branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-salad/build_files/buildbot/master.cfg
branches/soc-2011-salad/build_files/buildbot/slave_compile.py
branches/soc-2011-salad/build_files/buildbot/slave_pack.py
branches/soc-2011-salad/build_files/scons/config/darwin-config.py
branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
branches/soc-2011-salad/build_files/scons/tools/btools.py
branches/soc-2011-salad/doc/python_api/blender-org/static/default.css_t
branches/soc-2011-salad/doc/python_api/rst/bge.constraints.rst
branches/soc-2011-salad/doc/python_api/rst/bge.texture.rst
branches/soc-2011-salad/doc/python_api/rst/bgl.rst
branches/soc-2011-salad/intern/ghost/CMakeLists.txt
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerWin32.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-salad/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-salad/source/blender/editors/include/ED_transform.h
branches/soc-2011-salad/source/blender/editors/include/UI_resources.h
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/screen/glutil.c
branches/soc-2011-salad/source/blender/editors/space_image/image_ops.c
branches/soc-2011-salad/source/blender/editors/space_node/drawnode.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
branches/soc-2011-salad/source/blender/editors/transform/transform_ops.c
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/python/intern/bpy_driver.c
branches/soc-2011-salad/source/blender/python/intern/bpy_operator.c
branches/soc-2011-salad/source/blender/render/intern/source/rendercore.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/soc-2011-salad/source/tools/MakeGLStipple.py
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662,39001,39009
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-38952
/trunk/blender:36834-38951
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662,39001,39009
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-38952
/trunk/blender:36834-39031
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-08-04 17:47:29 UTC (rev 39032)
@@ -1002,9 +1002,24 @@
elseif(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
endif()
+
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+ if(WITH_INPUT_NDOF)
+ # This thread it *should* work and check the framework - campbell
+ # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+ find_library(3D_CONNEXION_CLIENT_LIBRARY
+ NAMES 3DconnexionClient
+ )
+ if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
+ endif()
+
else()
set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ set(WITH_INPUT_NDOF OFF) # unsupported
endif()
if(WITH_OPENCOLLADA)
Modified: branches/soc-2011-salad/SConstruct
===================================================================
--- branches/soc-2011-salad/SConstruct 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/SConstruct 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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)
@@ -248,7 +253,16 @@
if k not in B.arguments:
env[k] = v
+# detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX
+if env['OURPLATFORM']=='darwin':
+ envi = Environment()
+ conf = Configure(envi)
+ if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it is c++ !
+ print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+ env['WITH_BF_3DMOUSE'] = 0
+ envi = conf.Finish()
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
@@ -659,11 +673,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-salad/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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-salad/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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-salad/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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-salad/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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-salad/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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-salad/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/slave_compile.py 2011-08-04 17:15:10 UTC (rev 39031)
+++ branches/soc-2011-salad/build_files/buildbot/slave_compile.py 2011-08-04 17:47:29 UTC (rev 39032)
@@ -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 = []
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list