[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38983] branches/soc-2011-pepper: * Merging trunk up to r38981.
Joerg Mueller
nexyon at gmail.com
Wed Aug 3 14:44:52 CEST 2011
Revision: 38983
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38983
Author: nexyon
Date: 2011-08-03 12:44:52 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38981
Modified Paths:
--------------
branches/soc-2011-pepper/CMakeLists.txt
branches/soc-2011-pepper/SConstruct
branches/soc-2011-pepper/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-pepper/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-pepper/build_files/buildbot/slave_compile.py
branches/soc-2011-pepper/build_files/buildbot/slave_pack.py
branches/soc-2011-pepper/build_files/scons/config/linux2-config.py
branches/soc-2011-pepper/build_files/scons/config/win32-vc-config.py
branches/soc-2011-pepper/build_files/scons/config/win64-vc-config.py
branches/soc-2011-pepper/build_files/scons/tools/Blender.py
branches/soc-2011-pepper/build_files/scons/tools/btools.py
branches/soc-2011-pepper/doc/python_api/blender-org/static/default.css_t
branches/soc-2011-pepper/intern/ghost/CMakeLists.txt
branches/soc-2011-pepper/intern/ghost/SConscript
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-pepper/release/scripts/modules/bpy/path.py
branches/soc-2011-pepper/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-pepper/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-pepper/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-pepper/source/blender/editors/include/ED_transform.h
branches/soc-2011-pepper/source/blender/editors/screen/glutil.c
branches/soc-2011-pepper/source/blender/editors/space_image/image_ops.c
branches/soc-2011-pepper/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-pepper/source/blender/editors/transform/transform.c
branches/soc-2011-pepper/source/blender/editors/transform/transform_generics.c
branches/soc-2011-pepper/source/blender/editors/transform/transform_ops.c
branches/soc-2011-pepper/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-pepper/source/blender/render/intern/source/rendercore.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/soc-2011-pepper/source/tools/MakeGLStipple.py
Property Changed:
----------------
branches/soc-2011-pepper/
branches/soc-2011-pepper/build_files/cmake/Modules/FindSpacenav.cmake
Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36830-38932
+ /trunk/blender:36830-38981
Modified: branches/soc-2011-pepper/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/CMakeLists.txt 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/CMakeLists.txt 2011-08-03 12:44:52 UTC (rev 38983)
@@ -910,29 +910,16 @@
endif()
if(WITH_PYTHON)
- set(PYTHON_VERSION 3.2)
- if(PYTHON_VERSION MATCHES 3.2)
- # we use precompiled libraries for py 3.2 and up by default
+ # we use precompiled libraries for py 3.2 and up by default
- # normally cached but not since we include them with blender
- set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
- set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
- # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
- else()
- # otherwise, use custom system framework
- # *not used but maintained incase some dev wants to*
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
+ # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+ # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
- set(PYTHON "/System/Library/Frameworks/Python.framework/Versions/" CACHE PATH)
- set(PYTHON_INCLUDE_DIR "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE PATH)
- # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARY "" CACHE FILEPATH)
- set(PYTHON_LIBPATH "${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config" CACHE PATH)
- set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python" CACHE STRING)
- unset(PYTHON)
- endif()
-
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -986,7 +973,17 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
+ PATHS
+ )
+ mark_as_advanced(SYSTEMSTUBS_LIBRARY)
+ if(SYSTEMSTUBS_LIBRARY)
+ set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ else()
+ set(PLATFORM_LINKLIBS stdc++)
+ endif()
if(WITH_COCOA)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
Modified: branches/soc-2011-pepper/SConstruct
===================================================================
--- branches/soc-2011-pepper/SConstruct 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/SConstruct 2011-08-03 12:44:52 UTC (rev 38983)
@@ -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-pepper/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/config/user-config-i686.py 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/build_files/buildbot/config/user-config-i686.py 2011-08-03 12:44:52 UTC (rev 38983)
@@ -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 ' + \
@@ -81,6 +81,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-i686.py 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-i686.py 2011-08-03 12:44:52 UTC (rev 38983)
@@ -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'
@@ -65,6 +76,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-03 12:44:52 UTC (rev 38983)
@@ -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'
@@ -65,6 +76,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-pepper/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/config/user-config-x86_64.py 2011-08-03 12:20:07 UTC (rev 38982)
+++ branches/soc-2011-pepper/build_files/buildbot/config/user-config-x86_64.py 2011-08-03 12:44:52 UTC (rev 38983)
@@ -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 ' + \
@@ -81,6 +81,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-pepper/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/slave_compile.py 2011-08-03 12:20:07 UTC (rev 38982)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list