[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60244] branches/soc-2013-dingto: Merged revision(s) 60149-60242 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Fri Sep 20 01:43:30 CEST 2013
Revision: 60244
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60244
Author: dingto
Date: 2013-09-19 23:43:30 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Merged revision(s) 60149-60242 from trunk/blender into soc-2013-dingto.
Resolved conflicts in kernel_path.h, osl_closures.cpp and stdosl.h.
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/doc/python_api/examples/bpy.props.5.py
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-dingto/doc/python_api/rst/bge.logic.rst
branches/soc-2013-dingto/doc/python_api/sphinx_doc_gen.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_session.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-dingto/intern/cycles/bvh/bvh_build.cpp
branches/soc-2013-dingto/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-dingto/intern/cycles/render/attribute.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.h
branches/soc-2013-dingto/intern/cycles/render/shader.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2013-dingto/release/datafiles/preview_cycles.blend
branches/soc-2013-dingto/release/datafiles/startup.blend
branches/soc-2013-dingto/release/scripts/modules/bpy/path.py
branches/soc-2013-dingto/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2013-dingto/release/scripts/modules/bpy_types.py
branches/soc-2013-dingto/release/scripts/modules/rna_info.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/node.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/brush.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_convexhull2d.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/blenloader/intern/versioning_defaults.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2013-dingto/source/blender/collada/MeshImporter.cpp
branches/soc-2013-dingto/source/blender/compositor/COM_compositor.h
branches/soc-2013-dingto/source/blender/compositor/COM_defines.h
branches/soc-2013-dingto/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2013-dingto/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-dingto/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2013-dingto/source/blender/editors/animation/keyframing.c
branches/soc-2013-dingto/source/blender/editors/curve/CMakeLists.txt
branches/soc-2013-dingto/source/blender/editors/curve/curve_intern.h
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/curve/lorem.c
branches/soc-2013-dingto/source/blender/editors/include/ED_lattice.h
branches/soc-2013-dingto/source/blender/editors/include/ED_mball.h
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/include/ED_object.h
branches/soc-2013-dingto/source/blender/editors/include/ED_view3d.h
branches/soc-2013-dingto/source/blender/editors/include/UI_view2d.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_anim.c
branches/soc-2013-dingto/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_add.c
branches/soc-2013-dingto/source/blender/editors/object/object_transform.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-dingto/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-dingto/source/blender/editors/space_info/textview.h
branches/soc-2013-dingto/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-dingto/source/blender/editors/space_node/drawnode.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_intern.h
branches/soc-2013-dingto/source/blender/editors/space_node/node_select.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_view.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.h
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_ops.c
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-dingto/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-dingto/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2013-dingto/source/blender/makesrna/RNA_access.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_meshcache_util.h
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2013-dingto/source/blender/nodes/CMakeLists.txt
branches/soc-2013-dingto/source/blender/nodes/NOD_common.h
branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h
branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2013-dingto/source/blender/python/generic/blf_py_api.h
branches/soc-2013-dingto/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-dingto/source/blender/python/generic/py_capi_utils.c
branches/soc-2013-dingto/source/blender/python/generic/py_capi_utils.h
branches/soc-2013-dingto/source/blender/python/intern/bpy.h
branches/soc-2013-dingto/source/blender/python/intern/bpy_driver.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_interface.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_intern_string.h
branches/soc-2013-dingto/source/blender/python/intern/bpy_props.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna_anim.h
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2013-dingto/source/blender/python/intern/gpu.h
branches/soc-2013-dingto/source/blender/windowmanager/WM_api.h
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2013-dingto/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-dingto/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60148
+ /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60243
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-09-19 23:17:52 UTC (rev 60243)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-09-19 23:43:30 UTC (rev 60244)
@@ -25,10 +25,10 @@
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,tmp:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
+--long source:,install:,tmp:,threads:,help,with-all,with-opencollada,all-static,force-all,\
force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
-skip-opencollada \
+skip-opencollada,required-numpy \
-- "$@" \
)
@@ -42,16 +42,13 @@
# Do not install some optional, potentially conflicting libs by default...
WITH_ALL=false
-# Do not yet enable osl, use --with-osl (or --with-all) option to try it.
-WITH_OSL=false
-
# Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
WITH_OPENCOLLADA=false
# Try to link everything statically. Use this to produce portable versions of blender.
ALL_STATIC=false
-THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+THREADS=`cat /proc/cpuinfo | grep processor | wc -l`
if [ -z "$THREADS" ]; then
THREADS=1
fi
@@ -63,7 +60,6 @@
Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
Full install: \$WITH_ALL (use --with-all option to enable it).
-Building OSL: \$WITH_OSL (use --with-osl option to enable it).
Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
All static linking: \$ALL_STATIC (use --all-static option to enable it).
@@ -96,10 +92,6 @@
how your package system is set…).
Note this option also implies all other (more specific) --with-foo options below.
- --with-osl
- Try to install or build the OpenShadingLanguage libraries (and their dependencies).
- Still experimental!
-
--with-opencollada
Build and install the OpenCOLLADA libraries.
@@ -174,11 +166,15 @@
Unconditionally skip OpenCOLLADA installation/building.
--skip-ffmpeg
- Unconditionally skip FFMpeg installation/building.\""
+ Unconditionally skip FFMpeg installation/building.
+ --required-numpy
+ Use this in case your distro features a valid python package, but no matching Numpy one.
+ It will force compilation of both python 3.3 and numpy 1.7.\""
+
##### Main Vars #####
-PYTHON_VERSION="3.3.0"
+PYTHON_VERSION="3.3.2"
PYTHON_VERSION_MIN="3.3"
PYTHON_SOURCE="http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.bz2"
PYTHON_FORCE_REBUILD=false
@@ -189,6 +185,7 @@
NUMPY_SOURCE="http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz"
NUMPY_FORCE_REBUILD=false
NUMPY_SKIP=false
+NUMPY_REQUIRED=false
BOOST_VERSION="1.51.0"
_boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
@@ -196,7 +193,6 @@
BOOST_VERSION_MIN="1.49"
BOOST_FORCE_REBUILD=false
BOOST_SKIP=false
-_need_boost_ldconfig=false
OCIO_VERSION="1.0.7"
OCIO_SOURCE="https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION"
@@ -212,14 +208,12 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
-_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
OIIO_VERSION_MIN="1.1"
OIIO_FORCE_REBUILD=false
OIIO_SKIP=false
-_need_oiio_ldconfig=false
LLVM_VERSION="3.1"
LLVM_VERSION_MIN="3.0"
@@ -239,7 +233,7 @@
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
-OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
+OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -322,9 +316,6 @@
--with-all)
WITH_ALL=true; shift; continue
;;
- --with-osl)
- WITH_OSL=true; shift; continue
- ;;
--with-opencollada)
WITH_OPENCOLLADA=true; shift; continue
;;
@@ -408,6 +399,9 @@
--skip-ffmpeg)
FFMPEG_SKIP=true; shift; continue
;;
+ --required-numpy)
+ NUMPY_REQUIRED=true; shift; continue
+ ;;
--)
# no more arguments to parse
break
@@ -424,7 +418,6 @@
done
if $WITH_ALL; then
- WITH_OSL=true
WITH_OPENCOLLADA=true
fi
@@ -554,6 +547,17 @@
ln -s $_inst $_inst_shortcut
}
+# ldconfig
+run_ldconfig() {
+ _lib_path="$INST/$1/lib"
+ _ldconf_path="/etc/ld.so.conf.d/$1.conf"
+ INFO ""
+ INFO "Running ldconfig for $1..."
+ sudo sh -c "echo \"$_lib_path\" > $_ldconf_path"
+ sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
+ INFO ""
+}
+
#### Build Python ####
_init_python() {
_src=$SRC/Python-$PYTHON_VERSION
@@ -569,7 +573,7 @@
compile_Python() {
# To be changed each time we make edits that would modify the compiled result!
- py_magic=0
+ py_magic=1
_init_python
# Clean install if needed!
@@ -593,7 +597,7 @@
cd $_src
- ./configure --prefix=$_inst --enable-ipv6 \
+ ./configure --prefix=$_inst --libdir=$_inst/lib --enable-ipv6 \
--enable-loadable-sqlite-extensions --with-dbmliborder=bdb \
--with-computed-gotos --with-pymalloc
@@ -633,11 +637,11 @@
compile_Numpy() {
# To be changed each time we make edits that would modify the compiled result!
- py_magic=0
+ numpy_magic=0
_init_numpy
# Clean install if needed!
- magic_compile_check numpy-$NUMPY_VERSION $py_magic
+ magic_compile_check numpy-$NUMPY_VERSION $numpy_magic
if [ $? -eq 1 -o $NUMPY_FORCE_REBUILD == true ]; then
clean_Numpy
fi
@@ -668,7 +672,7 @@
exit 1
fi
- magic_compile_set numpy-$NUMPY_VERSION $py_magic
+ magic_compile_set numpy-$NUMPY_VERSION $numpy_magic
cd $CWD
INFO "Done compiling Numpy-$NUMPY_VERSION!"
@@ -743,7 +747,7 @@
fi
# Just always run it, much simpler this way!
- _need_boost_ldconfig=true
+ run_ldconfig "boost"
}
#### Build OCIO ####
@@ -927,15 +931,14 @@
ERROR "ILMBase-$ILMBASE_VERSION failed to compile, exiting"
exit 1
fi
+ cd $CWD
+ INFO "Done compiling ILMBase-$ILMBASE_VERSION!"
else
INFO "Own ILMBase-$ILMBASE_VERSION is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib (and openexr), use the --force-openexr option."
fi
magic_compile_set ilmbase-$ILMBASE_VERSION $ilmbase_magic
-
- cd $CWD
- INFO "Done compiling ILMBase-$ILMBASE_VERSION!"
}
#### Build OpenEXR ####
@@ -1147,7 +1150,7 @@
_with_built_openexr=true
# Just always run it, much simpler this way!
- _need_openexr_ldconfig=true
+ run_ldconfig "openexr"
}
#### Build OIIO ####
@@ -1410,7 +1413,7 @@
fi
# Just always run it, much simpler this way!
- _need_oiio_ldconfig=true
+ run_ldconfig "oiio"
}
#### Build LLVM ####
@@ -1428,7 +1431,7 @@
compile_LLVM() {
# To be changed each time we make edits that would modify the compiled result!
- llvm_magic=1
+ llvm_magic=2
_init_llvm
# Clean install if needed!
@@ -1533,7 +1536,7 @@
compile_OSL() {
# To be changed each time we make edits that would modify the compiled result!
- osl_magic=10
+ osl_magic=11
_init_osl
# Clean install if needed!
@@ -1591,6 +1594,7 @@
cmake_d="$cmake_d -D OPENIMAGEIOHOME=$INST/oiio"
fi
+ INFO "$LLVM_VERSION_FOUND"
if [ ! -z $LLVM_VERSION_FOUND ]; then
cmake_d="$cmake_d -D LLVM_VERSION=$LLVM_VERSION_FOUND"
if [ -d $INST/llvm ]; then
@@ -1635,7 +1639,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=7
+ opencollada_magic=8
_init_opencollada
# Clean install if needed!
@@ -1985,6 +1989,7 @@
if $PYTHON_SKIP; then
INFO "WARNING! Skipping Python installation, as requested..."
else
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list