[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57134] branches/soc-2011-tomato: Merging r57122 through r57133 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu May 30 11:39:24 CEST 2013
Revision: 57134
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57134
Author: nazgul
Date: 2013-05-30 09:39:23 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Merging r57122 through r57133 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57122
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57133
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py
branches/soc-2011-tomato/build_files/scons/config/linux-config.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/intern/opennl/superlu/smemory.c
branches/soc-2011-tomato/release/datafiles/splash.png
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_sys_types.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/SConscript
branches/soc-2011-tomato/source/blender/editors/animation/SConscript
branches/soc-2011-tomato/source/blender/editors/armature/SConscript
branches/soc-2011-tomato/source/blender/editors/curve/SConscript
branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/SConscript
branches/soc-2011-tomato/source/blender/editors/mesh/SConscript
branches/soc-2011-tomato/source/blender/editors/metaball/SConscript
branches/soc-2011-tomato/source/blender/editors/physics/SConscript
branches/soc-2011-tomato/source/blender/editors/screen/SConscript
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_action/SConscript
branches/soc-2011-tomato/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_api/SConscript
branches/soc-2011-tomato/source/blender/editors/space_nla/SConscript
branches/soc-2011-tomato/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_time/SConscript
branches/soc-2011-tomato/source/blender/editors/transform/SConscript
branches/soc-2011-tomato/source/blender/editors/util/SConscript
branches/soc-2011-tomato/source/blender/editors/uvedit/SConscript
branches/soc-2011-tomato/source/blender/nodes/SConscript
branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/SConscript
branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-tomato/source/blender/windowmanager/SConscript
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/SConscript
branches/soc-2011-tomato/source/gameengine/Converter/SConscript
branches/soc-2011-tomato/source/gameengine/Expressions/SConscript
branches/soc-2011-tomato/source/gameengine/GameLogic/SConscript
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/SConscript
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
branches/soc-2011-tomato/source/gameengine/Network/LoopBackNetwork/SConscript
branches/soc-2011-tomato/source/gameengine/Network/SConscript
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/SConscript
branches/soc-2011-tomato/source/gameengine/Physics/Dummy/SConscript
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2011-tomato/source/gameengine/Rasterizer/SConscript
branches/soc-2011-tomato/source/gameengine/SceneGraph/SConscript
branches/soc-2011-tomato/source/gameengine/VideoTexture/SConscript
Removed Paths:
-------------
branches/soc-2011-tomato/intern/opennl/superlu/superlu_sys_types.h
branches/soc-2011-tomato/source/blender/blenloader/BLO_sys_types.h
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:ignore
- *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4
+ BUILD_NOTES.txt
*.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4
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-57121
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-57133
Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-05-30 09:03:49 UTC (rev 57133)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-05-30 09:39:23 UTC (rev 57134)
@@ -67,6 +67,8 @@
Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
All static linking: \$ALL_STATIC (use --all-static option to enable it).
+WARNING: Static build works fine with CMake, but with scons it may be tricky to get a valid Blender build!
+
Example:
Full install without OpenCOLLADA: --with-all --skip-opencollada
@@ -3022,20 +3024,31 @@
INFO "BF_PYTHON = '$INST/python-$PYTHON_VERSION_MIN'"
INFO "BF_PYTHON_ABI_FLAGS = 'm'"
fi
+ if $ALL_STATIC; then
+ INFO "WITH_BF_STATICPYTHON = True"
+ fi
INFO "WITH_BF_OCIO = True"
if [ -d $INST/ocio ]; then
INFO "BF_OCIO = '$INST/ocio'"
fi
+ # XXX Always static for now :/
+ INFO "WITH_BF_STATICOCIO = True"
if [ -d $INST/openexr ]; then
INFO "BF_OPENEXR = '$INST/openexr'"
fi
+ # XXX Always static for now :/
+ INFO "WITH_BF_STATICOPENEXR = True"
INFO "WITH_BF_OIIO = True"
if [ -d $INST/oiio ]; then
INFO "BF_OIIO = '$INST/oiio'"
fi
+ # XXX No more static oiio for now :/
+ #if $ALL_STATIC; then
+ #INFO "WITH_BF_STATICOIIO = True"
+ #fi
INFO "WITH_BF_CYCLES = True"
if [ -d $INST/osl ]; then
@@ -3046,12 +3059,28 @@
if [ -d $INST/boost ]; then
INFO "BF_BOOST = '$INST/boost'"
fi
+ # XXX Broken in scons...
+ #if $ALL_STATIC; then
+ #INFO "WITH_BF_STATICBOOST = True"
+ #fi
+ if $WITH_OPENCOLLADA; then
+ INFO "WITH_BF_COLLADA = True"
+ if [ -d $INST/opencollada ]; then
+ INFO "BF_OPENCOLLADA = '$INST/opencollada'"
+ fi
+ fi
+
_ffmpeg_list_sep=" "
- INFO "BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice `print_info_ffmpeglink`'"
if [ -d $INST/ffmpeg ]; then
INFO "BF_FFMPEG = '$INST/ffmpeg'"
fi
+ if $ALL_STATIC; then
+ INFO "WITH_BF_STATICFFMPEG = True"
+ INFO "BF_FFMPEG_LIB_STATIC = '\${BF_FFMPEG_LIBPATH}/libavformat.a \${BF_FFMPEG_LIBPATH}/libavcodec.a \${BF_FFMPEG_LIBPATH}/libswscale.a \${BF_FFMPEG_LIBPATH}/libavutil.a \${BF_FFMPEG_LIBPATH}/libavdevice.a `print_info_ffmpeglink`'"
+ else
+ INFO "BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice `print_info_ffmpeglink`'"
+ fi
if ! $WITH_ALL; then
INFO "WITH_BF_3DMOUSE = False"
@@ -3060,15 +3089,13 @@
INFO "WITH_BF_3DMOUSE = False"
fi
- #INFO ""
- #INFO ""
- #INFO "WARNING: If this script had to build boost and/or OIIO into $INST, and you are dynamically linking "
- #INFO " blender against it, you will have to run those commands as root user:"
- #INFO ""
- #INFO " echo \"$INST/boost/lib\" > /etc/ld.so.conf.d/boost.conf"
- #INFO " echo \"$INST/oiio/lib\" > /etc/ld.so.conf.d/oiio.conf"
- #INFO " ldconfig"
- #INFO ""
+ if $ALL_STATIC; then
+ INFO "LLIB = ["xml2", "expat"] + LLIB"
+
+ INFO ""
+ INFO "NOTE: static build with scons are very tricky to set-up, if you choose that option"
+ INFO " you will likely have to edit these settings manually!"
+ INFO ""
}
#### "Main" ####
Modified: branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py 2013-05-30 09:03:49 UTC (rev 57133)
+++ branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py 2013-05-30 09:39:23 UTC (rev 57134)
@@ -7,6 +7,8 @@
abi_flags = "m" # Most common for linux distros
version = "3.3"
+ _arch = "x86_64-linux-gnu"
+
# Determine ABI flags used on this system
include = os.path.join(python, "include")
for cur_flags in all_abi_flags:
@@ -16,10 +18,8 @@
break
# Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir.
- incconf64 = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags, "pyconfig.h")
- if os.path.exists(incconf64):
- incconf = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags)
- else:
+ incconf = os.path.join(include, _arch, "python" + version + cur_flags)
+ if not os.path.exists(os.path.join(incconf, "pyconfig.h")):
incconf = ''
# Determine whether python is in /usr/lib or /usr/lib64
@@ -33,8 +33,19 @@
# roll back to default value
libpath = "${BF_PYTHON}/lib"
- return {'PYTHON': python,
+ libpath_arch = libpath
+ _libpath_arch = os.path.join(python, "lib", _arch) # No lib64 stuff with recent deb-like distro afaik...
+ _libs = ["libpython" + version + abi_flags + ext for ext in (".so", ".a")]
+ for l in _libs:
+ print os.path.join(libpath, l), os.path.exists(os.path.join(libpath, l))
+ print os.path.join(_libpath_arch, l), os.path.exists(os.path.join(_libpath_arch, l))
+ if not os.path.exists(os.path.join(libpath, l)) and os.path.exists(os.path.join(_libpath_arch, l)):
+ libpath_arch = os.path.join(libpath, _arch)
+ break
+
+ return {"PYTHON": python,
"VERSION": version,
- 'LIBPATH': libpath,
- 'ABI_FLAGS': abi_flags,
- 'CONFIG': incconf}
+ "LIBPATH": libpath,
+ "LIBPATH_ARCH": libpath_arch,
+ "ABI_FLAGS": abi_flags,
+ "CONFIG": incconf}
Modified: branches/soc-2011-tomato/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linux-config.py 2013-05-30 09:03:49 UTC (rev 57133)
+++ branches/soc-2011-tomato/build_files/scons/config/linux-config.py 2013-05-30 09:39:23 UTC (rev 57134)
@@ -5,6 +5,7 @@
BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
BF_PYTHON = py['PYTHON']
BF_PYTHON_LIBPATH = py['LIBPATH']
+BF_PYTHON_LIBPATH_ARCH = py['LIBPATH_ARCH']
BF_PYTHON_CONFIG = py['CONFIG']
BF_PYTHON_VERSION = py['VERSION']
WITH_BF_STATICPYTHON = False
@@ -12,7 +13,7 @@
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON_LIBPATH_ARCH}/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
@@ -160,9 +161,9 @@
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
BF_PCRE = ''
BF_PCRE_LIB = 'pcre'
BF_PCRE_LIBPATH = '/usr/lib'
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2013-05-30 09:03:49 UTC (rev 57133)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2013-05-30 09:39:23 UTC (rev 57134)
@@ -96,7 +96,7 @@
def validate_arguments(args, bc):
opts_list = [
- 'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
+ 'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LIBPATH_ARCH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD',
@@ -259,6 +259,7 @@
('BF_PYTHON_INC', 'Include path for Python headers', ''),
('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''),
('BF_PYTHON_LIB', 'Python library', ''),
+ ('BF_PYTHON_LIBPATH_ARCH', 'Additional Python library under some linux flavors (arch-dependent)', ''),
('BF_PYTHON_DLL', 'Python dll - used on Windows only', ''),
('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
('BF_PYTHON_LIBPATH', 'Library path', ''),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list