[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52195] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 52191.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Wed Nov 14 03:01:09 CET 2012


Revision: 52195
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52195
Author:   kjym3
Date:     2012-11-14 02:01:02 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 52191.

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52191

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/GNUmakefile
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
    branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenColorIO.cmake
    branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenImageIO.cmake
    branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/info_gotcha.rst
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.h
    branches/soc-2008-mxcurioni/intern/cycles/SConscript
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/locale/SConscript
    branches/soc-2008-mxcurioni/intern/memutil/MEM_SmartPtr.h
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PixelateOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/ikplugin_api.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_engine.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2008-mxcurioni/source/tools/check_style_c.py
    branches/soc-2008-mxcurioni/source/tools/spell_check_source.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/intern/locale/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/locale/SConscript
    branches/soc-2008-mxcurioni/intern/locale/boost_locale_wrapper.cpp
    branches/soc-2008-mxcurioni/intern/locale/boost_locale_wrapper.h


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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/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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52118
   + /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52191

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-11-14 01:41:24 UTC (rev 52194)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-11-14 02:01:02 UTC (rev 52195)
@@ -353,12 +353,20 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_JACK OR WITH_GAMEENGINE))
-	message(FATAL_ERROR "WITH_OPENAL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE)
+	if(WITH_OPENAL)
+		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+	endif()
+	if(WITH_JACK)
+		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+	endif()
+	if(WITH_GAMEENGINE)
+		message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+	endif()
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
-	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
 endif()
 
 if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
@@ -1297,9 +1305,9 @@
 				boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
 			if(WITH_INTERNATIONAL)
 				set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-					optimized libboost_locale-${BOOST_POSTFIX}
-					debug libboost_locale-${BOOST_DEBUG_POSTFIX}) 
-			endif(WITH_CYCLES_OSL)
+					optimized boost_locale-${BOOST_POSTFIX}
+					debug boost_locale-${BOOST_DEBUG_POSTFIX}) 
+			endif()
 			set(BOOST_LIBPATH ${BOOST}/lib)
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
 		endif()
@@ -1474,7 +1482,7 @@
 			endif()
 
 			if(WITH_INPUT_NDOF)
-				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework /Library/Frameworks/3DconnexionClient.framework/3DconnexionClient")
+				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient")
 			endif()
 		endif()
 

Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile	2012-11-14 01:41:24 UTC (rev 52194)
+++ branches/soc-2008-mxcurioni/GNUmakefile	2012-11-14 02:01:02 UTC (rev 52195)
@@ -173,14 +173,15 @@
 	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo ""
 	@echo "Static Source Code Checking (not associated with building blender)"
-	@echo "  * check_cppcheck     - run blender source through cppcheck (C & C++)"
-	@echo "  * check_clang_array  - run blender source through clang array checking script (C & C++)"
-	@echo "  * check_splint       - run blenders source through splint (C only)"
-	@echo "  * check_sparse       - run blenders source through sparse (C only)"
-	@echo "  * check_smatch       - run blenders source through smatch (C only)"
-	@echo "  * check_spelling_c   - check for spelling errors (OSL only)"
-	@echo "  * check_spelling_osl - check for spelling errors (C/C++ only)"
-	@echo "  * check_spelling_py  - check for spelling errors (Python only)"
+	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
+	@echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
+	@echo "  * check_splint         - run blenders source through splint (C only)"
+	@echo "  * check_sparse         - run blenders source through sparse (C only)"
+	@echo "  * check_smatch         - run blenders source through smatch (C only)"
+	@echo "  * check_spelling_c     - check for spelling errors (OSL only)"
+	@echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
+	@echo "  * check_spelling_osl   - check for spelling errors (C/C++ only)"
+	@echo "  * check_spelling_py    - check for spelling errors (Python only)"
 	@echo ""
 	@echo "Utilities (not associated with building blender)"
 	@echo "  * tbz      - create a compressed svn export 'blender_archive.tar.bz2'"
@@ -270,30 +271,42 @@
 
 check_cppcheck:
 	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+	cd $(BUILD_DIR) ; \
+	python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
 
 check_clang_array:
 	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py
+	cd $(BUILD_DIR) ; \
+	python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py
 
 check_splint:
 	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+	cd $(BUILD_DIR) ; \
+	python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
 
 check_sparse:
 	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+	cd $(BUILD_DIR) ; \
+	python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
 check_smatch:
 	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
+	cd $(BUILD_DIR) ; \
+	python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
 
 check_spelling_py:
-	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
+	cd $(BUILD_DIR) ; \
+	PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
 
 check_spelling_c:
-	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
+	cd $(BUILD_DIR) ; \
+	PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
 
+check_spelling_c_qtc:
+	cd $(BUILD_DIR) ; USE_QTC_TASK=1 \
+	PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source > \
+	$(BLENDER_DIR)/check_spelling_c.tasks
+
 check_spelling_osl:
 	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/intern/cycles/kernel/osl
 

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2012-11-14 01:41:24 UTC (rev 52194)
+++ branches/soc-2008-mxcurioni/SConstruct	2012-11-14 02:01:02 UTC (rev 52195)
@@ -422,16 +422,22 @@
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.
 if env['WITH_BF_PYTHON']:
-    py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
+    found_python_h = found_pyconfig_h = False
+    for bf_python_inc in env.subst('${BF_PYTHON_INC}').split():
+        py_h = os.path.join(Dir(bf_python_inc).abspath, "Python.h")
+        if os.path.exists(py_h):
+            found_python_h = True
+        py_h = os.path.join(Dir(bf_python_inc).abspath, "pyconfig.h")
+        if os.path.exists(py_h):
+            found_pyconfig_h = True
 
-    if not os.path.exists(py_h):
-        print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
+    if not (found_python_h and found_pyconfig_h):
+        print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n"
               "  Set 'BF_PYTHON_INC' to point "
-              "to a valid python include path.\n  Containing "
-              "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
+              "to valid python include path(s).\n Containing "
+              "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
 
         Exit()
-    del py_h
 
 
 if not os.path.isdir ( B.root_build_dir):

Copied: branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh (from rev 52191, trunk/blender/build_files/build_environment/install_deps.sh)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh	2012-11-14 02:01:02 UTC (rev 52195)
@@ -0,0 +1,634 @@
+#!/bin/bash
+
+DISTRO=""
+SRC="$HOME/src/blender-deps"
+CWD=$PWD
+
+THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+
+PYTHON_VERSION="3.3.0"
+BOOST_VERSION="1_51_0"
+OIIO_VERSION="1.1.0"
+OCIO_VERSION="1.0.7"
+FFMPEG_VERSION="1.0"
+_ffmpeg_list_sep=";"
+
+HASXVID=false
+XVIDDEV=""
+HASVPX=false
+HASMP3LAME=false
+HASX264=false
+HASOPENJPEG=false
+HASSCHRO=false
+
+# Switch to english language, else some things (like check_package_DEB()) won't work!
+LANG_BACK=$LANG
+LANG=""
+export LANG
+
+ERROR() {
+  echo "${@}"
+}
+
+INFO() {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list