Merge branch 'master' into id_copy_refactor

Conflicts:
	source/blender/blenkernel/BKE_sequencer.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/sequencer.c
	source/blender/editors/space_sequencer/sequencer_edit.c

.arcconfig

@@ -1,7 +1,6 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"git.default-relative-commit" : "origin/blender2.8",
-	"arc.land.update.default" : "rebase",
-	"arc.land.onto.default" : "blender2.8"
+	"git.default-relative-commit" : "origin/master",
+	"arc.land.update.default" : "rebase"
 }

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = blender2.8
 	ignore = all
+	branch = master
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
-	branch = master
 	ignore = all
+	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
-	branch = master
 	ignore = all
+	branch = master
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
-	branch = master
 	ignore = all
+	branch = master

CMakeLists.txt

@@ -45,7 +45,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	endif()
 endif()
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.8)
 
 if(NOT EXECUTABLE_OUTPUT_PATH)
 	set(FIRST_RUN TRUE)
@@ -66,12 +66,21 @@ endif()
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 # global compile definitions since add_definitions() adds for all.
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
-	$<$<CONFIG:Debug>:DEBUG;_DEBUG>
-	$<$<CONFIG:Release>:NDEBUG>
-	$<$<CONFIG:MinSizeRel>:NDEBUG>
-	$<$<CONFIG:RelWithDebInfo>:NDEBUG>
-)
+
+if(NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
+	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
+		$<$<CONFIG:Debug>:DEBUG;_DEBUG>
+		$<$<CONFIG:Release>:NDEBUG>
+		$<$<CONFIG:MinSizeRel>:NDEBUG>
+		$<$<CONFIG:RelWithDebInfo>:NDEBUG>
+	)
+else()
+	# keep until CMake-3.0 is min requirement
+	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG           DEBUG _DEBUG)
+	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE         NDEBUG)
+	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL      NDEBUG)
+	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO  NDEBUG)
+endif()
 
 #-----------------------------------------------------------------------------
 # Set policy
@@ -156,6 +165,7 @@ option_defaults_init(
 	_init_OPENCOLORIO
 	_init_SDL
 	_init_FFTW3
+	_init_GAMEENGINE
 	_init_OPENSUBDIV
 )
 
@@ -185,7 +195,7 @@ endif()
 # Options
 
 # First platform specific non-cached vars
-if(UNIX AND NOT (APPLE OR HAIKU))
+if(UNIX AND NOT APPLE)
 	set(WITH_X11 ON)
 endif()
 
@@ -225,10 +235,15 @@ option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke, ocean sim, and
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
+option(WITH_GAMEENGINE    "Enable Game Engine" ${_init_GAMEENGINE})
+if(APPLE)
+	set(WITH_GAMEENGINE_DECKLINK OFF)
+else()
+	option(WITH_GAMEENGINE_DECKLINK "Support BlackMagicDesign DeckLink cards in the Game Engine" ON)
+endif()
+option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
 
-option(WITH_CLAY_ENGINE    "Enable Clay engine" ON)
-
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 
@@ -236,8 +251,6 @@ option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" _init_OPEN
 
 option(WITH_OPENVDB       "Enable features relying on OpenVDB" OFF)
 option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
-option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF)
-mark_as_advanced(WITH_OPENVDB_3_ABI_COMPATIBLE)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -272,12 +285,11 @@ endif()
 if(WITH_X11)
 	option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
-	option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
 	option(WITH_X11_ALPHA     "Enable X11 transparent background"                     ON)
 endif()
 
 if(UNIX AND NOT APPLE)
-	option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
+	option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON)
 	option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system"           ON)
 else()
 	# not an option for other OS's
@@ -297,6 +309,7 @@ endif()
 # Modifiers
 option(WITH_MOD_FLUID           "Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
+option(WITH_MOD_BOOLEAN         "Enable Boolean Modifier" ON)
 option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
 # option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)  # this is now only available in a branch
 # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
@@ -310,6 +323,7 @@ option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
+option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
 option(WITH_CODEC_AVI           "Enable Blenders own AVI file support (raw/jpeg)" ON)
@@ -320,6 +334,10 @@ option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd
 option(WITH_ALEMBIC             "Enable Alembic Support" OFF)
 option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support (not officially supported)" OFF)
 
+if(APPLE)
+	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
+endif()
+
 # 3D format support
 # Disable opencollada when we don't have precompiled libs
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ${_init_OPENCOLLADA})
@@ -372,14 +390,10 @@ if(UNIX AND NOT APPLE)
 endif()
 
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-if(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
-	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
-	mark_as_advanced(PYTHON_NUMPY_PATH)
-	set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
-	mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
-endif()
 if(WITH_PYTHON_INSTALL)
 	option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
+	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
+	mark_as_advanced(PYTHON_NUMPY_PATH)
 
 	if(UNIX AND NOT APPLE)
 		option(WITH_PYTHON_INSTALL_REQUESTS "Copy system requests into the blender install folder" ON)
@@ -398,25 +412,16 @@ option(WITH_CYCLES_STANDALONE_GUI	"Build Cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" ${_init_CYCLES_OSL})
 option(WITH_CYCLES_OPENSUBDIV		"Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV})
 option(WITH_CYCLES_CUDA_BINARIES	"Build Cycles CUDA binaries" OFF)
-option(WITH_CYCLES_CUBIN_COMPILER	"Build cubins with nvrtc based compiler instead of nvcc" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING	"Build Cycles with logging support" ON)
 option(WITH_CYCLES_DEBUG	"Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY	"Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
-mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
 mark_as_advanced(WITH_CYCLES_DEBUG)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
 
-option(WITH_CYCLES_DEVICE_CUDA				"Enable Cycles CUDA compute support" ON)
-option(WITH_CYCLES_DEVICE_OPENCL			"Enable Cycles OpenCL compute support" ON)
-option(WITH_CYCLES_NETWORK				"Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF)
-mark_as_advanced(WITH_CYCLES_DEVICE_CUDA)
-mark_as_advanced(WITH_CYCLES_DEVICE_OPENCL)
-mark_as_advanced(WITH_CYCLES_NETWORK)
-
 option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
@@ -448,8 +453,7 @@ option(WITH_BOOST					"Enable features depending on boost" ON)
 
 # Unit testsing
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
-option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF)
-option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF)
+option(WITH_OPENGL_TESTS "Enable OpenGL related unit testing (Experimental)" OFF)
 
 
 # Documentation
@@ -460,16 +464,28 @@ endif()
 
 # OpenGL
 
+option(WITH_GLEW_MX             "Support multiple GLEW contexts (experimental)"                                                                     OFF )
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
+option(WITH_GL_PROFILE_COMPAT   "Support using the OpenGL 'compatibility' profile. (deprecated)"                                                    ON )
+option(WITH_GL_PROFILE_CORE     "Support using the OpenGL 3.2+ 'core' profile."                                                                     OFF)
 option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)
 
 mark_as_advanced(
+	WITH_GLEW_MX
 	WITH_GLEW_ES
 	WITH_GL_EGL
+	WITH_GL_PROFILE_COMPAT
+	WITH_GL_PROFILE_CORE
 	WITH_GL_PROFILE_ES20
 )
 
+if(WITH_GL_PROFILE_COMPAT)
+	set(WITH_GLU ON)
+else()
+	set(WITH_GLU OFF)
+endif()
+
 if(WIN32)
 	option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
 	mark_as_advanced(WITH_GL_ANGLE)
@@ -488,17 +504,13 @@ endif()
 # Experimental support of C11 and C++11
 #
 # We default options to whatever default standard in the current compiler.
-if(APPLE)
+if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11))
 	set(_c11_init ON)
 	set(_cxx11_init ON)
-	set(WITH_C11 ON)
-	set(WITH_CXX11 ON)
-elseif(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11))
-	set(_c11_init ON)
 else()
 	set(_c11_init OFF)
+	set(_cxx11_init OFF)
 endif()
-set(_cxx11_init ON)
 
 option(WITH_C11 "Build with C11 standard enabled, for development use only!" ${_c11_init})
 mark_as_advanced(WITH_C11)
@@ -511,48 +523,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	mark_as_advanced(WITH_LINKER_GOLD)
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-	option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
-	mark_as_advanced(WITH_COMPILER_ASAN)
-
-	if(WITH_COMPILER_ASAN)
-		set(_asan_defaults "\
--fsanitize=address \
--fsanitize=bool \
--fsanitize=bounds \
--fsanitize=enum \
--fsanitize=float-cast-overflow \
--fsanitize=float-divide-by-zero \
--fsanitize=nonnull-attribute \
--fsanitize=returns-nonnull-attribute \
--fsanitize=signed-integer-overflow \
--fsanitize=undefined \
--fsanitize=vla-bound \
--fno-sanitize=alignment \
-")
-
-		if(NOT MSVC) # not all sanitizers are supported with clang-cl, these two however are very vocal about it
-			set(_asan_defaults "${_asan_defaults} -fsanitize=leak -fsanitize=object-size" )
-		endif()
-		set(COMPILER_ASAN_CFLAGS "${_asan_defaults}" CACHE STRING "C flags for address sanitizer")
-		mark_as_advanced(COMPILER_ASAN_CFLAGS)
-		set(COMPILER_ASAN_CXXFLAGS "${_asan_defaults}" CACHE STRING "C++ flags for address sanitizer")
-		mark_as_advanced(COMPILER_ASAN_CXXFLAGS)
-
-		unset(_asan_defaults)
-
-		if(NOT MSVC)
-			find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
-		else()
-			find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
-				PATHS 	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
-						[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
-						)
-		endif() 
-		mark_as_advanced(COMPILER_ASAN_LIBRARY)
-	endif()
-endif()
-
 # Dependency graph
 option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
 mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
@@ -570,9 +540,6 @@ if(WIN32)
 
 	set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING  "password for pfx file used for codesigning.")
 	mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD)
-
-	option(WINDOWS_USE_VISUAL_STUDIO_FOLDERS "Organize the visual studio project according to source folders." ON)
-	mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
 endif()
 
 # avoid using again
@@ -608,17 +575,15 @@ endif()
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
-if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
 	message(FATAL_ERROR
-		"At least one of WITH_BLENDER or WITH_CYCLES_STANDALONE "
-		"must be enabled, nothing to do!"
+		"At least one of WITH_BLENDER or WITH_PLAYER or "
+		"WITH_CYCLES_STANDALONE must be enabled, nothing to do!"
 	)
 endif()
 
-if(NOT WITH_CXX11)
-	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
-		message(FATAL_ERROR "WITH_AUDASPACE requires WITH_CXX11")
-	endif()
+if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
 if(NOT WITH_AUDASPACE)
@@ -628,6 +593,9 @@ if(NOT WITH_AUDASPACE)
 	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)
@@ -635,6 +603,10 @@ if(NOT WITH_SDL AND WITH_GHOST_SDL)
 endif()
 
 # python module, needs some different options
+if(WITH_PYTHON_MODULE AND WITH_PLAYER)
+	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PLAYER to be OFF")
+endif()
+
 if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
@@ -662,11 +634,17 @@ if(NOT WITH_BOOST)
 	endmacro()
 
 	set_and_warn(WITH_CYCLES         OFF)
+	set_and_warn(WITH_AUDASPACE      OFF)
 	set_and_warn(WITH_INTERNATIONAL  OFF)
 	set_and_warn(WITH_OPENVDB        OFF)
 	set_and_warn(WITH_OPENCOLORIO    OFF)
-elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
-       WITH_OPENVDB OR WITH_OPENCOLORIO)
+	set_and_warn(WITH_MOD_BOOLEAN    OFF)
+
+	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_PLAYER         OFF)  # depends on GAMEENGINE
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR
+       WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_MOD_BOOLEAN)
 	# Keep enabled
 else()
 	# New dependency graph needs either Boost or C++11 for function bindings.
@@ -708,7 +686,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
 	set(WITH_X11           OFF)
 	set(WITH_X11_XINPUT    OFF)
 	set(WITH_X11_XF86VMODE OFF)
-	set(WITH_X11_XFIXES    OFF)
 	set(WITH_X11_ALPHA     OFF)
 	set(WITH_GHOST_XDND    OFF)
 	set(WITH_INPUT_IME     OFF)
@@ -734,19 +711,35 @@ TEST_SHARED_PTR_SUPPORT()
 TEST_UNORDERED_MAP_SUPPORT()
 
 if(WITH_AUDASPACE)
-	if(NOT WITH_SYSTEM_AUDASPACE)
-		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
-		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings")
+	if(WITH_SYSTEM_AUDASPACE)
+		set(AUDASPACE_DEFINITIONS
+			-DWITH_AUDASPACE
+			-DWITH_SYSTEM_AUDASPACE
+			"-DAUD_DEVICE_H=<AUD_Device.h>"
+			"-DAUD_SPECIAL_H=<AUD_Special.h>"
+			"-DAUD_SOUND_H=<AUD_Sound.h>"
+			"-DAUD_HANDLE_H=<AUD_Handle.h>"
+			"-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
+			"-DAUD_TYPES_H=<AUD_Types.h>"
+			"-DAUD_PYTHON_H=<python/PyAPI.h>"
+		)
+	else()
+		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
+		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
+		set(AUDASPACE_DEFINITIONS
+			-DWITH_AUDASPACE
+			"-DAUD_DEVICE_H=<AUD_C-API.h>"
+			"-DAUD_SPECIAL_H=<AUD_C-API.h>"
+			"-DAUD_SOUND_H=<AUD_C-API.h>"
+			"-DAUD_HANDLE_H=<AUD_C-API.h>"
+			"-DAUD_SEQUENCE_H=<AUD_C-API.h>"
+			"-DAUD_TYPES_H=<AUD_Space.h>"
+		)
 	endif()
 endif()
 
-# Auto-enable CUDA dynload if toolkit is not found.
-if(NOT WITH_CUDA_DYNLOAD)
-	find_package(CUDA)
-	if (NOT CUDA_FOUND)
-		message("CUDA toolkit not found, using dynamic runtime loading of libraries instead")
-		set(WITH_CUDA_DYNLOAD ON)
-	endif()
+if(APPLE)
+	apple_check_quicktime()
 endif()
 
 #-----------------------------------------------------------------------------
@@ -768,17 +761,6 @@ if(WITH_INTERNATIONAL)
 endif()
 
 if(WITH_PYTHON)
-	# While we have this as an '#error' in 'bpy_capi_utils.h',
-	# upgrading Python tends to cause confusion for users who build.
-	# Give the error message early to make this more obvious.
-	#
-	# Do this before main 'platform_*' checks,
-	# because UNIX will search for the old Python paths which may not exist.
-	# giving errors about missing paths before this case is met.
-	if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.6")
-		message(FATAL_ERROR "At least Python 3.6 is required to build")
-	endif()
-
 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules")
 		message(WARNING
 			"Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
@@ -817,19 +799,6 @@ set(PLATFORM_LINKLIBS "")
 set(PLATFORM_LINKFLAGS "")
 set(PLATFORM_LINKFLAGS_DEBUG "")
 
-if(WITH_COMPILER_ASAN)
-	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")
-
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
-	if(MSVC)
-		set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") 
-	endif()
-	set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
-	set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
-	set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") 
-endif()
 
 #-----------------------------------------------------------------------------
 #Platform specifics
@@ -861,14 +830,6 @@ if(WITH_X11)
 		endif()
 	endif()
 
-	if(WITH_X11_XFIXES)
-		if(X11_Xfixes_LIB)
-			list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
-		else()
-			set(WITH_X11_XFIXES OFF)
-		endif()
-	endif()
-
 	if(WITH_X11_ALPHA)
 		find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
 		mark_as_advanced(X11_Xrender_LIB)
@@ -1002,11 +963,19 @@ endif()
 find_package(OpenGL)
 blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
 
+if(WITH_GLU)
+	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
+	list(APPEND GL_DEFINITIONS -DWITH_GLU)
+endif()
+
 if(WITH_SYSTEM_GLES)
 	find_package_wrapper(OpenGLES)
 endif()
 
-if(WITH_GL_PROFILE_ES20)
+if(WITH_GL_PROFILE_COMPAT OR WITH_GL_PROFILE_CORE)
+	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+
+elseif(WITH_GL_PROFILE_ES20)
 	if(WITH_SYSTEM_GLES)
 		if(NOT OPENGLES_LIBRARY)
 			message(FATAL_ERROR
@@ -1066,9 +1035,6 @@ if(WITH_GL_PROFILE_ES20)
 
 	endif()
 
-else()
-	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
-
 endif()
 
 if(WITH_GL_EGL)
@@ -1116,10 +1082,16 @@ if(WITH_GL_EGL)
 
 endif()
 
+if(WITH_GL_PROFILE_COMPAT)
+	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_COMPAT)
+endif()
+
+if(WITH_GL_PROFILE_CORE)
+	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
+endif()
+
 if(WITH_GL_PROFILE_ES20)
 	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_ES20)
-else()
-	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
 if(WITH_GL_EGL)
@@ -1156,6 +1128,10 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure GLEW
 
+if(WITH_GLEW_MX)
+	list(APPEND GL_DEFINITIONS -DWITH_GLEW_MX)
+endif()
+
 if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)
 
@@ -1165,7 +1141,11 @@ if(WITH_SYSTEM_GLEW)
 		message(FATAL_ERROR "GLEW is required to build Blender. Install it or disable WITH_SYSTEM_GLEW.")
 	endif()
 
-	set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	if(WITH_GLEW_MX)
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_MX_LIBRARY})
+	else()
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	endif()
 else()
 	if(WITH_GLEW_ES)
 		set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")
@@ -1173,11 +1153,12 @@ else()
 		list(APPEND GL_DEFINITIONS -DGLEW_STATIC -DWITH_GLEW_ES)
 
 		# These definitions remove APIs from glew.h, making GLEW smaller, and catching unguarded API usage
-		if(WITH_GL_PROFILE_ES20)
-			list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
-		else()
+		if(NOT WITH_GL_PROFILE_ES20)
 			# No ES functions are needed
 			list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+		elseif(NOT (WITH_GL_PROFILE_CORE OR WITH_GL_PROFILE_COMPAT))
+			# ES is enabled, but the other functions are all disabled
+			list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
 		endif()
 
 		if(WITH_GL_PROFILE_ES20)
@@ -1214,7 +1195,9 @@ else()
 
 endif()
 
-list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+if(NOT WITH_GLU)
+	list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+endif()
 
 #-----------------------------------------------------------------------------
 # Configure Bullet
@@ -1273,7 +1256,7 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 		if(WIN32)
 			set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src/windows)
 		else()
-			set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/include)
+			set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src)
 		endif()
 	endif()
 endif()
@@ -1346,7 +1329,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_FORMAT_SIGN -Wformat-signedness)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_RESTRICT -Wrestrict)
 
 	# gcc 4.2 gives annoying warnings on every file with this
 	if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1388,7 +1370,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_WRITE_STRINGS -Wwrite-strings)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_RESTRICT -Wrestrict)
 
 	# gcc 4.2 gives annoying warnings on every file with this
 	if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1410,7 +1391,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)
 
 	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
 		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
@@ -1422,7 +1402,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 
-	# strange, clang complains these are not supported, but then uses them.
+	if(APPLE AND WITH_OPENMP) # we need the Intel omp lib linked here to not fail all tests due presence of -fopenmp !
+		set(CMAKE_REQUIRED_FLAGS "-L${LIBDIR}/openmp/lib -liomp5") # these are only used for the checks
+	endif()
+
+	# strange, clang complains these are not supported, but then yses them.
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE  -Werror=return-type)
@@ -1475,8 +1459,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
 
 	# disable numbered, false positives
-	set(C_WARNINGS "${C_WARNINGS} -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
-	set(CXX_WARNINGS "${CXX_WARNINGS} -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
+	set(C_WARNINGS "${C_WARNINGS} -wd188,186,144,913,556")
+	set(CXX_WARNINGS "${CXX_WARNINGS} -wd188,186,144,913,556")
 elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	# most msvc warnings are C & C++
 	set(_WARNINGS
@@ -1494,10 +1478,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		"/wd4267"  # conversion from 'size_t' to 'type', possible loss of data
 		"/wd4305"  # truncation from 'type1' to 'type2'
 		"/wd4800"  # forcing value to bool 'true' or 'false'
-		"/wd4828"  # The file contains a character that is illegal 
 		# errors:
 		"/we4013"  # 'function' undefined; assuming extern returning int
-		"/we4133"  # incompatible pointer types
 		"/we4431"  # missing type specifier - int assumed
 	)
 
@@ -1520,15 +1502,10 @@ if(WITH_PYTHON)
 		)
 	endif()
 
-	if(WIN32)
+	if(WIN32 OR APPLE)
 		# pass, we have this in an archive to extract
-	elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
-		if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
-			find_python_package(numpy)
-			unset(PYTHON_NUMPY_INCLUDE_DIRS CACHE)
-			set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
-		        mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
-		endif()
+	elseif(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
+		find_python_package(numpy)
 	endif()
 
 	if(WIN32 OR APPLE)
@@ -1559,12 +1536,7 @@ else()
 endif()
 
 # Visual Studio has all standards it supports available by default
-# Clang on windows copies this behavior and does not support these switches
-if(
-	CMAKE_COMPILER_IS_GNUCC OR
-	(CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT MSVC)) OR
-	(CMAKE_C_COMPILER_ID MATCHES "Intel")
-)
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "Intel")
 	# Use C99 + GNU extensions, works with GCC, Clang, ICC
 	if(WITH_C11)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
@@ -1618,7 +1590,7 @@ if(WITH_GTESTS)
 	include(GTestTesting)
 endif()
 
-if(WITH_BLENDER)
+if(WITH_BLENDER OR WITH_PLAYER)
 	add_subdirectory(intern)
 	add_subdirectory(extern)
 
@@ -1643,6 +1615,13 @@ if(WITH_BLENDER)
 endif()
 
 
+#-----------------------------------------------------------------------------
+# Blender Player
+if(WITH_PLAYER)
+	add_subdirectory(source/blenderplayer)
+endif()
+
+
 #-----------------------------------------------------------------------------
 # Testing
 add_subdirectory(tests)
@@ -1656,7 +1635,10 @@ include(build_files/cmake/packaging.cmake)
 # Use dynamic loading for OpenMP
 if(WITH_BLENDER)
 	openmp_delayload(blender)
-endif()
+endif(WITH_BLENDER)
+if(WITH_PLAYER)
+	openmp_delayload(blenderplayer)
+endif(WITH_PLAYER)
 
 #-----------------------------------------------------------------------------
 # Print Final Configuration
@@ -1690,6 +1672,8 @@ if(FIRST_RUN)
 	message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
 
 	info_cfg_text("Build Options:")
+	info_cfg_option(WITH_GAMEENGINE)
+	info_cfg_option(WITH_PLAYER)
 	info_cfg_option(WITH_BULLET)
 	info_cfg_option(WITH_IK_SOLVER)
 	info_cfg_option(WITH_IK_ITASC)
@@ -1712,7 +1696,6 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_ALPHA)
 	info_cfg_option(WITH_X11_XF86VMODE)
-	info_cfg_option(WITH_X11_XFIXES)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_MEM_VALGRIND)
@@ -1752,13 +1735,17 @@ if(FIRST_RUN)
 	endif()
 
 	info_cfg_text("Modifiers:")
+	info_cfg_option(WITH_MOD_BOOLEAN)
 	info_cfg_option(WITH_MOD_REMESH)
 	info_cfg_option(WITH_MOD_FLUID)
 	info_cfg_option(WITH_MOD_OCEANSIM)
 
 	info_cfg_text("OpenGL:")
 	info_cfg_option(WITH_GLEW_ES)
+	info_cfg_option(WITH_GLU)
 	info_cfg_option(WITH_GL_EGL)
+	info_cfg_option(WITH_GL_PROFILE_COMPAT)
+	info_cfg_option(WITH_GL_PROFILE_CORE)
 	info_cfg_option(WITH_GL_PROFILE_ES20)
 	if(WIN32)
 		info_cfg_option(WITH_GL_ANGLE)
@@ -1772,3 +1759,4 @@ endif()
 if(0)
 	print_all_vars()
 endif()
+

GNUmakefile

@@ -48,11 +48,6 @@ DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
 DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
 DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
 
-ifneq ($(OS_NCASE),darwin)
-	# Add processor type to directory name
-	DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
-endif
-
 # Allow to use alternative binary (pypy3, etc)
 ifndef PYTHON
 	PYTHON:=python3
@@ -236,10 +231,9 @@ help: .FORCE
 	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
 	@echo ""
 	@echo "Utilities (not associated with building blender)"
-	@echo "  * icons      - updates PNG icons from SVG files."
-	@echo "  * icons_geom - updates Geometry icons from BLEND file."
-	@echo "  * tgz        - create a compressed archive of the source code."
-	@echo "  * update     - updates git and all submodules"
+	@echo "  * icons    - updates PNG icons from SVG files."
+	@echo "  * tgz      - create a compressed archive of the source code."
+	@echo "  * update   - updates git and all submodules"
 	@echo ""
 	@echo "Environment Variables"
 	@echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."
@@ -424,21 +418,11 @@ icons: .FORCE
 	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
 	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
-icons_geom: .FORCE
-	BLENDER_BIN="$(BUILD_DIR)/bin/blender" \
-	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
-
 update: .FORCE
-	if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
-		svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
-	fi
 	if [ -d "../lib" ]; then \
-		svn cleanup ../lib/* ; \
 		svn update ../lib/* ; \
 	fi
 	git pull --rebase
-	git submodule update --init --recursive
-	git submodule foreach git checkout master
 	git submodule foreach git pull --rebase origin master
 
 

build_files/build_environment/CMakeLists.txt

@@ -58,6 +58,7 @@ include(cmake/openexr.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
 include(cmake/glew.cmake)
+include(cmake/hdf5.cmake)
 include(cmake/alembic.cmake)
 include(cmake/glfw.cmake)
 include(cmake/clew.cmake)
@@ -75,11 +76,9 @@ include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
-include(cmake/python_site_packages.cmake)
+include(cmake/requests.cmake)
 include(cmake/numpy.cmake)
-if(WITH_WEBP)
-	include(cmake/webp.cmake)
-endif()
+include(cmake/webp.cmake)
 if(WIN32)
 	include(cmake/hidapi.cmake)
 endif()
@@ -95,7 +94,6 @@ else()
 endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)
-	include(cmake/openjpeg.cmake)
 	if(BUILD_MODE STREQUAL Release)
 		if(WIN32)
 			include(cmake/zlib_mingw.cmake)
@@ -109,6 +107,7 @@ if(NOT WIN32 OR ENABLE_MINGW64)
 		include(cmake/schroedinger.cmake)
 		include(cmake/x264.cmake)
 		include(cmake/xvidcore.cmake)
+		include(cmake/openjpeg.cmake)
 		include(cmake/faad.cmake)
 		include(cmake/ffmpeg.cmake)
 		include(cmake/fftw.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -72,9 +72,4 @@ ExternalProject_Add(external_alembic
 	INSTALL_DIR ${LIBDIR}/alembic
 )
 
-add_dependencies(
-	external_alembic
-	external_boost
-	external_zlib
-	external_ilmbase
-)
+add_dependencies(external_alembic external_boost external_zlib external_ilmbase)

build_files/build_environment/cmake/blendthumb.cmake

@@ -47,10 +47,7 @@ if(BUILD_MODE STREQUAL Release)
 			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib
 			INSTALL_DIR ${LIBDIR}/blendthumb32
 		)
-		add_dependencies(
-			external_blendthumb_32
-			external_zlib_32
-		)
+		add_dependencies(external_blendthumb_32 external_zlib_32)
 
 		ExternalProject_Add(external_blendthumb_64
 			CMAKE_GENERATOR ${GENERATOR_64}
@@ -59,9 +56,6 @@ if(BUILD_MODE STREQUAL Release)
 			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib
 			INSTALL_DIR ${LIBDIR}/blendthumb64
 		)
-		add_dependencies(
-			external_blendthumb_64
-			external_zlib_64
-		)
+		add_dependencies(external_blendthumb_64 external_zlib_64)
 	endif()
 endif()

build_files/build_environment/cmake/blosc.cmake

@@ -37,13 +37,7 @@ ExternalProject_Add(external_blosc
 	INSTALL_DIR ${LIBDIR}/blosc
 )
 
-add_dependencies(
-	external_blosc
-	external_zlib
-)
+add_dependencies(external_blosc external_zlib)
 if(WIN32)
-	add_dependencies(
-		external_blosc
-		external_pthreads
-	)
+	add_dependencies(external_blosc external_pthreads)
 endif()

build_files/build_environment/cmake/boost.cmake

@@ -40,33 +40,22 @@ if(WIN32)
 	set(semi_path "${PATCH_DIR}/semi.txt")
 	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
 	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
-								echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
+								echo using python : 3.5 : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
 								echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
 								echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
 								type ${semi_path} >> "${JAM_FILE}"
 	)
 	set(BOOST_BUILD_COMMAND bjam)
-	#--user-config=user-config.jam
-	set(BOOST_BUILD_OPTIONS runtime-link=static )
-	#set(BOOST_WITH_PYTHON --with-python)
-	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
-	if(BUILD_MODE STREQUAL Release)
-		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/)
-	endif()
-	set(BOOST_PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff)
-
+	set(BOOST_BUILD_OPTIONS runtime-link=static --user-config=user-config.jam)
+	set(BOOST_WITH_PYTHON --with-python)
 elseif(APPLE)
 	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
 	set(BOOST_BUILD_COMMAND ./bjam)
 	set(BOOST_BUILD_OPTIONS toolset=clang cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
-	set(BOOST_HARVEST_CMD echo .)
-	set(BOOST_PATCH_COMMAND echo .)
 else()
-	set(BOOST_HARVEST_CMD echo .)
 	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
 	set(BOOST_BUILD_COMMAND ./bjam)
 	set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
-	set(BOOST_PATCH_COMMAND echo .)
 endif()
 
 set(BOOST_OPTIONS
@@ -99,16 +88,12 @@ ExternalProject_Add(external_boost
 	URL_HASH MD5=${BOOST_MD5}
 	PREFIX ${BUILD_DIR}/boost
 	UPDATE_COMMAND	""
-	PATCH_COMMAND ${BOOST_PATCH_COMMAND}
 	CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
 	BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} variant=${BOOST_BUILD_TYPE} link=static threading=multi ${BOOST_OPTIONS}	--prefix=${LIBDIR}/boost install
 	BUILD_IN_SOURCE 1
-	INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
+	INSTALL_COMMAND ""
 )
 
 if(WIN32)
-	add_dependencies(
-		external_boost
-		Make_Python_Environment
-	)
+	add_dependencies(external_boost Make_Python_Environment)
 endif()

build_files/build_environment/cmake/clang.cmake

@@ -28,27 +28,8 @@ ExternalProject_Add(external_clang
 	URL_HASH MD5=${CLANG_HASH}
 	PATCH_COMMAND ${PATCH_CMD} -p 2 -N -R -d ${BUILD_DIR}/clang/src/external_clang < ${PATCH_DIR}/clang.diff
 	PREFIX ${BUILD_DIR}/clang
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/clang
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/llvm
 )
 
-if(MSVC)
-	if(BUILD_MODE STREQUAL Release)
-		set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
-	else()
-		set(CLANG_HARVEST_COMMAND
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
-		)
-	endif()
-	ExternalProject_Add_Step(external_clang after_install
-		COMMAND ${CLANG_HARVEST_COMMAND}
-		DEPENDEES mkdir update patch download configure build install
-	)
-endif()
-
-add_dependencies(
-	external_clang
-	ll
-)
+add_dependencies(external_clang ll)

build_files/build_environment/cmake/ffmpeg.cmake

@@ -30,21 +30,13 @@ if(WIN32)
 		--enable-w32threads
 		--disable-pthreads
 		--enable-libopenjpeg
-	)
+		)
 else()
 	set(FFMPEG_EXTRA_FLAGS
 		${FFMPEG_EXTRA_FLAGS}
 		--enable-static
 		--disable-shared
-		--enable-libopenjpeg
-	)
-endif()
-
-if(APPLE)
-	set(FFMPEG_EXTRA_FLAGS
-		${FFMPEG_EXTRA_FLAGS}
-		--target-os=darwin
-		)
+		--enable-libopenjpeg)
 endif()
 
 ExternalProject_Add(external_ffmpeg
@@ -54,7 +46,7 @@ ExternalProject_Add(external_ffmpeg
 	PREFIX ${BUILD_DIR}/ffmpeg
 	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
 		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-		${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_ENV} ${CONFIGURE_COMMAND} ${FFMPEG_EXTRA_FLAGS}
 		--disable-lzma
 		--disable-avfilter
 		--disable-vdpau
@@ -103,35 +95,18 @@ ExternalProject_Add(external_ffmpeg
 		--disable-indev=jack
 		--disable-indev=alsa
 		--disable-outdev=alsa
-		--disable-crystalhd
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
-	BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-	INSTALL_DIR ${LIBDIR}/ffmpeg
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
+  INSTALL_DIR ${LIBDIR}/ffmpeg
 )
 
 if(MSVC)
 	set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)
 
-add_dependencies(
-	external_ffmpeg
-	external_zlib
-	external_faad
-	external_openjpeg
-	external_xvidcore
-	external_x264
-	external_schroedinger
-	external_vpx
-	external_theora
-	external_vorbis
-	external_ogg
-	external_lame
-)
+add_dependencies(external_ffmpeg external_zlib external_faad external_openjpeg external_xvidcore external_x264 external_schroedinger external_vpx external_theora external_vorbis external_ogg external_lame)
 if(WIN32)
-	add_dependencies(
-		external_ffmpeg
-		external_zlib_mingw
-	)
+	add_dependencies(external_ffmpeg external_zlib_mingw)
 endif()

build_files/build_environment/cmake/fftw.cmake

@@ -37,4 +37,4 @@ ExternalProject_Add(external_fftw3
 
 if(MSVC)
 	set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)

build_files/build_environment/cmake/flac.cmake

@@ -29,4 +29,4 @@ ExternalProject_Add(external_flac
 
 if(MSVC)
 	set_target_properties(external_flac PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)

build_files/build_environment/cmake/harvest.cmake

@@ -26,12 +26,16 @@ endif()
 message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
+
 if(BUILD_MODE STREQUAL Release)
 	add_custom_target(Harvest_Release_Results
 				# Zlib Rename the lib file and copy the include/bin folders
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ &&
+				# Boost copy lib + rename boost_1_60 to boost
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/ &&
 				# jpeg rename libfile + copy include
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
@@ -94,6 +98,8 @@ if(BUILD_MODE STREQUAL Release)
 				# tbb
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ &&
+				# llvm
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ &&
 				# opencollada
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/ &&
 				# opensubdiv
@@ -102,20 +108,24 @@ if(BUILD_MODE STREQUAL Release)
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
 				# alembic
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic &&
+				# hdf5
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5 ${HARVEST_TARGET}/hdf5 &&
 				# BlendThumb
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
 				# python
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python35.tar.gz ${HARVEST_TARGET}/Release/python35.tar.gz &&
+				# requests
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/requests ${HARVEST_TARGET}/Release/site-packages/requests &&
 				# numpy
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python35_numpy${PYTHON_POSTFIX}_1.10.tar.gz ${HARVEST_TARGET}/Release/python35_numpy_1.10.tar.gz &&
 				# hidapi
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
 				# webp, straight up copy
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp
 		DEPENDS
-	)
-endif()
+)
+endif(BUILD_MODE STREQUAL Release)
 
 if(BUILD_MODE STREQUAL Debug)
 	add_custom_target(Harvest_Debug_Results
@@ -144,6 +154,12 @@ if(BUILD_MODE STREQUAL Debug)
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib &&
 				# blosc
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib &&
+				# boost
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ &&
+				# llvm
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/ &&
 				# osl
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib &&
@@ -162,12 +178,12 @@ if(BUILD_MODE STREQUAL Debug)
 				# hdf5
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
 				# numpy
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python35_numpy_1.10d.tar.gz ${HARVEST_TARGET}/Release/python35_numpy_1.10d.tar.gz &&
 				# python
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python35_d.tar.gz ${HARVEST_TARGET}/Release/python35_d.tar.gz
 		DEPENDS Package_Python
-	)
-endif()
+)
+endif(BUILD_MODE STREQUAL Debug)
 
 else(WIN32)
 
@@ -192,9 +208,7 @@ function(harvest from to)
 			FILES_MATCHING PATTERN ${pattern}
 			PATTERN "pkgconfig" EXCLUDE
 			PATTERN "cmake" EXCLUDE
-			PATTERN "clang" EXCLUDE
-			PATTERN "__pycache__" EXCLUDE
-			PATTERN "tests" EXCLUDE)
+			PATTERN "clang" EXCLUDE)
 	endif()
 endfunction()
 
@@ -253,7 +267,17 @@ harvest(png/include png/include "*.h")
 harvest(png/lib png/lib "*.a")
 harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
 harvest(python/include python/include "*h")
-harvest(python/lib python/lib "*")
+if(UNIX AND NOT APPLE)
+	harvest(python/lib/libpython${PYTHON_SHORT_VERSION}m.a python/lib/libpython${PYTHON_SHORT_VERSION}m.a)
+	harvest(python/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
+	harvest(requests python/lib/python${PYTHON_SHORT_VERSION}/site-packages/requests "*")
+	harvest(numpy python/lib/python${PYTHON_SHORT_VERSION}/site-packages/numpy "*")
+else()
+	harvest(python/lib/libpython${PYTHON_SHORT_VERSION}m.a python/lib/python${PYTHON_SHORT_VERSION}/libpython${PYTHON_SHORT_VERSION}m.a)
+	harvest(python/release release "*")
+	harvest(requests release/site-packages/requests "*")
+	harvest(numpy release/site-packages/numpy "*")
+endif()
 harvest(schroedinger/lib/libschroedinger-1.0.a ffmpeg/lib/libschroedinger.a)
 harvest(sdl/include/SDL2 sdl/include "*.h")
 harvest(sdl/lib sdl/lib "libSDL2.a")
@@ -273,4 +297,4 @@ harvest(x264/lib ffmpeg/lib "*.a")
 harvest(xml2/lib opencollada/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
 
-endif()
+endif(WIN32)

build_files/build_environment/cmake/hdf5.cmake

@@ -32,11 +32,11 @@ if(WIN32)
 endif()
 
 ExternalProject_Add(external_hdf5
-	URL ${HDF5_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${HDF5_HASH}
-	PREFIX ${BUILD_DIR}/hdf5
-	PATCH_COMMAND ${HDF5_PATCH}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/hdf5
+  URL ${HDF5_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${HDF5_HASH}
+  PREFIX ${BUILD_DIR}/hdf5
+  PATCH_COMMAND ${HDF5_PATCH}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/hdf5
 )

build_files/build_environment/cmake/llvm.cmake

@@ -42,20 +42,3 @@ ExternalProject_Add(ll
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/llvm
 )
-
-if(MSVC)
-	if(BUILD_MODE STREQUAL Release)
-		set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
-	else()
-		set(LLVM_HARVEST_COMMAND
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
-		)
-	endif()
-	ExternalProject_Add_Step(ll after_install
-		COMMAND ${LLVM_HARVEST_COMMAND}
-		DEPENDEES mkdir update patch download configure build install
-	)
-endif()
-

build_files/build_environment/cmake/mingw.cmake

@@ -0,0 +1,40 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(MSVC)
+	if(BUILD_MODE STREQUAL Release)
+		set(NUMPY_POSTFIX)
+		message("Python_binary = ${PYTHON_BINARY}")
+		message("Python_post = ${PYTHON_POSTFIX}")
+
+		ExternalProject_Add(external_numpy
+			URL ${NUMPY_URI}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			URL_HASH MD5=${NUMPY_HASH}
+			PREFIX ${BUILD_DIR}/numpy
+			PATCH_COMMAND ${PATCH_CMD}	--verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
+			CONFIGURE_COMMAND ""
+			LOG_BUILD 1
+			BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build
+			INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-3.5"
+							${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python35_numpy${PYTHON_POSTFIX}_1.11.tar.gz" "."
+		)
+
+		add_dependencies(external_numpy Make_Python_Environment)
+	endif()
+endif()

build_files/build_environment/cmake/numpy.cmake

@@ -25,21 +25,20 @@ if(MSVC)
 		set(NUMPY_DIR_POSTFIX)
 		set(NUMPY_ARCHIVE_POSTFIX)
 		set(NUMPY_BUILD_OPTION)
-	endif()
+	endif(BUILD_MODE STREQUAL Debug)
 endif()
 
 set(NUMPY_POSTFIX)
 
 if(WIN32)
 	set(NUMPY_INSTALL
-		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
-		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}" 
-		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "." 
+		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-3.5${NUMPY_DIR_POSTFIX}"
+		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python35_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
 	)
-	set(NUMPY_PATCH ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff )
 else()
-	set(NUMPY_INSTALL echo .)
-	set(NUMPY_PATCH echo .)
+	set(NUMPY_INSTALL
+		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-3.5/numpy/" "${LIBDIR}/numpy/"
+	)
 endif()
 
 ExternalProject_Add(external_numpy
@@ -47,14 +46,11 @@ ExternalProject_Add(external_numpy
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${NUMPY_HASH}
 	PREFIX ${BUILD_DIR}/numpy
-	PATCH_COMMAND ${NUMPY_PATCH}
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
 	CONFIGURE_COMMAND ""
 	LOG_BUILD 1
-	BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
+	BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION}
 	INSTALL_COMMAND ${NUMPY_INSTALL}
 )
 
-add_dependencies(
-	external_numpy
-	Make_Python_Environment
-)
+add_dependencies(external_numpy Make_Python_Environment)

build_files/build_environment/cmake/openal.cmake

@@ -25,7 +25,6 @@ if(BUILD_MODE STREQUAL Release)
 		-DALSOFT_CONFIG=Off
 		-DALSOFT_HRTF_DEFS=Off
 		-DALSOFT_INSTALL=On
-		-DALSOFT_BACKEND_SNDIO=Off
 	)
 
 	if(UNIX)
@@ -39,6 +38,5 @@ if(BUILD_MODE STREQUAL Release)
 		PREFIX ${BUILD_DIR}/openal
 		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
 		INSTALL_DIR ${LIBDIR}/openal
-		PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff 
 	)
 endif()

build_files/build_environment/cmake/opencollada.cmake

@@ -33,8 +33,5 @@ ExternalProject_Add(external_opencollada
 )
 
 if(UNIX AND NOT APPLE)
-	add_dependencies(
-		external_opencollada
-		external_xml2
-	)
+	add_dependencies(external_opencollada external_xml2)
 endif()

build_files/build_environment/cmake/opencolorio.cmake

@@ -67,7 +67,4 @@ if(NOT WIN32)
 	add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
 endif()
 
-add_dependencies(
-	external_opencolorio
-	external_boost
-)
+add_dependencies(external_opencolorio external_boost)

build_files/build_environment/cmake/openexr.cmake

@@ -38,8 +38,4 @@ ExternalProject_Add(external_openexr
 	INSTALL_DIR ${LIBDIR}/openexr
 )
 
-add_dependencies(
-	external_openexr
-	external_zlib
-	external_ilmbase
-)
+add_dependencies(external_openexr external_zlib external_ilmbase)

build_files/build_environment/cmake/openimageio.cmake

@@ -32,35 +32,12 @@ endif()
 
 if(WIN32)
 	set(PNG_LIBNAME libpng16_static${LIBEXT})
-	set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
-	set(OPENJPEG_POSTFIX _msvc)
+	set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
 else()
 	set(PNG_LIBNAME libpng${LIBEXT})
 	set(OIIO_SIMD_FLAGS)
 endif()
 
-if(WITH_WEBP)
-	set(WEBP_ARGS
-		-DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
-		-DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
-	)
-	set(WEBP_DEP external_webp)
-endif()
-
-if(MSVC)
-	set(OPENJPEG_FLAGS
-		-DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
-		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-	)
-else()
-	set(OPENJPEG_FLAGS
-		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
-	)
-endif()
-
 set(OPENIMAGEIO_EXTRA_ARGS
 	-DBUILDSTATIC=ON
 	${OPENIMAGEIO_LINKSTATIC}
@@ -82,7 +59,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DUSE_GIF=OFF
 	-DUSE_OPENCV=OFF
 	-DUSE_OPENSSL=OFF
-	-DUSE_OPENJPEG=ON
+	-DUSE_OPENJPEG=OFF
 	-DUSE_FFMPEG=OFF
 	-DUSE_PTEX=OFF
 	-DUSE_FREETYPE=OFF
@@ -90,7 +67,6 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DUSE_PYTHON=OFF
 	-DUSE_PYTHON3=OFF
 	-DUSE_OCIO=OFF
-	-DUSE_WEBP=${WITH_WEBP}
 	-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
 	-DOIIO_BUILD_TESTS=OFF
 	-DBUILD_TESTING=OFF
@@ -102,7 +78,6 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
 	-DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
 	-DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
-	${OPENJPEG_FLAGS}
 	-DOCIO_PATH=${LIBDIR}/opencolorio/
 	-DOpenEXR_USE_STATIC_LIBS=On
 	-DOPENEXR_HOME=${LIBDIR}/openexr/
@@ -116,7 +91,8 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
 	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
 	-DSTOP_ON_WARNING=OFF
-	${WEBP_FLAGS}
+	-DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
+	-DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
 	${OIIO_SIMD_FLAGS}
 )
 
@@ -125,28 +101,13 @@ ExternalProject_Add(external_openimageio
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${OPENIMAGEIO_HASH}
 	PREFIX ${BUILD_DIR}/openimageio
-	PATCH_COMMAND
-		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
-		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
+				${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/openimageio
 )
 
-add_dependencies(
-	external_openimageio
-	external_png external_zlib
-	external_ilmbase
-	external_openexr
-	external_jpeg
-	external_boost
-	external_tiff
-	external_opencolorio
-	external_openjpeg${OPENJPEG_POSTFIX}
-	${WEBP_DEP}
-)
+add_dependencies(external_openimageio external_png external_zlib external_ilmbase external_openexr external_jpeg external_boost external_tiff external_webp external_opencolorio)
 if(NOT WIN32)
-	add_dependencies(
-		external_openimageio
-		external_opencolorio_extra
-	)
+	add_dependencies(external_openimageio external_opencolorio_extra)
 endif()

build_files/build_environment/cmake/openjpeg.cmake

@@ -38,27 +38,6 @@ ExternalProject_Add(external_openjpeg
 	INSTALL_DIR ${LIBDIR}/openjpeg
 )
 
-#on windows ffmpeg wants a mingw build, while oiio needs a msvc build
-if(MSVC)
-	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
-	ExternalProject_Add(external_openjpeg_msvc
-		URL ${OPENJPEG_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH SHA256=${OPENJPEG_HASH}
-		PREFIX ${BUILD_DIR}/openjpeg_msvc
-		CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF 
-		INSTALL_DIR ${LIBDIR}/openjpeg_msvc
-	)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_openjpeg_msvc after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
-					${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
-			DEPENDEES install
-		)
-	endif()
-endif()
-
-set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
 if(MSVC)
 	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)

build_files/build_environment/cmake/opensubdiv.cmake

@@ -43,7 +43,7 @@ if(WIN32)
 	set(OPENSUBDIV_EXTRA_ARGS
 		${OPENSUBDIV_EXTRA_ARGS}
 		-DNO_CUDA=${OPENSUBDIV_CUDA}
-		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/cl
 		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
 		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
 		-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
@@ -54,7 +54,6 @@ else()
 		${OPENSUBDIV_EXTRA_ARGS}
 		-DNO_CUDA=ON
 		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
 		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
 	)
 endif()
@@ -69,10 +68,4 @@ ExternalProject_Add(external_opensubdiv
 	INSTALL_DIR ${LIBDIR}/opensubdiv
 )
 
-add_dependencies(
-	external_opensubdiv
-	external_glew
-	external_glfw
-	external_clew
-	external_cuew
-)
+add_dependencies(external_opensubdiv external_glew external_glfw external_clew external_cuew)

build_files/build_environment/cmake/openvdb.cmake

@@ -61,20 +61,11 @@ ExternalProject_Add(openvdb
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${OPENVDB_HASH}
 	PREFIX ${BUILD_DIR}/openvdb
-	PATCH_COMMAND COMMAND
-		${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_openvdb.txt  ${BUILD_DIR}/openvdb/src/openvdb/CMakeLists.txt &&
-		${CMAKE_COMMAND} -E copy_directory ${PATCH_DIR}/cmake/  ${BUILD_DIR}/openvdb/src/openvdb/cmake/ &&
-		${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_vc2013.diff
+	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_openvdb.txt  ${BUILD_DIR}/openvdb/src/openvdb/CMakeLists.txt &&
+						${CMAKE_COMMAND} -E copy_directory ${PATCH_DIR}/cmake/  ${BUILD_DIR}/openvdb/src/openvdb/cmake/ &&
+						${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_vc2013.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/openvdb
 )
 
-add_dependencies(
-	openvdb
-	external_tbb
-	external_boost
-	external_ilmbase
-	external_openexr
-	external_zlib
-	external_blosc
-)
+add_dependencies(openvdb external_tbb external_boost external_ilmbase external_openexr external_zlib external_blosc)

build_files/build_environment/cmake/options.cmake

@@ -19,23 +19,21 @@
 if(WIN32)
 	option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
-option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 
 if(NOT BUILD_MODE)
 	set(BUILD_MODE "Release")
 	message(STATUS "Build type not specified: defaulting to a release build.")
 endif()
-message("BuildMode = ${BUILD_MODE}")
+Message("BuildMode = ${BUILD_MODE}")
 
 if(BUILD_MODE STREQUAL "Debug")
 	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-else(BUILD_MODE STREQUAL "Debug")
+ELSE(BUILD_MODE STREQUAL "Debug")
 	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
-endif()
+ENDIF(BUILD_MODE STREQUAL "Debug")
 
-option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
-file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
+set(DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
 set(PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/build)
 
@@ -56,27 +54,24 @@ if(WIN32)
 	# For OIIO and OSL
 	set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
-	if(MSVC_VERSION GREATER 1909)
-		set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings. 
-	endif()
-	
+	# TODO FIXME highly MSVC specific
 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	else()
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	endif()
-	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
 	set(PLATFORM_FLAGS)
 	set(PLATFORM_CXX_FLAGS)
@@ -112,31 +107,25 @@ if(WIN32)
 	)
 
 	set(CONFIGURE_COMMAND sh ./configure)
-	set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
 else()
 	set(PATCH_CMD patch)
 	set(LIBEXT ".a")
 	set(LIBPREFIX "lib")
 
 	if(APPLE)
-		# Let's get the current Xcode dir, to support xcode-select
-		execute_process(
-			COMMAND xcode-select --print-path
-			OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
 		set(OSX_ARCHITECTURES x86_64)
 		set(OSX_DEPLOYMENT_TARGET 10.9)
 		set(OSX_SDK_VERSION 10.12)
-		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)
+		set(OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)
 
 		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
 		set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
 		set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
 		set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
 		set(PLATFORM_CMAKE_FLAGS
-			-DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
-			-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-			-DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+			 -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
+			 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
+			 -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
 		)
 	else()
 		set(PLATFORM_CFLAGS "-fPIC")
@@ -173,7 +162,6 @@ else()
 	)
 	set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
 	set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
-	set(CONFIGURE_COMMAND_NO_TARGET ./configure)
 endif()
 
 set(DEFAULT_CMAKE_FLAGS

build_files/build_environment/cmake/osl.cmake

@@ -21,9 +21,9 @@ if(WIN32)
 	set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
 	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
+		set(OSL_SIMD_FLAGS -DOIIO_SIMD=0)
 	else()
-		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+		set(OSL_SIMD_FLAGS -DOIIO_SIMD=sse2)
 	endif()
 else()
 	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
@@ -78,21 +78,10 @@ ExternalProject_Add(external_osl
 	LIST_SEPARATOR ^^
 	URL_HASH MD5=${OSL_HASH}
 	PREFIX ${BUILD_DIR}/osl
-	PATCH_COMMAND
-		${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff &&
-		${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff &&
+				${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/osl
 )
 
-add_dependencies(
-	external_osl
-	external_boost
-	ll
-	external_clang
-	external_ilmbase
-	external_openexr
-	external_zlib
-	external_flexbison
-	external_openimageio
-)
+add_dependencies(external_osl external_boost ll external_clang external_ilmbase external_openexr external_zlib external_flexbison external_openimageio)

build_files/build_environment/cmake/png.cmake

@@ -31,10 +31,7 @@ ExternalProject_Add(external_png
 	INSTALL_DIR	${LIBDIR}/png
 )
 
-add_dependencies(
-	external_png
-	external_zlib
-)
+add_dependencies(external_png external_zlib)
 
 if(BUILD_MODE STREQUAL Debug)
 	ExternalProject_Add_Step(external_png after_install

build_files/build_environment/cmake/pthreads.cmake

@@ -35,12 +35,11 @@ if(WIN32)
 			CONFIGURE_COMMAND echo .
 			PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
 			BUILD_COMMAND ${PTHREADS_BUILD}
-			INSTALL_COMMAND COMMAND
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
+			INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll &&
+															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} &&
+															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
+															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
+															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
 			INSTALL_DIR ${LIBDIR}/pthreads
 		)
 endif()

build_files/build_environment/cmake/python.cmake

@@ -44,22 +44,20 @@ if(WIN32)
 		DOWNLOAD_DIR ${DOWNLOAD_DIR}
 		URL_HASH MD5=${PYTHON_HASH}
 		PREFIX ${BUILD_DIR}/python
-		PATCH_COMMAND
-			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python.diff &&
-			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/pc < ${PATCH_DIR}/pyshell.diff
+		PATCH_COMMAND echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+						 mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+						 ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python.diff &&
+						 ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/pc < ${PATCH_DIR}/pyshell.diff
 		CONFIGURE_COMMAND ""
 		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE} -k ${PYTHON_COMPILER_STRING}
-		INSTALL_COMMAND COMMAND
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
-			${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
-			${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
+		INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python35${PYTHON_POSTFIX}.dll &&
+								${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python35${PYTHON_POSTFIX}.lib &&
+								${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python35${PYTHON_POSTFIX}.exp &&
+								${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python3.5 &&
+								${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python3.5/pyconfig.h
 	)
-	message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
-	message("POutput = ${PYTHON_OUTPUTDIR}")
+	Message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
+	Message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
 	if(APPLE)
 		# we need to manually add homebrew headers to get ssl module building
@@ -84,12 +82,18 @@ else()
 		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
 		INSTALL_DIR ${LIBDIR}/python)
 
-	add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
+	add_custom_command(
+		OUTPUT ${LIBDIR}/python/release/python_x86_64.zip
+		WORKING_DIRECTORY ${LIBDIR}/python
+		COMMAND mkdir -p release
+		COMMAND zip -r release/python_x86_64.zip lib/python${PYTHON_SHORT_VERSION} lib/pkgconfig --exclude *__pycache__*)
+	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python/release/python_x86_64.zip)
+	add_custom_target(Make_Python_Environment ALL DEPENDS Package_Python)
 endif()
 
 if(MSVC)
 	add_custom_command(
-		OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+		OUTPUT ${LIBDIR}/python35${PYTHON_POSTFIX}.tar.gz
 		OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
@@ -114,10 +118,10 @@ if(MSVC)
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
+		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python35${PYTHON_POSTFIX}.tar.gz" "."
 	)
 
-	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
+	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python35${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
 
 	if(MSVC12)
 		set(PYTHON_DISTUTIL_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/run/lib/distutils < ${PATCH_DIR}/python_runtime_vc2013.diff)
@@ -129,12 +133,12 @@ if(MSVC)
 		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
 		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
 		COMMAND	${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib  #missing postfix on purpose, distutils is not expecting it
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python35${PYTHON_POSTFIX}.dll
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python35.lib  #missing postfix on purpose, distutils is not expecting it
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python35${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python35${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
 		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
 		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
 		COMMAND	${PYTHON_DISTUTIL_PATCH}
 	)
 	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
-endif()
+endif(MSVC)

build_files/build_environment/cmake/python_site_packages.cmake

@@ -1,41 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-if(WIN32)
-	set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests
-	)
-else()
-	set(HARVEST_CMD echo .)
-endif()
-
-ExternalProject_Add(external_python_site_packages
-	DOWNLOAD_COMMAND ""
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	PREFIX ${BUILD_DIR}/site_packages
-	INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
-)
-
-add_dependencies(
-	external_python_site_packages
-	Make_Python_Environment
-)

build_files/build_environment/cmake/requests.cmake

@@ -0,0 +1,29 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(BUILD_MODE STREQUAL Release)
+	ExternalProject_Add(external_requests
+		URL ${REQUESTS_URI}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		URL_HASH MD5=${REQUESTS_HASH}
+		PREFIX ${BUILD_DIR}/requests
+		CONFIGURE_COMMAND ""
+		BUILD_COMMAND ""
+		INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/requests/src/external_requests/requests ${LIBDIR}/requests
+	)
+endif(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/schroedinger.cmake

@@ -38,10 +38,7 @@ ExternalProject_Add(external_schroedinger
 	INSTALL_DIR ${LIBDIR}/schroedinger
 )
 
-add_dependencies(
-	external_schroedinger
-	external_orc
-)
+add_dependencies(external_schroedinger external_orc)
 
 if(MSVC)
 	set_target_properties(external_schroedinger PROPERTIES FOLDER Mingw)

build_files/build_environment/cmake/sndfile.cmake

@@ -21,16 +21,6 @@ set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR
 
 if(WIN32)
 	set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
-	#shared for windows because static libs will drag in a libgcc dependency.
-	set(SNDFILE_OPTIONS --disable-static --enable-shared )
-else()
-	set(SNDFILE_OPTIONS --enable-static --disable-shared )
-endif()
-
-if(UNIX)
-	set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
-else()
-	set(SNDFILE_PATCH_CMD)
 endif()
 
 ExternalProject_Add(external_sndfile
@@ -38,8 +28,7 @@ ExternalProject_Add(external_sndfile
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${SNDFILE_HASH}
 	PREFIX ${BUILD_DIR}/sndfile
-	PATCH_COMMAND ${SNDFILE_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} --enable-static --disable-shared --prefix=${mingw_LIBDIR}/sndfile
 	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
 	INSTALL_DIR ${LIBDIR}/sndfile
@@ -49,14 +38,7 @@ if(MSVC)
 	set_target_properties(external_sndfile PROPERTIES FOLDER Mingw)
 endif()
 
-add_dependencies(
-	external_sndfile
-	external_ogg
-	external_vorbis
-)
+add_dependencies(external_sndfile external_ogg external_vorbis)
 if(UNIX)
-	add_dependencies(
-		external_sndfile
-		external_flac
-	)
+	add_dependencies(external_sndfile external_flac)
 endif()

build_files/build_environment/cmake/tbb.cmake

@@ -23,14 +23,6 @@ set(TBB_EXTRA_ARGS
 	-DTBB_BUILD_STATIC=On
 )
 
-if(TBB_VERSION MATCHES 2018)
-	set(TBB_VS_VERSION vs2013)
-elseif(TBB_VERSION MATCHES 2017)
-	set(TBB_VS_VERSION vs2012)
-else()
-	set(TBB_VS_VERSION vs2010)
-endif()
-
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
 	URL ${TBB_URI}
@@ -38,7 +30,7 @@ ExternalProject_Add(external_tbb
 	URL_HASH MD5=${TBB_HASH}
 	PREFIX ${BUILD_DIR}/tbb
 	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/${TBB_VS_VERSION}/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2010/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/tbb
 )

build_files/build_environment/cmake/theora.cmake

@@ -33,11 +33,7 @@ ExternalProject_Add(external_theora
 	INSTALL_DIR ${LIBDIR}/theora
 )
 
-add_dependencies(
-	external_theora
-	external_vorbis
-	external_ogg
-)
+add_dependencies(external_theora external_vorbis external_ogg)
 
 if(MSVC)
 	set_target_properties(external_theora PROPERTIES FOLDER Mingw)

build_files/build_environment/cmake/tiff.cmake

@@ -34,10 +34,7 @@ ExternalProject_Add(external_tiff
 	INSTALL_DIR ${LIBDIR}/tiff
 )
 
-add_dependencies(
-	external_tiff
-	external_zlib
-)
+add_dependencies(external_tiff external_zlib)
 
 if(BUILD_MODE STREQUAL Debug)
 	ExternalProject_Add_Step(external_tiff after_install

build_files/build_environment/cmake/versions.cmake

@@ -104,10 +104,10 @@ set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/6de971097c
 set(OPENCOLORIO_HASH c9de0fd98f26ce6f2e08d617ca68b8e4)
 
 set(LLVM_VERSION 3.4.2)
-set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz)
+set(LLVM_URI http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz)
 set(LLVM_HASH a20669f75967440de949ac3b1bad439c)
 
-set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz)
+set(CLANG_URI http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz)
 set(CLANG_HASH 87945973b7c73038871c5f849a818588)
 
 set(OPENIMAGEIO_VERSION 1.7.15)
@@ -131,37 +131,27 @@ set(OSL_VERSION 1.7.5)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip)
 set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf)
 
-set(PYTHON_VERSION 3.6.2)
-set(PYTHON_SHORT_VERSION 3.6)
-set(PYTHON_SHORT_VERSION_NO_DOTS 36)
+set(PYTHON_VERSION 3.5.3)
+set(PYTHON_SHORT_VERSION 3.5)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH 2c68846471994897278364fc18730dd9)
+set(PYTHON_HASH 57d1f8bfbabf4f2500273fb0706e6f21)
 
-if(UNIX AND NOT APPLE)
-	# Needed to be compatible with GCC 7, other platforms can upgrade later
-	set(TBB_VERSION 2017_U7)
-	set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
-	set(TBB_HASH 364f2a4b80e978f38a69cbf7c466b898)
-else()
-	set(TBB_VERSION 44_20160128)
-	set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz)
-	set(TBB_HASH 9d8a4cdf43496f1b3f7c473a5248e5cc)
-endif()
+set(TBB_VERSION 44_20160128)
+set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz)
+set(TBB_HASH 9d8a4cdf43496f1b3f7c473a5248e5cc)
 
 set(OPENVDB_VERSION 3.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
 set(OPENVDB_HASH 30a7e9571a03ab7bcf1a39fb62aa436f)
 
-set(IDNA_VERSION 2.6)
-set(CHARDET_VERSION 3.0.2)
-set(URLLIB3_VERSION 1.22)
-set(CERTIFI_VERSION 2017.7.27.1)
-set(REQUESTS_VERSION 2.18.4)
+set(REQUESTS_VERSION v2.10.0)
+set(REQUESTS_URI https://github.com/kennethreitz/requests/archive/${REQUESTS_VERSION}.zip)
+set(REQUESTS_HASH 6ebefdf0210c7f0933f61501334e46c3)
 
-set(NUMPY_VERSION v1.13.1)
-set(NUMPY_SHORT_VERSION 1.13)
-set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip)
-set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae)
+set(NUMPY_VERSION v1.10.1)
+set(NUMPY_SHORT_VERSION 1.10)
+set(NUMPY_URI https://pypi.python.org/packages/a5/2e/5412784108f5dc0f827fb460ccdeaa9d76286979fe5ddd070d526d168a59/numpy-1.10.1.zip)
+set(NUMPY_HASH 6f57c58bc5b28440fbeccd505da63d58)
 
 set(LAME_VERSION 3.99.5)
 set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz)
@@ -202,11 +192,9 @@ set(XVIDCORE_VERSION 1.3.4)
 set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
 set(XVIDCORE_HASH 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f)
 
-#this has to be in sync with the version in blenders /extern folder
-set(OPENJPEG_VERSION 1.5.2)
-set(OPENJPEG_SHORT_VERSION 1.5)
+set(OPENJPEG_VERSION 1.5)
 set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d)
+set(OPENJPEG_HASH 60662566595e02104c0f6d1052f8b1669624c646e62b6280d5fd5a66d4e92f8d)
 
 set(FAAD_VERSION 2-2.7)
 set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
@@ -228,9 +216,9 @@ set(LAPACK_VERSION 3.6.0)
 set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
 set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101)
 
-set(SNDFILE_VERSION 1.0.28)
+set(SNDFILE_VERSION 1.0.26)
 set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
-set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
+set(SNDFILE_HASH ec810a0c60c08772a8a5552704b63393)
 
 #set(HIDAPI_VERSION 0.8.0-rc1)
 #set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)

build_files/build_environment/cmake/vorbis.cmake

@@ -31,10 +31,7 @@ ExternalProject_Add(external_vorbis
 	INSTALL_DIR ${LIBDIR}/vorbis
 )
 
-add_dependencies(
-	external_vorbis
-	external_ogg
-)
+add_dependencies(external_vorbis external_ogg)
 
 if(MSVC)
 	set_target_properties(external_vorbis PROPERTIES FOLDER Mingw)

build_files/build_environment/cmake/vpx.cmake

@@ -23,11 +23,7 @@ if(WIN32)
 		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc)
 	endif()
 else()
-	if(APPLE)
-		set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
-	else()
-		set(VPX_EXTRA_FLAGS --target=generic-gnu)
-	endif()
+	set(VPX_EXTRA_FLAGS --target=generic-gnu)
 endif()
 
 ExternalProject_Add(external_vpx
@@ -37,7 +33,7 @@ ExternalProject_Add(external_vpx
 	PREFIX ${BUILD_DIR}/vpx
 	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
 		cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
-		${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
+		${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vpx
 			--disable-shared
 			--enable-static
 			--disable-install-bins

build_files/build_environment/install_deps.sh

@@ -25,7 +25,7 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
+--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
 with-all,with-opencollada,with-jack,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
@@ -104,6 +104,11 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --no-confirm
         Disable any interaction with user (suitable for automated run).
 
+    --use-cxx11
+        Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch).
+        NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default
+              standard starting from this version).
+
     --with-all
         By default, a number of optional and not-so-often needed libraries are not installed.
         This option will try to install them, at the cost of potential conflicts (depending on
@@ -285,15 +290,15 @@ SUDO="sudo"
 
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=true  # Mandatory in blender2.8
+USE_CXX11=false
 
-PYTHON_VERSION="3.6.2"
-PYTHON_VERSION_MIN="3.6"
+PYTHON_VERSION="3.5.3"
+PYTHON_VERSION_MIN="3.5"
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
 PYTHON_SKIP=false
 
-NUMPY_VERSION="1.13.1"
+NUMPY_VERSION="1.10.1"
 NUMPY_VERSION_MIN="1.8"
 NUMPY_FORCE_BUILD=false
 NUMPY_FORCE_REBUILD=false
@@ -496,6 +501,9 @@ while true; do
     --no-confirm)
       NO_CONFIRM=true; shift; continue
     ;;
+    --use-cxx11)
+      USE_CXX11=true; shift; continue
+    ;;
     --with-all)
       WITH_ALL=true; shift; continue
     ;;
@@ -731,7 +739,7 @@ PRINT ""
 
 # This has to be done here, because user might force some versions...
 PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
-NUMPY_SOURCE=( "https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" )
+NUMPY_SOURCE=( "http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" )
 
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
 BOOST_SOURCE=( "http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download" )
@@ -753,8 +761,8 @@ OIIO_SOURCE=( "https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION
 OIIO_SOURCE_REPO=( "https://github.com/OpenImageIO/oiio.git" )
 OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
 
-LLVM_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
-LLVM_CLANG_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" )
+LLVM_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
+LLVM_CLANG_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" )
 
 OSL_USE_REPO=false
 OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" )
@@ -796,7 +804,7 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 CXXFLAGS_BACK=$CXXFLAGS
 if [ "$USE_CXX11" = true ]; then
-  WARNING "C++11 is now mandatory for blender2.8, this *should* go smoothly with any very recent distribution.
+  WARNING "You are trying to use c++11, this *should* go smoothely with any very recent distribution
 However, if you are experiencing linking errors (also when building Blender itself), please try the following:
     * Re-run this script with '--build-all --force-all' options.
     * Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above.
@@ -1152,7 +1160,7 @@ compile_Numpy() {
 
     cd $_src
 
-    $_python/bin/python3 setup.py install --old-and-unmanageable --prefix=$_inst
+    $_python/bin/python3 setup.py install --prefix=$_inst
 
     if [ -d $_inst ]; then
       # Can't use _create_inst_shortcut here...
@@ -1254,11 +1262,7 @@ compile_Boost() {
 #### Build OCIO ####
 _init_ocio() {
   _src=$SRC/OpenColorIO-$OCIO_VERSION
-  if [ "$OCIO_USE_REPO" = true ]; then
-    _git=true
-  else
-    _git=false
-  fi
+  _git=false
   _inst=$INST/ocio-$OCIO_VERSION
   _inst_shortcut=$INST/ocio
 }
@@ -1650,6 +1654,7 @@ compile_OIIO() {
     cmake_d="$cmake_d -D LINKSTATIC=OFF"
     cmake_d="$cmake_d -D USE_SIMD=sse2"
 
+    cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
     cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION"
 
     if [ "$_with_built_openexr" = true ]; then
@@ -1668,7 +1673,6 @@ compile_OIIO() {
     cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
     cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
-    cmake_d="$cmake_d -D TXT2MAN="
     #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
     #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
 
@@ -1773,7 +1777,7 @@ compile_LLVM() {
       cd $_src
 
       # XXX Ugly patching hack!
-      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.diff"
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.patch"
 
       cd $CWD
 
@@ -1879,7 +1883,7 @@ compile_OSL() {
       git reset --hard
 
       # XXX Ugly patching hack!
-      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.diff"
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.patch"
     fi
 
     # Always refresh the whole build!
@@ -2677,10 +2681,10 @@ install_DEB() {
   install_packages_DEB $_packages
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile1-dev"
-  check_package_DEB $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile1-dev"
+  check_package_DEB $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_DEB $LIBSNDFILE_DEV
+    install_packages_DEB $SNDFILE_DEV
   fi
 
   PRINT ""
@@ -3275,10 +3279,10 @@ install_RPM() {
   fi
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile-devel"
-  check_package_RPM $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile-devel"
+  check_package_RPM $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_RPM $LIBSNDFILE_DEV
+    install_packages_RPM $SNDFILE_DEV
   fi
 
   if [ "$WITH_ALL" = true ]; then
@@ -3682,10 +3686,10 @@ install_ARCH() {
   install_packages_ARCH $_packages
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile"
-  check_package_ARCH $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile"
+  check_package_ARCH $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_ARCH $LIBSNDFILE_DEV
+    install_packages_ARCH $SNDFILE_DEV
   fi
 
   PRINT ""

build_files/build_environment/patches/boost.diff

@@ -1,37 +0,0 @@
---- a/boost/config/compiler/visualc.hpp       2015-12-08 11:55:19 -0700
-+++ b/boost/config/compiler/visualc.hpp    2018-03-17 10:29:52 -0600
-@@ -287,12 +287,3 @@
- #  define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
- #endif
-
--//
--// last known and checked version is 19.00.23026 (VC++ 2015 RTM):
--#if (_MSC_VER > 1900)
--#  if defined(BOOST_ASSERT_CONFIG)
--#     error "Unknown compiler version - please run the configure tests and report the results"
--#  else
--#     pragma message("Unknown compiler version - please run the configure tests and report the results")
--#  endif
--#endif
---- a/boost/type_traits/has_nothrow_assign.hpp	2015-12-13 05:49:42 -0700
-+++ b/boost/type_traits/has_nothrow_assign.hpp	2018-05-27 11:11:02 -0600
-@@ -24,7 +24,7 @@
- #include <boost/type_traits/remove_reference.hpp>
- #endif
- #endif
--#if defined(__GNUC__) || defined(__SUNPRO_CC)
-+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__clang__)
- #include <boost/type_traits/is_const.hpp>
- #include <boost/type_traits/is_volatile.hpp>
- #include <boost/type_traits/is_assignable.hpp>
---- a/boost/type_traits/has_nothrow_constructor.hpp	2015-12-13 05:49:42 -0700
-+++ b/boost/type_traits/has_nothrow_constructor.hpp	2018-05-27 11:11:02 -0600
-@@ -17,7 +17,7 @@
- #if defined(BOOST_MSVC) || defined(BOOST_INTEL)
- #include <boost/type_traits/has_trivial_constructor.hpp>
- #endif
--#if defined(__GNUC__ ) || defined(__SUNPRO_CC)
-+#if defined(__GNUC__ ) || defined(__SUNPRO_CC) || defined(__clang__)
- #include <boost/type_traits/is_default_constructible.hpp>
- #endif
- 

build_files/build_environment/patches/cmake/modules/FindBlosc.cmake

@@ -32,6 +32,7 @@ SET(_blosc_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/blosc
 )
 

build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake

@@ -32,6 +32,7 @@ SET(_cppunit_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/cppunit
 )
 

build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake

@@ -21,9 +21,9 @@
 # ILMBASE_FOUND       - True if IlmBase was found.
 
 # Other standarnd issue macros
-include(FindPackageHandleStandardArgs)
-include(FindPackageMessage)
-include(SelectLibraryConfigurations)
+include (FindPackageHandleStandardArgs)
+include (FindPackageMessage)
+include (SelectLibraryConfigurations)
 
 
 if( ILMBASE_USE_STATIC_LIBS )
@@ -36,42 +36,42 @@ if( ILMBASE_USE_STATIC_LIBS )
 endif()
 
 # Macro to assemble a helper state variable
-macro(SET_STATE_VAR varname)
-  set(tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
-  separate_arguments(tmp_ilmbaselibs)
-  set(tmp_lst
+macro (SET_STATE_VAR varname)
+  set (tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
+  separate_arguments (tmp_ilmbaselibs)
+  set (tmp_lst
     ${ILMBASE_CUSTOM} | ${tmp_ilmbaselibs} |
     ${ILMBASE_HOME} | ${ILMBASE_VERSION} | ${ILMBASE_LIB_AREA}
   )
-  set(${varname} "${tmp_lst}")
-  unset(tmp_ilmbaselibs)
-  unset(tmp_lst)
-endmacro()
+  set (${varname} "${tmp_lst}")
+  unset (tmp_ilmbaselibs)
+  unset (tmp_lst)
+endmacro ()
 
 # To enforce that find_* functions do not use inadvertently existing versions
-if(ILMBASE_CUSTOM)
-  set(ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif()
+if (ILMBASE_CUSTOM)
+  set (ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
+endif ()
 
 # Macro to search for an include directory
-macro(PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
-  string(TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+  string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
   find_path(${tmp_varname} ${includefile}
     HINTS ${${libpath_var}}
     PATH_SUFFIXES include
     ${ILMBASE_FIND_OPTIONS}
   )
-  if(${tmp_varname})
-    mark_as_advanced(${tmp_varname})
-  endif()
-  unset(tmp_varname)
-endmacro()
+  if (${tmp_varname})
+    mark_as_advanced (${tmp_varname})
+  endif ()
+  unset (tmp_varname)
+endmacro ()
 
 
 # Macro to search for the given library and adds the cached
 # variable names to the specified list
-macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
-  string(TOUPPER ${prefix}_${libname} tmp_prefix)
+macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+  string (TOUPPER ${prefix}_${libname} tmp_prefix)
   # Handle new library names for OpenEXR 2.1 build via cmake
   string(REPLACE "." "_" _ILMBASE_VERSION ${ILMBASE_VERSION})
   string(SUBSTRING ${_ILMBASE_VERSION} 0 3 _ILMBASE_VERSION )
@@ -89,90 +89,86 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
     ${ILMBASE_FIND_OPTIONS}
   )
   # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
-  select_library_configurations(${tmp_prefix})
-  list(APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+  select_library_configurations (${tmp_prefix})
+  list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
 
   # Add to the list of variables which should be reset
-  list(APPEND ${cachelist_var}
+  list (APPEND ${cachelist_var}
     ${tmp_prefix}_LIBRARY
     ${tmp_prefix}_LIBRARY_RELEASE
     ${tmp_prefix}_LIBRARY_DEBUG)
-  mark_as_advanced(
+  mark_as_advanced (
     ${tmp_prefix}_LIBRARY
     ${tmp_prefix}_LIBRARY_RELEASE
     ${tmp_prefix}_LIBRARY_DEBUG)
-  unset(tmp_prefix)
-endmacro()
+  unset (tmp_prefix)
+endmacro ()
 
 
 # Encode the current state of the external variables into a string
-SET_STATE_VAR(ILMBASE_CURRENT_STATE)
+SET_STATE_VAR (ILMBASE_CURRENT_STATE)
 
 # If the state has changed, clear the cached variables
-if(ILMBASE_CACHED_STATE AND
+if (ILMBASE_CACHED_STATE AND
     NOT ILMBASE_CACHED_STATE STREQUAL ILMBASE_CURRENT_STATE)
 
-  foreach(libvar ${ILMBASE_CACHED_VARS})
-    unset(${libvar} CACHE)
-  endforeach()
-endif()
+  foreach (libvar ${ILMBASE_CACHED_VARS})
+    unset (${libvar} CACHE)
+  endforeach ()
+endif ()
 
 
 # Generic search paths
-set(IlmBase_generic_include_paths
+set (IlmBase_generic_include_paths
   ${ILMBASE_CUSTOM_INCLUDE_DIR}
   /usr/include
   /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/include
   /sw/include
-  /opt/local/include
-)
-set(IlmBase_generic_library_paths
+  /opt/local/include)
+set (IlmBase_generic_library_paths
   ${ILMBASE_CUSTOM_LIB_DIR}
   /usr/lib
   /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/lib
   /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /sw/lib
-  /opt/local/lib
-)
+  /opt/local/lib)
 
 # Search paths for the IlmBase files
-if(ILMBASE_HOME)
-  if(ILMBASE_VERSION)
-    set(IlmBase_include_paths
+if (ILMBASE_HOME)
+  if (ILMBASE_VERSION)
+    set (IlmBase_include_paths
       ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/include
-      ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION}
-    )
-    set(IlmBase_library_paths
+      ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION})
+    set (IlmBase_library_paths
       ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/lib
-      ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION}
-    )
+      ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION})
   endif()
-  list(APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
-  set(IlmBase_library_paths
+  list (APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
+  set (IlmBase_library_paths
     ${ILMBASE_HOME}/lib
     ${ILMBASE_HOME}/lib64
     ${ILMBASE_LIB_AREA}
     ${IlmBase_library_paths})
-endif()
-list(APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
-list(APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
+endif ()
+list (APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
+list (APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
 
 # Locate the header files
-PREFIX_FIND_INCLUDE_DIR(IlmBase
+PREFIX_FIND_INCLUDE_DIR (IlmBase
   OpenEXR/IlmBaseConfig.h IlmBase_include_paths)
 
-if(ILMBASE_INCLUDE_DIR)
+if (ILMBASE_INCLUDE_DIR)
   # Get the version from config file, if not already set.
-  if(NOT ILMBASE_VERSION)
+  if (NOT ILMBASE_VERSION)
     FILE(STRINGS "${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h" ILMBASE_BUILD_SPECIFICATION
          REGEX "^[ \t]*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
 
     if(ILMBASE_BUILD_SPECIFICATION)
-      if(NOT IlmBase_FIND_QUIETLY)
+      if (NOT IlmBase_FIND_QUIETLY)
         message(STATUS "${ILMBASE_BUILD_SPECIFICATION}")
-      endif()
+      endif ()
       string(REGEX REPLACE ".*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
              "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
       set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
@@ -182,71 +178,71 @@ if(ILMBASE_INCLUDE_DIR)
       set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
     endif()
   endif()
-endif()
+endif ()
 
 
-if(ILMBASE_CUSTOM)
-  if(NOT ILMBASE_CUSTOM_LIBRARIES)
-    message(FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
+if (ILMBASE_CUSTOM)
+  if (NOT ILMBASE_CUSTOM_LIBRARIES)
+    message (FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
   endif()
-  set(IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
+  set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
   separate_arguments(IlmBase_Libraries)
-else()
-#elseif(${ILMBASE_VERSION} VERSION_LESS "2.1")
-  set(IlmBase_Libraries Half Iex Imath IlmThread)
-#else()
+else ()
+#elseif (${ILMBASE_VERSION} VERSION_LESS "2.1")
+  set (IlmBase_Libraries Half Iex Imath IlmThread)
+#else ()
 #  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-#  set(IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
-endif()
+#  set (IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
+endif ()
 
 
 # Locate the IlmBase libraries
-set(IlmBase_libvars "")
-set(IlmBase_cachevars "")
-foreach(ilmbase_lib ${IlmBase_Libraries})
-  PREFIX_FIND_LIB(IlmBase ${ilmbase_lib}
+set (IlmBase_libvars "")
+set (IlmBase_cachevars "")
+foreach (ilmbase_lib ${IlmBase_Libraries})
+  PREFIX_FIND_LIB (IlmBase ${ilmbase_lib}
     IlmBase_library_paths IlmBase_libvars IlmBase_cachevars)
-endforeach()
+endforeach ()
 # Create the list of variables that might need to be cleared
-set(ILMBASE_CACHED_VARS
+set (ILMBASE_CACHED_VARS
   ILMBASE_INCLUDE_DIR ${IlmBase_cachevars}
   CACHE INTERNAL "Variables set by FindIlmBase.cmake" FORCE)
 
 # Store the current state so that variables might be cleared if required
-set(ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
+set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
   CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
 
 # Link with pthreads if required
-if(NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
-  file(STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
+if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
+  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
     ILMBASE_HAVE_PTHREAD
     REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
   )
-  if(ILMBASE_HAVE_PTHREAD)
-    find_package(Threads)
-    if(CMAKE_USE_PTHREADS_INIT)
-      set(ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-    endif()
-  endif()
-endif()
+  if (ILMBASE_HAVE_PTHREAD)
+    find_package (Threads)
+    if (CMAKE_USE_PTHREADS_INIT)
+      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+    endif ()
+  endif ()
+endif ()
 
 # Use the standard function to handle ILMBASE_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(IlmBase DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (IlmBase DEFAULT_MSG
   ILMBASE_INCLUDE_DIR ${IlmBase_libvars})
 
-if(ILMBASE_FOUND)
-  set(ILMBASE_LIBRARIES "")
-  foreach(tmplib ${IlmBase_libvars})
-    list(APPEND ILMBASE_LIBRARIES ${${tmplib}})
-  endforeach()
-  list(APPEND ILMBASE_LIBRARIES ${ILMBASE_PTHREADS})
-  if(NOT IlmBase_FIND_QUIETLY)
-    FIND_PACKAGE_MESSAGE(ILMBASE
+if (ILMBASE_FOUND)
+  set (ILMBASE_LIBRARIES "")
+  foreach (tmplib ${IlmBase_libvars})
+    list (APPEND ILMBASE_LIBRARIES ${${tmplib}})
+  endforeach ()
+  list (APPEND ILMBASE_LIBRARIES ${ILMBASE_PTHREADS})
+  if (NOT IlmBase_FIND_QUIETLY)
+    FIND_PACKAGE_MESSAGE (ILMBASE
       "Found IlmBase: ${ILMBASE_LIBRARIES}"
       "[${ILMBASE_INCLUDE_DIR}][${ILMBASE_LIBRARIES}][${ILMBASE_CURRENT_STATE}]"
       )
-  endif()
-endif()
+  endif ()
+endif ()
 
 # Restore the original find library ordering
 if( ILMBASE_USE_STATIC_LIBS )
@@ -254,11 +250,11 @@ if( ILMBASE_USE_STATIC_LIBS )
 endif()
 
 # Unset the helper variables to avoid pollution
-unset(ILMBASE_CURRENT_STATE)
-unset(IlmBase_include_paths)
-unset(IlmBase_library_paths)
-unset(IlmBase_generic_include_paths)
-unset(IlmBase_generic_library_paths)
-unset(IlmBase_libvars)
-unset(IlmBase_cachevars)
-unset(ILMBASE_PTHREADS)
+unset (ILMBASE_CURRENT_STATE)
+unset (IlmBase_include_paths)
+unset (IlmBase_library_paths)
+unset (IlmBase_generic_include_paths)
+unset (IlmBase_generic_library_paths)
+unset (IlmBase_libvars)
+unset (IlmBase_cachevars)
+unset (ILMBASE_PTHREADS)

build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake

@@ -32,6 +32,7 @@ SET(_logc4plus_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/logc4plus
 )
 

build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake

@@ -23,12 +23,12 @@
 # OPENEXR_FOUND       - True if OpenEXR was found.
 
 # Other standarnd issue macros
-include(SelectLibraryConfigurations)
-include(FindPackageHandleStandardArgs)
-include(FindPackageMessage)
+include (SelectLibraryConfigurations)
+include (FindPackageHandleStandardArgs)
+include (FindPackageMessage)
 
-if(OPENEXR_USE_STATIC_LIBS)
-  set(_openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+if( OPENEXR_USE_STATIC_LIBS )
+  set( _openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   if(WIN32)
     set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
   else()
@@ -37,39 +37,39 @@ if(OPENEXR_USE_STATIC_LIBS)
 endif()
 
 # Macro to assemble a helper state variable
-macro(SET_STATE_VAR varname)
-  set(tmp_lst
+macro (SET_STATE_VAR varname)
+  set (tmp_lst
     ${OPENEXR_CUSTOM} | ${OPENEXR_CUSTOM_LIBRARY} |
     ${OPENEXR_HOME} | ${OPENEXR_VERSION} | ${OPENEXR_LIB_AREA}
   )
-  set(${varname} "${tmp_lst}")
-  unset(tmp_lst)
-endmacro()
+  set (${varname} "${tmp_lst}")
+  unset (tmp_lst)
+endmacro ()
 
 # To enforce that find_* functions do not use inadvertently existing versions
-if(OPENEXR_CUSTOM)
-  set(OPENEXR_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif()
+if (OPENEXR_CUSTOM)
+  set (OPENEXR_FIND_OPTIONS "NO_DEFAULT_PATH")
+endif ()
 
 # Macro to search for an include directory
-macro(PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
-  string(TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+  string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
   find_path(${tmp_varname} ${includefile}
     HINTS ${${libpath_var}}
     PATH_SUFFIXES include
     ${OPENEXR_FIND_OPTIONS}
   )
-  if(${tmp_varname})
-    mark_as_advanced(${tmp_varname})
-  endif()
-  unset(tmp_varname)
-endmacro()
+  if (${tmp_varname})
+    mark_as_advanced (${tmp_varname})
+  endif ()
+  unset (tmp_varname)
+endmacro ()
 
 
 # Macro to search for the given library and adds the cached
 # variable names to the specified list
-macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
-  string(TOUPPER ${prefix}_${libname} tmp_prefix)
+macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+  string (TOUPPER ${prefix}_${libname} tmp_prefix)
   # Handle new library names for OpenEXR 2.1 build via cmake
   string(REPLACE "." "_" _ILMBASE_VERSION ${ILMBASE_VERSION})
   string(SUBSTRING ${_ILMBASE_VERSION} 0 3 _ILMBASE_VERSION )
@@ -86,91 +86,89 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
     ${OPENEXR_FIND_OPTIONS}
   )
   # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
-  select_library_configurations(${tmp_prefix})
-  list(APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+  select_library_configurations (${tmp_prefix})
+  list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
 
   # Add to the list of variables which should be reset
-  list(APPEND ${cachelist_var}
+  list (APPEND ${cachelist_var}
     ${tmp_prefix}_LIBRARY
     ${tmp_prefix}_LIBRARY_RELEASE
     ${tmp_prefix}_LIBRARY_DEBUG)
-  mark_as_advanced(
+  mark_as_advanced (
     ${tmp_prefix}_LIBRARY
     ${tmp_prefix}_LIBRARY_RELEASE
     ${tmp_prefix}_LIBRARY_DEBUG)
-  unset(tmp_prefix)
-endmacro()
+  unset (tmp_prefix)
+endmacro ()
 
 
 # Encode the current state of the external variables into a string
-SET_STATE_VAR(OPENEXR_CURRENT_STATE)
+SET_STATE_VAR (OPENEXR_CURRENT_STATE)
 
 # If the state has changed, clear the cached variables
-if(OPENEXR_CACHED_STATE AND
+if (OPENEXR_CACHED_STATE AND
     NOT OPENEXR_CACHED_STATE STREQUAL OPENEXR_CURRENT_STATE)
-  foreach(libvar ${OPENEXR_CACHED_VARS})
-    unset(${libvar} CACHE)
-  endforeach()
-endif()
+  foreach (libvar ${OPENEXR_CACHED_VARS})
+    unset (${libvar} CACHE)
+  endforeach ()
+endif ()
 
 # Generic search paths
-set(OpenEXR_generic_include_paths
+set (OpenEXR_generic_include_paths
   ${OPENEXR_CUSTOM_INCLUDE_DIR}
   /usr/include
   /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/include
   /sw/include
-  /opt/local/include
-)
-set(OpenEXR_generic_library_paths
+  /opt/local/include)
+set (OpenEXR_generic_library_paths
   ${OPENEXR_CUSTOM_LIB_DIR}
   /usr/lib
   /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/lib
   /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /sw/lib
-  /opt/local/lib
-)
+  /opt/local/lib)
 
 # Search paths for the OpenEXR files
-if(OPENEXR_HOME)
-  set(OpenEXR_library_paths
+if (OPENEXR_HOME)
+  set (OpenEXR_library_paths
     ${OPENEXR_HOME}/lib
     ${OPENEXR_HOME}/lib64)
-  if(OPENEXR_VERSION)
-    set(OpenEXR_include_paths
+  if (OPENEXR_VERSION)
+    set (OpenEXR_include_paths
       ${OPENEXR_HOME}/openexr-${OPENEXR_VERSION}/include
       ${OPENEXR_HOME}/include/openexr-${OPENEXR_VERSION})
-    list(APPEND OpenEXR_library_paths
+    list (APPEND OpenEXR_library_paths
       ${OPENEXR_HOME}/openexr-${OPENEXR_VERSION}/lib
       ${OPENEXR_HOME}/lib/openexr-${OPENEXR_VERSION})
   endif()
-  list(APPEND OpenEXR_include_paths ${OPENEXR_HOME}/include)
-  if(OPENEXR_LIB_AREA)
-    list(INSERT OpenEXR_library_paths 2 ${OPENEXR_LIB_AREA})
-  endif()
-endif()
-if(ILMBASE_HOME AND OPENEXR_VERSION)
-  list(APPEND OpenEXR_include_paths
+  list (APPEND OpenEXR_include_paths ${OPENEXR_HOME}/include)
+  if (OPENEXR_LIB_AREA)
+    list (INSERT OpenEXR_library_paths 2 ${OPENEXR_LIB_AREA})
+  endif ()
+endif ()
+if (ILMBASE_HOME AND OPENEXR_VERSION)
+  list (APPEND OpenEXR_include_paths
     ${ILMBASE_HOME}/include/openexr-${OPENEXR_VERSION})
 endif()
-list(APPEND OpenEXR_include_paths ${OpenEXR_generic_include_paths})
-list(APPEND OpenEXR_library_paths ${OpenEXR_generic_library_paths})
+list (APPEND OpenEXR_include_paths ${OpenEXR_generic_include_paths})
+list (APPEND OpenEXR_library_paths ${OpenEXR_generic_library_paths})
 
 # Locate the header files
-PREFIX_FIND_INCLUDE_DIR(OpenEXR
+PREFIX_FIND_INCLUDE_DIR (OpenEXR
   OpenEXR/ImfArray.h OpenEXR_include_paths)
 
-if(OPENEXR_INCLUDE_DIR)
+if (OPENEXR_INCLUDE_DIR)
   # Get the version from config file, if not already set.
-  if(NOT OPENEXR_VERSION)
+  if (NOT OPENEXR_VERSION)
     FILE(STRINGS "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h" OPENEXR_BUILD_SPECIFICATION
          REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
 
     if(OPENEXR_BUILD_SPECIFICATION)
-      if(NOT OpenEXR_FIND_QUIETLY)
+      if (NOT OpenEXR_FIND_QUIETLY)
         message(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
-      endif()
+      endif ()
       string(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
              "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
       set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
@@ -180,56 +178,56 @@ if(OPENEXR_INCLUDE_DIR)
       set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
     endif()
   endif()
-endif()
+endif ()
 
-if(OPENEXR_CUSTOM)
-  if(NOT OPENEXR_CUSTOM_LIBRARY)
-    message(FATAL_ERROR "Custom OpenEXR library requested but OPENEXR_CUSTOM_LIBRARY is not set.")
+if (OPENEXR_CUSTOM)
+  if (NOT OPENEXR_CUSTOM_LIBRARY)
+    message (FATAL_ERROR "Custom OpenEXR library requested but OPENEXR_CUSTOM_LIBRARY is not set.")
   endif()
-  set(OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY})
-else()
-#elseif(${OPENEXR_VERSION} VERSION_LESS "2.1")
-  set(OpenEXR_Library IlmImf)
-#else()
+  set (OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY})
+else ()
+#elseif (${OPENEXR_VERSION} VERSION_LESS "2.1")
+  set (OpenEXR_Library IlmImf)
+#else ()
 #  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
-#  set(OpenEXR_Library IlmImf-${_openexr_libs_ver})
-endif()
+#  set (OpenEXR_Library IlmImf-${_openexr_libs_ver})
+endif ()
 
 # Locate the OpenEXR library
-set(OpenEXR_libvars "")
-set(OpenEXR_cachevars "")
-PREFIX_FIND_LIB(OpenEXR ${OpenEXR_Library}
+set (OpenEXR_libvars "")
+set (OpenEXR_cachevars "")
+PREFIX_FIND_LIB (OpenEXR ${OpenEXR_Library}
   OpenEXR_library_paths OpenEXR_libvars OpenEXR_cachevars)
 
 # Create the list of variables that might need to be cleared
-set(OPENEXR_CACHED_VARS
+set (OPENEXR_CACHED_VARS
   OPENEXR_INCLUDE_DIR ${OpenEXR_cachevars}
   CACHE INTERNAL "Variables set by FindOpenEXR.cmake" FORCE)
 
 # Store the current state so that variables might be cleared if required
-set(OPENEXR_CACHED_STATE ${OPENEXR_CURRENT_STATE}
+set (OPENEXR_CACHED_STATE ${OPENEXR_CURRENT_STATE}
   CACHE INTERNAL "State last seen by FindOpenEXR.cmake" FORCE)
 
 # Always link explicitly with zlib
-set(OPENEXR_ZLIB ${ZLIB_LIBRARIES})
+set (OPENEXR_ZLIB ${ZLIB_LIBRARIES})
 
 # Use the standard function to handle OPENEXR_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (OpenEXR DEFAULT_MSG
   OPENEXR_INCLUDE_DIR ${OpenEXR_libvars})
 
-if(OPENEXR_FOUND)
-  set(OPENEXR_LIBRARIES "")
-  foreach(tmplib ${OpenEXR_libvars})
-    list(APPEND OPENEXR_LIBRARIES ${${tmplib}})
-  endforeach()
-  list(APPEND OPENEXR_LIBRARIES ${ZLIB_LIBRARIES})
-  if(NOT OpenEXR_FIND_QUIETLY)
-    FIND_PACKAGE_MESSAGE(OPENEXR
+if (OPENEXR_FOUND)
+  set (OPENEXR_LIBRARIES "")
+  foreach (tmplib ${OpenEXR_libvars})
+    list (APPEND OPENEXR_LIBRARIES ${${tmplib}})
+  endforeach ()
+  list (APPEND OPENEXR_LIBRARIES ${ZLIB_LIBRARIES})
+  if (NOT OpenEXR_FIND_QUIETLY)
+    FIND_PACKAGE_MESSAGE (OPENEXR
       "Found OpenEXR: ${OPENEXR_LIBRARIES}"
       "[${OPENEXR_INCLUDE_DIR}][${OPENEXR_LIBRARIES}][${OPENEXR_CURRENT_STATE}]"
       )
-  endif()
-endif()
+  endif ()
+endif ()
 
 # Restore the original find library ordering
 if( OPENEXR_USE_STATIC_LIBS )
@@ -237,10 +235,10 @@ if( OPENEXR_USE_STATIC_LIBS )
 endif()
 
 # Unset the helper variables to avoid pollution
-unset(OPENEXR_CURRENT_STATE)
-unset(OpenEXR_include_paths)
-unset(OpenEXR_library_paths)
-unset(OpenEXR_generic_include_paths)
-unset(OpenEXR_generic_library_paths)
-unset(OpenEXR_libvars)
-unset(OpenEXR_cachevars)
+unset (OPENEXR_CURRENT_STATE)
+unset (OpenEXR_include_paths)
+unset (OpenEXR_library_paths)
+unset (OpenEXR_generic_include_paths)
+unset (OpenEXR_generic_library_paths)
+unset (OpenEXR_libvars)
+unset (OpenEXR_cachevars)

build_files/build_environment/patches/cmake/modules/FindTBB.cmake

@@ -32,6 +32,7 @@ SET(_tbb_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/tbb
 )
 

build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake

@@ -49,7 +49,7 @@ macro( select_library_configurations basename )
     # if only the debug version was found, set the release value to be the
     # debug value.
     _set_library_name( ${basename} DEBUG RELEASE )
-    if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
+    if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
         # if the generator supports configuration types or CMAKE_BUILD_TYPE
         # is set, then set optimized and debug options.
         if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )

build_files/build_environment/patches/cmakelists_openvdb.txt

@@ -8,7 +8,7 @@ project(OpenVDB)
 
 # --------------------------------------------------------------------------------
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
 # --------------------------------------------------------------------------------
 

build_files/build_environment/patches/cmakelists_tbb.txt

@@ -88,14 +88,6 @@ elseif(WIN32)
   set(DISABLE_RTTI "/EHs- /GR- ")
 endif()
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  include(CheckCXXCompilerFlag)
-  check_cxx_compiler_flag("-flifetime-dse=1" SUPPORTS_FLIFETIME)
-  if (SUPPORTS_FLIFETIME)
-    add_definitions(-flifetime-dse=1)
-  endif()
-endif()
-
 # Linker export definitions
 if (WIN32)
   add_custom_command(OUTPUT tbb.def

build_files/build_environment/patches/openal.diff

@@ -1,13 +0,0 @@
-diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt
---- external_openal_original/CMakeLists.txt	2016-01-24 20:12:39 -0700
-+++ external_openal/CMakeLists.txt	2018-06-02 12:16:52 -0600
-@@ -885,7 +885,8 @@
- OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF)
- IF(HAVE_WINDOWS_H)
-     # Check MMSystem backend
--    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
-+    set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502")
-+    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
-     IF(HAVE_MMSYSTEM_H)
-         CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
-         IF(HAVE_LIBWINMM)

build_files/build_environment/patches/openimageio_staticexr.diff

@@ -1,11 +1,10 @@
 --- CMakeLists.txt	2016-11-01 01:03:44 -0600
 +++ CMakeLists.txt	2016-12-01 09:20:12 -0700
-@@ -454,7 +454,7 @@
+@@ -454,7 +454,6 @@
      add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
      add_definitions (-D_SCL_SECURE_NO_WARNINGS)
      add_definitions (-DJAS_WIN_MSVC_BUILD)
 -    add_definitions (-DOPENEXR_DLL)
-+    add_definitions (-DOPJ_STATIC)
      if (LINKSTATIC)
          add_definitions (-DBoost_USE_STATIC_LIBS=1)
      else ()

build_files/build_environment/patches/osl.diff

@@ -10,29 +10,3 @@ diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_o
            MAIN_DEPENDENCY ${flexsrc}
            DEPENDS ${${compiler_headers}}
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
---- osl/src/external_osl/src/include/OSL/oslconfig.h	2016-10-31 16:48:19 -0600
-+++ osl/src/external_osl/src/include/OSL/oslconfig.h	2018-05-27 11:18:08 -0600
-@@ -44,12 +44,18 @@
- // same if another packages is compiling against OSL and using these headers
- // (OSL may be C++11 but the client package may be older, or vice versa --
- // use these two symbols to differentiate these cases, when important).
--#if (__cplusplus >= 201402L)
--#  define OSL_CPLUSPLUS_VERSION  14
--#elif (__cplusplus >= 201103L)
--#  define OSL_CPLUSPLUS_VERSION  11
-+
-+// Force C++03 for MSVC in blender since svn the libraries are build with that
-+#if !defined(_MSC_VER)
-+	#if (__cplusplus >= 201402L)
-+	#  define OSL_CPLUSPLUS_VERSION  14
-+	#elif (__cplusplus >= 201103L)
-+	#  define OSL_CPLUSPLUS_VERSION  11
-+	#else
-+	#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
-+	#endif
- #else
--#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
-+	#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
- #endif
- 
- // Symbol export defines

build_files/build_environment/patches/python.diff

@@ -1,45 +1,3 @@
---- Include/Python.h	2017-07-07 21:33:27 -0600
-+++ Include/Python.h	2017-09-19 10:36:10 -0600
-@@ -2,6 +2,10 @@
- #define Py_PYTHON_H
- /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
- 
-+#if _MSC_VER < 1900
-+#define inline __inline
-+#endif
-+
- /* Include nearly all Python header files */
- 
- #include "patchlevel.h"
---- Include/pydtrace.h	2017-07-07 21:33:27 -0600
-+++ Include/pydtrace.h	2017-09-19 10:32:31 -0600
-@@ -2,6 +2,11 @@
- 
- #ifndef Py_DTRACE_H
- #define Py_DTRACE_H
-+
-+#if _MSC_VER < 1900
-+#define inline __inline
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-
---- Modules/_blake2/impl/blake2.h	2017-07-07 21:33:27 -0600
-+++ Modules/_blake2/impl/blake2.h	2017-09-19 10:22:41 -0600
-@@ -19,6 +19,10 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#if _MSC_VER < 1900
-+#define inline __inline 
-+#endif
-+
- #ifdef BLAKE2_NO_INLINE
- #define BLAKE2_LOCAL_INLINE(type) static type
- #endif
-
 --- pcbuild/build.bat   2016-05-21 09:53:55 -0600
 +++ pcbuild/build.bat   2016-05-21 09:56:16 -0600
 @@ -59,6 +59,7 @@
@@ -50,19 +8,19 @@
  if "%~1"=="-r" (set target=Rebuild) & shift & goto CheckOpts
  if "%~1"=="-t" (set target=%2) & shift & shift & goto CheckOpts
  if "%~1"=="-d" (set conf=Debug) & shift & goto CheckOpts
-@@ -120,7 +120,7 @@
+@@ -126,7 +126,7 @@
 
  :Kill
  echo on
--%MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^
-+%MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose% /p:PlatformToolset=%vs_toolset%^
+-msbuild "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^
++msbuild "%dir%\pythoncore.vcxproj" /t:KillPython %verbose% /p:PlatformToolset=%vs_toolset%^
   /p:Configuration=%conf% /p:Platform=%platf%^
   /p:KillPython=true
 
-@@ -130,7 +130,7 @@
+@@ -95,7 +96,7 @@
  rem batch is, shall we say, "lackluster"
  echo on
- %MSBUILD% "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
+ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
 - /p:Configuration=%conf% /p:Platform=%platf%^
 + /p:Configuration=%conf% /p:Platform=%platf% /p:PlatformToolset=%vs_toolset%^
   /p:IncludeExternals=%IncludeExternals%^

build_files/build_environment/patches/python_apple.diff

@@ -1,5 +1,28 @@
---- pyconfig.h.in	2017-09-19 14:41:01.000000000 +0300
-+++ pyconfig.h.in	2017-09-19 14:43:18.000000000 +0300
+--- Modules/expat/expat_external.h   2016-12-17 06:51:30 -0500
++++ Modules/expat/expat_external.h   2016-12-17 06:55:29 -0500
+@@ -7,9 +7,17 @@
+ 
+ /* External API definitions */
+ 
+-/* Namespace external symbols to allow multiple libexpat version to
+-   co-exist. */
+-#include "pyexpatns.h"
++/* 
++
++  HACK: Fix build breakage on MacOS:
++  *** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.6-i386-3.3/pyexpat.so, 2): Symbol not found: _XML_ErrorString
++  This reverts c242a8f30806 from the python hg repo:
++  restore namespacing of pyexpat symbols (closes #19186)
++  See http://bugs.python.org/issue19186#msg214069
++  The recommendation to include Modules/inc at first broke the Linux build...
++  So do it this way, as it was before. Needs some realignment later.
++
++*/
+ 
+ #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+ #define XML_USE_MSC_EXTENSIONS 1
+--- pyconfig.h.in	2017-04-05 02:47:52.000000000 +0200
++++ pyconfig.h.in	2017-04-05 02:51:33.000000000 +0200
 @@ -119,12 +119,6 @@
  /* Define to 1 if you have the `clock' function. */
  #undef HAVE_CLOCK
@@ -10,10 +33,10 @@
 -/* Define to 1 if you have the `clock_gettime' function. */
 -#undef HAVE_CLOCK_GETTIME
 -
- /* Define to 1 if you have the `clock_settime' function. */
- #undef HAVE_CLOCK_SETTIME
+ /* Define if the C compiler supports computed gotos. */
+ #undef HAVE_COMPUTED_GOTOS
  
-@@ -369,9 +363,6 @@
+@@ -338,9 +332,6 @@
  /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
  #undef HAVE_GETC_UNLOCKED
  

build_files/build_environment/patches/python_runtime_vc2013.diff

@@ -1,18 +1,6 @@
---- _msvccompiler.py.orig	2017-05-20 19:31:45 -0600
-+++ _msvccompiler.py	2017-06-10 10:05:38 -0600
-@@ -222,9 +222,9 @@
-         # use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
-         # later to dynamically link to ucrtbase but not vcruntime.
-         self.compile_options = [
--            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
-+            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG' , '/MD'
-         ]
--        self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
-+        #self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
- 
-         self.compile_options_debug = [
-             '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
-@@ -233,11 +233,11 @@
+--- _msvccompiler.py	2016-08-12 10:44:32 -0600
++++ _msvccompiler.py	2016-08-12 10:47:29 -0600
+@@ -246,8 +246,8 @@
          ldflags = [
              '/nologo', '/INCREMENTAL:NO', '/LTCG'
          ]
@@ -22,8 +10,4 @@
 +        #    ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
  
          ldflags_debug = [
--            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
-+            '/nologo', '/INCREMENTAL:NO', '/LTCG'
-         ]
- 
-         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
+             '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'

build_files/build_environment/patches/sndfile.diff

@@ -1,42 +0,0 @@
---- src/Makefile.in	2017-09-26 01:28:47.000000000 +0300
-+++ src/Makefile.in	2017-09-26 01:19:06.000000000 +0300
-@@ -513,7 +513,7 @@
- libcommon_la_SOURCES = common.c file_io.c command.c pcm.c ulaw.c alaw.c \
- 		float32.c double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \
- 		interleave.c strings.c dither.c cart.c broadcast.c audio_detect.c \
-- 		ima_oki_adpcm.c ima_oki_adpcm.h alac.c chunk.c ogg.c chanmap.c \
-+		ima_oki_adpcm.c ima_oki_adpcm.h alac.c chunk.c ogg.c chanmap.c \
- 		windows.c id3.c $(WIN_VERSION_FILE)
- 
- 
-@@ -719,10 +719,10 @@
- 	$(AM_V_CCLD)$(LINK)  $(GSM610_libgsm_la_OBJECTS) $(GSM610_libgsm_la_LIBADD) $(LIBS)
- 
- libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(LINK)  $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(LINK)  $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) $(EXTERNAL_XIPH_LIBS)
- 
- libsndfile.la: $(libsndfile_la_OBJECTS) $(libsndfile_la_DEPENDENCIES) $(EXTRA_libsndfile_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libsndfile_la_LINK) -rpath $(libdir) $(libsndfile_la_OBJECTS) $(libsndfile_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(libsndfile_la_LINK) -rpath $(libdir) $(libsndfile_la_OBJECTS) $(libsndfile_la_LIBADD) $(LIBS) $(EXTERNAL_XIPH_LIBS)
- 
- clean-checkPROGRAMS:
- 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-@@ -924,7 +924,7 @@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) -c -o libsndfile_la-dwd.lo `test -f 'dwd.c' || echo '$(srcdir)/'`dwd.c
- 
- libsndfile_la-flac.lo: flac.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) -MT libsndfile_la-flac.lo -MD -MP -MF $(DEPDIR)/libsndfile_la-flac.Tpo -c -o libsndfile_la-flac.lo `test -f 'flac.c' || echo '$(srcdir)/'`flac.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) $(EXTERNAL_XIPH_CFLAGS) -MT libsndfile_la-flac.lo -MD -MP -MF $(DEPDIR)/libsndfile_la-flac.Tpo -c -o libsndfile_la-flac.lo `test -f 'flac.c' || echo '$(srcdir)/'`flac.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsndfile_la-flac.Tpo $(DEPDIR)/libsndfile_la-flac.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='flac.c' object='libsndfile_la-flac.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -1092,7 +1092,7 @@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) -c -o libsndfile_la-rf64.lo `test -f 'rf64.c' || echo '$(srcdir)/'`rf64.c
- 
- libsndfile_la-ogg_vorbis.lo: ogg_vorbis.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) -MT libsndfile_la-ogg_vorbis.lo -MD -MP -MF $(DEPDIR)/libsndfile_la-ogg_vorbis.Tpo -c -o libsndfile_la-ogg_vorbis.lo `test -f 'ogg_vorbis.c' || echo '$(srcdir)/'`ogg_vorbis.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsndfile_la_CPPFLAGS) $(CPPFLAGS) $(libsndfile_la_CFLAGS) $(CFLAGS) $(EXTERNAL_XIPH_CFLAGS) -MT libsndfile_la-ogg_vorbis.lo -MD -MP -MF $(DEPDIR)/libsndfile_la-ogg_vorbis.Tpo -c -o libsndfile_la-ogg_vorbis.lo `test -f 'ogg_vorbis.c' || echo '$(srcdir)/'`ogg_vorbis.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsndfile_la-ogg_vorbis.Tpo $(DEPDIR)/libsndfile_la-ogg_vorbis.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ogg_vorbis.c' object='libsndfile_la-ogg_vorbis.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

build_files/build_environment/windows/build_deps.cmd

@@ -14,18 +14,10 @@ if NOT "%1" == "" (
     set BuildDir=VS14
     goto par2
   )
-	if "%1" == "2017" (
-    echo "Building for VS2017"
-    set VSVER=15.0
-    set VSVER_SHORT=15
-    set BuildDir=VS15
-    goto par2
-  )
-  
 )
 :usage
 
-Echo Usage build_deps 2013/2015/2017 x64/x86
+Echo Usage build_deps 2013/2015 x64/x86
 goto exit
 :par2
 if NOT "%2" == "" (
@@ -39,10 +31,6 @@ if NOT "%2" == "" (
 		if "%1" == "2015" (
 			set CMAKE_BUILDER=Visual Studio 14 2015
 		)
-		if "%1" == "2017" (
-			set CMAKE_BUILDER=Visual Studio 15 2017
-		)
-		
     goto start
   )
 	if "%2" == "x64" (
@@ -55,10 +43,6 @@ if NOT "%2" == "" (
 		if "%1" == "2015" (
 			set CMAKE_BUILDER=Visual Studio 14 2015 Win64
 		)
-		if "%1" == "2017" (
-			set CMAKE_BUILDER=Visual Studio 15 2017 Win64
-		)
-		
     goto start
   )
 )
@@ -70,7 +54,7 @@ set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=On
 if "%3" == "debug" set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=Off
 
 set SOURCE_DIR=%~dp0\..
-set BUILD_DIR=%cd%\build
+set BUILD_DIR=%~dp0\..\..\..\..\build_windows\deps
 set HARVEST_DIR=%BUILD_DIR%\output
 set STAGING=%BUILD_DIR%\S
 
@@ -78,7 +62,7 @@ rem for python module build
 set MSSdk=1 
 set DISTUTILS_USE_SDK=1  
 rem for python externals source to be shared between the various archs and compilers
-mkdir %BUILD_DIR%\downloads\externals
+mkdir %SOURCE_DIR%\downloads\externals
 
 REM Detect MSVC Installation
 if DEFINED VisualStudioVersion goto msvc_detect_finally
@@ -111,24 +95,24 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 set StatusFile=%BUILD_DIR%\%1_%2.log
-set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads\nasm-2.12.01\;%path%
+set path=%SOURCE_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%SOURCE_DIR%\downloads\nasm-2.12.01\;%path%
 mkdir %STAGING%\%BuildDir%%ARCH%R
 cd %Staging%\%BuildDir%%ARCH%R
 echo %DATE% %TIME% : Start > %StatusFile%
-cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
+cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
-msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
-msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
+msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log 
+msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log 
 echo %DATE% %TIME% : Release Build done >> %StatusFile%
 cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
 echo %DATE% %TIME% : Release Harvest done >> %StatusFile%
 cd %BUILD_DIR%
 mkdir %STAGING%\%BuildDir%%ARCH%D
 cd %Staging%\%BuildDir%%ARCH%D
-cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
+cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
-msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
-msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
+msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log 
+msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps.log
 echo %DATE% %TIME% : Debug Build done >> %StatusFile%
 cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
 echo %DATE% %TIME% : Debug Harvest done >> %StatusFile%

build_files/buildbot/config/blender_linux.cmake

@@ -5,15 +5,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
 # Detect which libc we'll be linking against.
 # Some of the paths will depend on this
 
-if(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
+if (EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
 	set(MULTILIB "/x86_64-linux-gnu")
-elseif(EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
+elseif (EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
 	set(MULTILIB "/i386-linux-gnu")
-elseif(EXISTS "/lib/libc-2.11.3.so")
+elseif (EXISTS "/lib/libc-2.11.3.so")
 	message(STATUS "Building in GLibc-2.11 environment")
 	set(GLIBC "2.11")
 	set(MULTILIB "")
@@ -21,8 +21,9 @@ else()
 	message(FATAL_ERROR "Unknown build environment")
 endif()
 
-# Default to only build Blender
+# Default to only build Blender, not the player
 set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
+set(WITH_PLAYER              OFF CACHE BOOL "" FORCE)
 
 # ######## Linux-specific build options ########
 # Options which are specific to Linux-only platforms
@@ -69,11 +70,11 @@ set(FFMPEG_LIBRARIES
 )
 
 # SndFile libraries
-set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE)
+set(SNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
-set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
+set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE)
 set(OPENAL_LIBRARY
 	${OPENAL_ROOT_DIR}/lib/libopenal.a
 	${OPENAL_ROOT_DIR}/lib/libcommon.a
@@ -139,10 +140,6 @@ set(ZLIB_LIBRARY        "/usr/lib${MULTILIB}/libz.a"     CACHE STRING "" FORCE)
 # OpenVDB
 set(OPENVDB_LIBRARY
 	/opt/lib/openvdb/lib/libopenvdb.a
-	CACHE BOOL "" FORCE
-)
-
-set(BLOSC_LIBRARY
 	/opt/lib/blosc/lib/libblosc.a
 	CACHE BOOL "" FORCE
 )

build_files/buildbot/config/blender_linux_player.cmake

@@ -0,0 +1,12 @@
+# This is applied as an override on top of blender_linux.config
+# Disables all the areas which are not needed for the player.
+set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
+set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
+set(WITH_GHOST_XDND          OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
+set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
+set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
+
+set(WITH_BLENDER             OFF CACHE BOOL "" FORCE)
+set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)

build_files/buildbot/master.cfg

@@ -0,0 +1,376 @@
+# -*- python -*-
+# ex: set syntax=python:
+
+# <pep8 compliant>
+
+# List of the branches being built automatically overnight
+NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
+
+# List of the branches available for force build
+FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"]
+
+"""
+Stock Twisted directory lister doesn't provide any information about last file
+modification time, we hack the class a bit in order to have such functionaliity
+:)
+"""
+
+from buildbot.status.web.base import DirectoryLister
+
+
+def get_files_and_directories(self, directory):
+    from twisted.web.static import (getTypeAndEncoding,
+                                    formatFileSize)
+    import urllib
+    import cgi
+    import time
+    import os
+    files = []
+    dirs = []
+    for path in directory:
+        url = urllib.quote(path, "/")
+        escapedPath = cgi.escape(path)
+        lastmodified = time.ctime(os.path.getmtime(
+            os.path.join(self.path, path)))
+        if os.path.isdir(os.path.join(self.path, path)):
+            url = url + '/'
+            dirs.append({'text': escapedPath + "/", 'href': url,
+                         'size': '', 'type': '[Directory]',
+                         'encoding': '',
+                         'lastmodified': lastmodified})
+        else:
+            mimetype, encoding = getTypeAndEncoding(path, self.contentTypes,
+                                                    self.contentEncodings,
+                                                    self.defaultType)
+            try:
+                size = os.stat(os.path.join(self.path, path)).st_size
+            except OSError:
+                continue
+            files.append({
+                'text': escapedPath, "href": url,
+                'type': '[%s]' % mimetype,
+                'encoding': (encoding and '[%s]' % encoding or ''),
+                'size': formatFileSize(size),
+                'lastmodified': lastmodified})
+    return dirs, files
+DirectoryLister._getFilesAndDirectories = get_files_and_directories
+
+# Dictionary that the buildmaster pays attention to.
+c = BuildmasterConfig = {}
+
+# BUILD SLAVES
+#
+# We load the slaves and their passwords from a separator file, so we can have
+# this one in SVN.
+
+from buildbot.buildslave import BuildSlave
+import master_private
+
+c['slaves'] = []
+
+for slave in master_private.slaves:
+    c['slaves'].append(BuildSlave(slave['name'], slave['password']))
+
+# TCP port through which slaves connect
+
+c['slavePortnum'] = 9989
+
+# CHANGE SOURCES
+
+from buildbot.changes.svnpoller import SVNPoller
+from buildbot.changes.gitpoller import GitPoller
+
+c['change_source'] = GitPoller(
+       'git://git.blender.org/blender.git',
+       pollinterval=1200)
+
+
+# CODEBASES
+#
+# Allow to control separately things like branches for each repo and submodules.
+
+all_repositories = {
+    r'git://git.blender.org/blender.git': 'blender',
+    r'git://git.blender.org/blender-translations.git': 'blender-translations',
+    r'git://git.blender.org/blender-addons.git': 'blender-addons',
+    r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib',
+    r'git://git.blender.org/blender-dev-tools.git': 'blender-dev-tools',
+    r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn',
+}
+
+
+def codebaseGenerator(chdict):
+    return all_repositories[chdict['repository']]
+
+c['codebaseGenerator'] = codebaseGenerator
+
+
+# SCHEDULERS
+#
+# Decide how to react to incoming changes.
+
+# from buildbot.scheduler import Scheduler
+from buildbot.schedulers import timed, forcesched
+
+c['schedulers'] = []
+
+
+def schedule_force_build(name):
+    c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name,
+        builderNames=[name],
+        codebases=[forcesched.CodebaseParameter(
+                codebase="blender",
+                branch=forcesched.ChoiceStringParameter(
+                    name="branch", choices=FORCE_SCHEDULE_BRANCHES, default="master"),
+                # Do not hide revision, can be handy!
+                repository=forcesched.FixedParameter(name="repository", default="", hide=True),
+                project=forcesched.FixedParameter(name="project", default="", hide=True)),
+            # For now, hide other codebases.
+            forcesched.CodebaseParameter(hide=True, codebase="blender-translations"),
+            forcesched.CodebaseParameter(
+                codebase="blender-addons",
+                branch=forcesched.ChoiceStringParameter(
+                    name="branch", choices=["master", "blender2.8"], default="master"),
+                repository=forcesched.FixedParameter(name="repository", default="", hide=True),
+                project=forcesched.FixedParameter(name="project", default="", hide=True),
+                revision=forcesched.FixedParameter(name="revision", default="", hide=True),
+            ),
+            forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
+            forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"),
+            forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
+        properties=[]))
+
+
+def schedule_build(name, hour, minute=0):
+    for current_branch in NIGHT_SCHEDULE_BRANCHES:
+        scheduler_name = "nightly " + name
+        if current_branch:
+            scheduler_name += ' ' + current_branch
+        # Use special addons submodule branch when building blender2.8 branch.
+        addons_branch = "master"
+        if current_branch == "blender2.8":
+            addons_branch = "blender2.8"
+        c['schedulers'].append(timed.Nightly(name=scheduler_name,
+            codebases={
+                "blender": {"repository": ""},
+                "blender-translations": {"repository": "", "branch": "master"},
+                "blender-addons": {"repository": "", "branch": addons_branch},
+                "blender-addons-contrib": {"repository": "", "branch": "master"},
+                "blender-dev-tools": {"repository": "", "branch": "master"},
+                "lib svn": {"repository": "", "branch": "trunk"}},
+            branch=current_branch,
+            builderNames=[name],
+            hour=hour,
+            minute=minute))
+
+
+# BUILDERS
+#
+# The 'builders' list defines the Builders, which tell Buildbot how to
+# perform a build: what steps, and which slaves can execute them.
+# Note that any particular build will only take place on one slave.
+
+from buildbot.process.factory import BuildFactory
+from buildbot.process.properties import Interpolate
+from buildbot.steps.source import SVN
+from buildbot.steps.source import Git
+from buildbot.steps.shell import ShellCommand
+from buildbot.steps.shell import Compile
+from buildbot.steps.shell import Test
+from buildbot.steps.transfer import FileUpload
+from buildbot.steps.master import MasterShellCommand
+from buildbot.config import BuilderConfig
+
+# add builder utility
+
+c['builders'] = []
+buildernames = []
+
+
+def add_builder(c, name, libdir, factory, branch='',
+                rsync=False, hour=3, minute=0):
+    slavenames = []
+
+    for slave in master_private.slaves:
+        if name in slave['builders']:
+            slavenames.append(slave['name'])
+
+    if len(slavenames) > 0:
+        f = factory(name, libdir, branch, rsync)
+        c['builders'].append(BuilderConfig(name=name,
+                                           slavenames=slavenames,
+                                           factory=f,
+                                           category='blender'))
+        buildernames.append(name)
+
+        schedule_build(name, hour, minute)
+        schedule_force_build(name)
+
+# common steps
+
+
+def git_submodule_step(submodule):
+    return Git(name=submodule + '.git',
+               repourl='git://git.blender.org/' + submodule + '.git',
+               mode='update',
+               codebase=submodule,
+               workdir=submodule + '.git')
+
+
+def git_step(branch=''):
+    if branch:
+        return Git(name='blender.git',
+                   repourl='git://git.blender.org/blender.git',
+                   mode='update',
+                   branch=branch,
+                   codebase='blender',
+                   workdir='blender.git',
+                   submodules=True)
+    else:
+        return Git(name='blender.git',
+                   repourl='git://git.blender.org/blender.git',
+                   mode='update',
+                   codebase='blender',
+                   workdir='blender.git',
+                   submodules=True)
+
+
+def git_submodules_update():
+    command = ['git', 'submodule', 'update', '--remote']
+    return ShellCommand(name='Submodules Update',
+                        command=command,
+                        description='updating',
+                        descriptionDone='up to date',
+                        workdir='blender.git')
+
+
+def lib_svn_step(dir):
+    name = "lib svn"
+    if dir == "darwin":
+        name = "C++11 lib svn"
+    return SVN(name=name,
+               baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir,
+               codebase='lib svn',
+               mode='update',
+               defaultBranch='trunk',
+               workdir='lib/' + dir)
+
+
+def rsync_step(id, branch, rsync_script):
+    return ShellCommand(name='rsync',
+                        command=['python', rsync_script, id, branch],
+                        description='uploading',
+                        descriptionDone='uploaded',
+                        workdir='install')
+
+# generic builder
+
+
+def generic_builder(id, libdir='', branch='', rsync=False):
+    filename = 'uploaded/buildbot_upload_' + id + '.zip'
+    compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
+    test_script = '../blender.git/build_files/buildbot/slave_test.py'
+    pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
+    rsync_script = '../blender.git/build_files/buildbot/slave_rsync.py'
+    unpack_script = 'master_unpack.py'
+
+    f = BuildFactory()
+    if libdir != '':
+        f.addStep(lib_svn_step(libdir))
+        # Special trick to make sure we always have all the libs.
+        if libdir.startswith("darwin"):
+            f.addStep(lib_svn_step("darwin"))
+
+    for submodule in ('blender-translations',
+                      'blender-addons',
+                      'blender-addons-contrib',
+                      'blender-dev-tools'):
+        f.addStep(git_submodule_step(submodule))
+
+    f.addStep(git_step(branch))
+    f.addStep(git_submodules_update())
+
+    f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
+    f.addStep(Test(command=['python', test_script, id]))
+    f.addStep(ShellCommand(name='package',
+                           command=['python', pack_script, id, branch or Interpolate('%(src:blender:branch)s')],
+                           description='packaging',
+                           descriptionDone='packaged'))
+    if rsync:
+        f.addStep(rsync_step(id, branch, rsync_script))
+    else:
+        f.addStep(FileUpload(name='upload',
+                             slavesrc='buildbot_upload.zip',
+                             masterdest=filename,
+                             maxsize=180 * 1024 * 1024,
+                             workdir='install'))
+    f.addStep(MasterShellCommand(name='unpack',
+                                 command=['python2.7', unpack_script, filename],
+                                 description='unpacking',
+                                 descriptionDone='unpacked'))
+    return f
+
+# Builders
+
+add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
+# add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1)
+# add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
+add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3)
+add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4)
+add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3)
+add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)
+add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=5)
+add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=6)
+
+# STATUS TARGETS
+#
+# 'status' is a list of Status Targets. The results of each build will be
+# pushed to these targets. buildbot/status/*.py has a variety to choose from,
+# including web pages, email senders, and IRC bots.
+
+c['status'] = []
+
+from buildbot.status import html
+from buildbot.status.web import authz
+from buildbot.status.web import auth
+
+users = []
+for slave in master_private.slaves:
+    users += [(slave['name'], slave['password'])]
+
+authz_cfg = authz.Authz(
+    auth=auth.BasicAuth(users),
+    # change any of these to True to enable; see the manual for more
+    # options
+    gracefulShutdown=False,
+    forceBuild=True,  # use this to test your slave once it is set up
+    forceAllBuilds=False,
+    pingBuilder=False,
+    stopBuild=True,
+    stopAllBuilds=False,
+    cancelPendingBuild=True,
+)
+
+c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
+#c['status'].append(html.WebStatus(http_port=8010))
+
+# PROJECT IDENTITY
+
+c['projectName'] = "Blender"
+c['projectURL'] = "http://www.blender.org"
+
+# the 'buildbotURL' string should point to the location where the buildbot's
+# internal web server (usually the html.WebStatus page) is visible. This
+# typically uses the port number set in the Waterfall 'status' entry, but
+# with an externally-visible host name which the buildbot cannot figure out
+# without some help.
+
+c['buildbotURL'] = "http://builder.blender.org/"
+
+# DB URL
+#
+# This specifies what database buildbot uses to store change and scheduler
+# state.  You can leave this at its default for all but the largest
+# installations.
+
+c['db_url'] = "sqlite:///state.sqlite"

build_files/buildbot/master_unpack.py

@@ -0,0 +1,151 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# Runs on Buildbot master, to unpack incoming unload.zip into latest
+# builds directory and remove older builds.
+
+# <pep8 compliant>
+
+import os
+import shutil
+import sys
+import zipfile
+
+
+# extension stripping
+def strip_extension(filename):
+    extensions = '.zip', '.tar', '.bz2', '.gz', '.tgz', '.tbz', '.exe'
+
+    for ext in extensions:
+        if filename.endswith(ext):
+            filename = filename[:-len(ext)]
+
+    return filename
+
+
+# extract platform from package name
+def get_platform(filename):
+    # name is blender-version-platform.extension. we want to get the
+    # platform out, but there may be some variations, so we fiddle a
+    # bit to handle current and hopefully future names
+    filename = strip_extension(filename)
+    filename = strip_extension(filename)
+
+    tokens = filename.split("-")
+    platforms = ('osx', 'mac', 'bsd',
+                 'win', 'linux', 'source',
+                 'irix', 'solaris')
+    platform_tokens = []
+    found = False
+
+    for i, token in enumerate(tokens):
+        if not found:
+            for platform in platforms:
+                if platform in token.lower():
+                    found = True
+                    break
+
+        if found:
+            platform_tokens += [token]
+
+    return '-'.join(platform_tokens)
+
+
+def get_branch(filename):
+    if filename.startswith("blender-2.8"):
+        return "blender2.8"
+
+    tokens = filename.split("-")
+    branch = ""
+
+    for token in tokens:
+        if token == "blender":
+            return branch
+
+        if branch == "":
+            branch = token
+        else:
+            branch = branch + "-" + token
+
+    return ""
+
+# get filename
+if len(sys.argv) < 2:
+    sys.stderr.write("Not enough arguments, expecting file to unpack\n")
+    sys.exit(1)
+
+filename = sys.argv[1]
+
+# open zip file
+if not os.path.exists(filename):
+    sys.stderr.write("File %r not found.\n" % filename)
+    sys.exit(1)
+
+try:
+    z = zipfile.ZipFile(filename, "r")
+except Exception as ex:
+    sys.stderr.write('Failed to open zip file: %s\n' % str(ex))
+    sys.exit(1)
+
+if len(z.namelist()) != 1:
+    sys.stderr.write("Expected one file in %r." % filename)
+    sys.exit(1)
+
+package = z.namelist()[0]
+packagename = os.path.basename(package)
+
+# detect platform and branch
+platform = get_platform(packagename)
+branch = get_branch(packagename)
+
+if platform == '':
+    sys.stderr.write('Failed to detect platform ' +
+        'from package: %r\n' % packagename)
+    sys.exit(1)
+
+# extract
+if not branch or branch == 'master':
+    directory = 'public_html/download'
+elif branch == 'experimental-build':
+    directory = 'public_html/download/experimental'
+else:
+    directory = 'public_html/download'
+
+try:
+    filename = os.path.join(directory, packagename)
+    zf = z.open(package)
+    f = file(filename, "wb")
+
+    shutil.copyfileobj(zf, f)
+    os.chmod(filename, 0644)
+
+    zf.close()
+    z.close()
+except Exception as ex:
+    sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
+    sys.exit(1)
+
+# remove other files from the same platform and branch
+try:
+    for f in os.listdir(directory):
+        if get_platform(f) == platform and get_branch(f) == branch:
+            if f != packagename:
+                os.remove(os.path.join(directory, f))
+except Exception as ex:
+    sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
+    sys.exit(1)

build_files/buildbot/slave_compile.py

@@ -60,6 +60,7 @@ if 'cmake' in builder:
 
     # Config file to be used (relative to blender's sources root)
     cmake_config_file = "build_files/cmake/config/blender_full.cmake"
+    cmake_player_config_file = None
     cmake_cuda_config_file = None
 
     # Set build options.
@@ -69,12 +70,14 @@ if 'cmake' in builder:
 
     if builder.startswith('mac'):
         # Set up OSX architecture
-        if builder.endswith('x86_64_10_9_cmake'):
+        if builder.endswith('x86_64_10_6_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
-        # Used to trick CUDFA to see CLang as an older version.
-        # cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
-        # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
+        cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF')
+        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
+        cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
+
+
 
     elif builder.startswith('win'):
         if builder.endswith('_vc2015'):
@@ -100,30 +103,32 @@ if 'cmake' in builder:
         elif glibc == 'glibc211':
             deb_name = "squeeze"
         cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
+        cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake"
         if builder.endswith('x86_64_cmake'):
             chroot_name = 'buildbot_' + deb_name + '_x86_64'
-            targets = ['blender']
+            targets = ['player', 'blender']
         elif builder.endswith('i686_cmake'):
             bits = 32
             chroot_name = 'buildbot_' + deb_name + '_i686'
-            targets = ['blender']
+            cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
+            targets = ['player', 'blender', 'cuda']
         cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
                                     "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
 
-    # Prepare CMake options needed to configure cuda binaries compilation, 64bit only.
-    if bits == 64:
-        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
-        cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70")
-        if build_cubins or 'cuda' in targets:
+    # Prepare CMake options needed to configure cuda binaries compilation.
+    cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
+    cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61")
+    if build_cubins or 'cuda' in targets:
+        if bits == 32:
+            cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=OFF")
+        else:
             cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
 
-        # Only modify common cmake options if cuda doesn't require separate target.
-        if 'cuda' not in targets:
-            cmake_options += cuda_cmake_options
-    else:
-        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
+    # Only modify common cmake options if cuda doesn't require separate target.
+    if 'cuda' not in targets:
+        cmake_options += cuda_cmake_options
 
     cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
 
@@ -157,7 +162,9 @@ if 'cmake' in builder:
         os.chdir(target_build_dir)
         # Tweaking CMake options to respect the target
         target_cmake_options = cmake_options[:]
-        if target == 'cuda':
+        if target == 'player':
+            target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file))
+        elif target == 'cuda':
             target_cmake_options += cuda_cmake_options
             target_chroot_prefix = cuda_chroot_prefix[:]
             target_name = 'cycles_kernel_cuda'

build_files/buildbot/slave_pack.py

@@ -101,9 +101,13 @@ if builder.find('cmake') != -1:
         platform = builder.split('_')[0]
         if platform == 'mac':
             # Special exception for OSX
-            platform = 'OSX-10.9-'
-            if builder.endswith('x86_64_10_9_cmake'):
+            platform = 'OSX-10.6-'
+            if builder.endswith('x86_64_10_6_cmake'):
                 platform += 'x86_64'
+            elif builder.endswith('i386_10_6_cmake'):
+                platform += 'i386'
+            elif builder.endswith('ppc_10_6_cmake'):
+                platform += 'ppc'
         if builder.endswith('vc2015'):
             platform += "-vc14"
         builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
@@ -126,6 +130,7 @@ if builder.find('cmake') != -1:
 
     elif builder.startswith('linux_'):
         blender = os.path.join(install_dir, 'blender')
+        blenderplayer = os.path.join(install_dir, 'blenderplayer')
 
         buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h")
         blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
@@ -137,18 +142,18 @@ if builder.find('cmake') != -1:
         blender_glibc = builder.split('_')[1]
 
         if builder.endswith('x86_64_cmake'):
-            chroot_name = 'buildbot_jessie_x86_64'
+            chroot_name = 'buildbot_squeeze_x86_64'
             bits = 64
             blender_arch = 'x86_64'
         elif builder.endswith('i686_cmake'):
-            chroot_name = 'buildbot_jessie_i686'
+            chroot_name = 'buildbot_squeeze_i686'
             bits = 32
             blender_arch = 'i686'
 
         # Strip all unused symbols from the binaries
         print("Stripping binaries...")
         chroot_prefix = ['schroot', '-c', chroot_name, '--']
-        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender])
+        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer])
 
         print("Stripping python...")
         py_target = os.path.join(install_dir, blender_version)

build_files/buildbot/slave_test.py

@@ -44,9 +44,9 @@ if "cmake" in builder:
 
     """
     if builder.endswith('x86_64_cmake'):
-        chroot_name = 'buildbot_jessie_x86_64'
+        chroot_name = 'buildbot_squeeze_x86_64'
     elif builder.endswith('i686_cmake'):
-        chroot_name = 'buildbot_jessie_i686'
+        chroot_name = 'buildbot_squeeze_i686'
     if chroot_name:
         chroot_prefix = ['schroot', '-c', chroot_name, '--']
     """

build_files/cmake/Modules/FindAlembic.cmake

@@ -30,6 +30,7 @@ SET(_alembic_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/alembic
 )
 

build_files/cmake/Modules/FindAudaspace.cmake

@@ -20,6 +20,7 @@ SET(_audaspace_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 # Use pkg-config to get hints about paths

build_files/cmake/Modules/FindBlosc.cmake

@@ -1,72 +0,0 @@
-# - Find Blosc library
-# Find the native Blosc includes and library
-# This module defines
-#  BLOSC_INCLUDE_DIRS, where to find blosc.h, Set when
-#                    Blosc is found.
-#  BLOSC_LIBRARIES, libraries to link against to use Blosc.
-#  BLOSC_ROOT_DIR, The base directory to search for Blosc.
-#                This can also be an environment variable.
-#  BLOSC_FOUND, If false, do not try to use Blosc.
-#
-# also defined, but not for general use are
-#  BLOSC_LIBRARY, where to find the Blosc library.
-
-#=============================================================================
-# Copyright 2018 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If BLOSC_ROOT_DIR was defined in the environment, use it.
-IF(NOT BLOSC_ROOT_DIR AND NOT $ENV{BLOSC_ROOT_DIR} STREQUAL "")
-  SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})
-ENDIF()
-
-SET(_blosc_SEARCH_DIRS
-  ${BLOSC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/lib/blosc
-)
-
-FIND_PATH(BLOSC_INCLUDE_DIR
-  NAMES
-    blosc.h
-  HINTS
-    ${_blosc_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(BLOSC_LIBRARY
-  NAMES
-    blosc
-  HINTS
-    ${_blosc_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(BLOSC DEFAULT_MSG
-    BLOSC_LIBRARY BLOSC_INCLUDE_DIR)
-
-IF(BLOSC_FOUND)
-  SET(BLOSC_LIBRARIES ${BLOSC_LIBRARY})
-  SET(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR})
-ELSE()
-  SET(BLOSC_BLOSC_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  BLOSC_INCLUDE_DIR
-  BLOSC_LIBRARY
-)

build_files/cmake/Modules/FindEigen3.cmake

@@ -28,6 +28,7 @@ SET(_eigen3_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(EIGEN3_INCLUDE_DIR

build_files/cmake/Modules/FindFftw3.cmake

@@ -32,6 +32,7 @@ SET(_fftw3_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(FFTW3_INCLUDE_DIR

build_files/cmake/Modules/FindGLEW.cmake

@@ -9,6 +9,7 @@
 #
 # also defined,
 #  GLEW_LIBRARY, where to find the Glew library.
+#  GLEW_MX_LIBRARY, where to find the GlewMX library.
 
 #=============================================================================
 # Copyright 2014 Blender Foundation.
@@ -49,6 +50,16 @@ FIND_LIBRARY(GLEW_LIBRARY
     lib64 lib
   )
 
+
+FIND_LIBRARY(GLEW_MX_LIBRARY
+  NAMES
+    GLEWmx
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
 # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -62,6 +73,7 @@ ENDIF(GLEW_FOUND)
 MARK_AS_ADVANCED(
   GLEW_INCLUDE_DIR
   GLEW_LIBRARY
+  GLEW_MX_LIBRARY
 )
 
 UNSET(_glew_SEARCH_DIRS)

build_files/cmake/Modules/FindGflags.cmake

@@ -445,6 +445,7 @@ if(NOT GFLAGS_FOUND)
     /opt/local/include
     /usr/include
     /sw/include # Fink
+    /opt/csw/include # Blastwave
     /opt/lib/gflags/include)
 
   list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
@@ -458,6 +459,7 @@ if(NOT GFLAGS_FOUND)
     /opt/local/lib
     /usr/lib
     /sw/lib # Fink
+    /opt/csw/lib # Blastwave
     /opt/lib/gflags/lib)
   list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
     gflags/lib # Windows (for C:/Program Files prefix).

build_files/cmake/Modules/FindGlog.cmake

@@ -129,6 +129,7 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS
   /opt/local/include
   /usr/include
   /sw/include # Fink
+  /opt/csw/include # Blastwave
   /opt/lib/glog/include)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_PATH_SUFFIXES
@@ -144,6 +145,7 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS
   /opt/local/lib
   /usr/lib
   /sw/lib # Fink
+  /opt/csw/lib # Blastwave
   /opt/lib/gflags/lib)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES

build_files/cmake/Modules/FindHDF5.cmake

@@ -29,6 +29,7 @@ SET(_hdf5_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/hdf5
 )
 

build_files/cmake/Modules/FindIcuLinux.cmake

@@ -35,6 +35,7 @@ SET(_icu_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 # We don't need includes, only libs to link against...

build_files/cmake/Modules/FindJack.cmake

@@ -32,6 +32,7 @@ SET(_jack_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(JACK_INCLUDE_DIR

build_files/cmake/Modules/FindJeMalloc.cmake

@@ -32,6 +32,7 @@ SET(_jemalloc_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/jemalloc
 )
 

build_files/cmake/Modules/FindLZO.cmake

@@ -32,6 +32,7 @@ SET(_lzo_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h

build_files/cmake/Modules/FindOpenCOLLADA.cmake

@@ -65,6 +65,7 @@ SET(_opencollada_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/opencollada
 )
 

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -38,6 +38,7 @@ SET(_opencolorio_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/ocio
 )
 

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -50,6 +50,7 @@ SET(_openexr_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/openexr
 )
 

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -34,6 +34,7 @@ SET(_openimageio_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/oiio
 )
 
@@ -75,8 +76,6 @@ IF(OPENIMAGEIO_FOUND)
   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
-  ELSE()
-    SET(OPENIMAGEIO_PUGIXML_FOUND FALSE)
   ENDIF()
 ELSE()
   SET(OPENIMAGEIO_PUGIXML_FOUND FALSE)

build_files/cmake/Modules/FindOpenJPEG.cmake

@@ -32,6 +32,7 @@ SET(_openjpeg_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(OPENJPEG_INCLUDE_DIR

build_files/cmake/Modules/FindOpenShadingLanguage.cmake

@@ -38,6 +38,7 @@ SET(_osl_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/osl
 )
 

build_files/cmake/Modules/FindOpenSubdiv.cmake

@@ -37,6 +37,7 @@ SET(_opensubdiv_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/opensubdiv
   /opt/lib/osd # install_deps.sh
 )

build_files/cmake/Modules/FindOpenVDB.cmake

@@ -32,6 +32,7 @@ SET(_openvdb_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/openvdb
   /opt/lib/openvdb
 )

build_files/cmake/Modules/FindPCRE.cmake

@@ -32,6 +32,7 @@ SET(_pcre_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(PCRE_INCLUDE_DIR pcre.h

build_files/cmake/Modules/FindPugiXML.cmake

@@ -32,6 +32,7 @@ SET(_pugixml_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/oiio
 )
 

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -38,7 +38,7 @@ IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
   SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
 ENDIF()
 
-SET(PYTHON_VERSION 3.6 CACHE STRING "Python Version (major and minor only)")
+SET(PYTHON_VERSION 3.5 CACHE STRING "Python Version (major and minor only)")
 MARK_AS_ADVANCED(PYTHON_VERSION)
 
 
@@ -77,12 +77,15 @@ SET(_python_SEARCH_DIRS
 
 # only search for the dirs if we havn't already
 IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF))
-  SET(_PYTHON_ABI_FLAGS_TEST
+
+  SET(_python_ABI_FLAGS
     "m;mu;u; "    # release
     "dm;dmu;du;d" # debug
   )
 
-  FOREACH(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST})
+
+
+  FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
     #IF(CMAKE_BUILD_TYPE STREQUAL Debug)
     #  SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
     #ENDIF()
@@ -167,7 +170,7 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
   UNSET(_CURRENT_ABI_FLAGS)
   UNSET(_CURRENT_PATH)
 
-  UNSET(_PYTHON_ABI_FLAGS_TEST)
+  UNSET(_python_ABI_FLAGS)
 ENDIF()
 
 UNSET(_IS_INC_DEF)

build_files/cmake/Modules/FindSDL2.cmake

@@ -34,6 +34,7 @@ SET(_sdl2_SEARCH_DIRS
   /usr
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(SDL2_INCLUDE_DIR
@@ -42,7 +43,7 @@ FIND_PATH(SDL2_INCLUDE_DIR
   HINTS
     ${_sdl2_SEARCH_DIRS}
   PATH_SUFFIXES
-    include/SDL2 include SDL2
+    include/SDL2 include
 )
 
 FIND_LIBRARY(SDL2_LIBRARY

build_files/cmake/Modules/FindSndFile.cmake

@@ -1,15 +1,15 @@
 # - Find SndFile library
 # Find the native SndFile includes and library
 # This module defines
-#  LIBSNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
-#                        LIBSNDFILE_INCLUDE_DIR is found.
-#  LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile.
-#  LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile.
+#  SNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
+#                        SNDFILE_INCLUDE_DIR is found.
+#  SNDFILE_LIBRARIES, libraries to link against to use SndFile.
+#  SNDFILE_ROOT_DIR, The base directory to search for SndFile.
 #                    This can also be an environment variable.
-#  LIBSNDFILE_FOUND, If false, do not try to use SndFile.
+#  SNDFILE_FOUND, If false, do not try to use SndFile.
 #
 # also defined, but not for general use are
-#  LIBSNDFILE_LIBRARY, where to find the SndFile library.
+#  SNDFILE_LIBRARY, where to find the SndFile library.
 
 #=============================================================================
 # Copyright 2011 Blender Foundation.
@@ -22,26 +22,27 @@
 # See the License for more information.
 #=============================================================================
 
-# If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
-IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "")
-	SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})
+# If SNDFILE_ROOT_DIR was defined in the environment, use it.
+IF(NOT SNDFILE_ROOT_DIR AND NOT $ENV{SNDFILE_ROOT_DIR} STREQUAL "")
+  SET(SNDFILE_ROOT_DIR $ENV{SNDFILE_ROOT_DIR})
 ENDIF()
 
 SET(_sndfile_SEARCH_DIRS
-	${LIBSNDFILE_ROOT_DIR}
+  ${SNDFILE_ROOT_DIR}
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
-FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h
+FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h
   HINTS
     ${_sndfile_SEARCH_DIRS}
   PATH_SUFFIXES
     include
 )
 
-FIND_LIBRARY(LIBSNDFILE_LIBRARY
+FIND_LIBRARY(SNDFILE_LIBRARY
   NAMES
     sndfile
   HINTS
@@ -50,18 +51,18 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
-	LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)
+    SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR)
 
-IF(LIBSNDFILE_FOUND)
-	SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
-	SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
-ENDIF(LIBSNDFILE_FOUND)
+IF(SNDFILE_FOUND)
+  SET(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY})
+  SET(SNDFILE_INCLUDE_DIRS ${SNDFILE_INCLUDE_DIR})
+ENDIF(SNDFILE_FOUND)
 
 MARK_AS_ADVANCED(
-	LIBSNDFILE_INCLUDE_DIR
-	LIBSNDFILE_LIBRARY
+  SNDFILE_INCLUDE_DIR
+  SNDFILE_LIBRARY
 )

build_files/cmake/Modules/FindSpacenav.cmake

@@ -32,6 +32,7 @@ SET(_spacenav_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(SPACENAV_INCLUDE_DIR

build_files/cmake/Modules/FindTBB.cmake

@@ -32,6 +32,7 @@ SET(_tbb_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
   /opt/lib/tbb
 )
 

build_files/cmake/Modules/FindXML2.cmake

@@ -32,6 +32,7 @@ SET(_xml2_SEARCH_DIRS
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h

build_files/cmake/Modules/GTestTesting.cmake

@@ -32,7 +32,6 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		                      ${EXTRA_LIBS}
 		                      ${PLATFORM_LINKLIBS}
 		                      bf_testing_main
-		                      bf_intern_eigen
 		                      bf_intern_guardedalloc
 		                      extern_gtest
 		                      extern_gmock

build_files/cmake/cmake_consistency_check.py

@@ -61,8 +61,10 @@ def replace_line(f, i, text, keep_indent=True):
 
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
+
         # skip '.git'
-        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
+        if dirpath.startswith("."):
+            continue
 
         for filename in filenames:
             if filename_check is None or filename_check(filename):

build_files/cmake/cmake_consistency_check_config.py

@@ -25,6 +25,10 @@ IGNORE = (
     "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
+    "extern/carve/include/carve/config.h",
+    "extern/carve/include/carve/random/random.h",
+    "extern/carve/patches/files/config.h",
+    "extern/carve/patches/files/random.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
 )

build_files/cmake/config/blender_full.cmake

@@ -16,6 +16,7 @@ set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
+set(WITH_GAMEENGINE          ON  CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
@@ -23,6 +24,7 @@ set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_FRAMESERVER   ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
@@ -32,6 +34,7 @@ set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 set(WITH_LZMA                ON  CACHE BOOL "" FORCE)
 set(WITH_LZO                 ON  CACHE BOOL "" FORCE)
+set(WITH_MOD_BOOLEAN         ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_FLUID           ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_REMESH          ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_SMOKE           ON  CACHE BOOL "" FORCE)
@@ -49,6 +52,7 @@ set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
 set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
 set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 
+set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)
 set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 
 
@@ -62,7 +66,9 @@ elseif(WIN32)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(APPLE)
 	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+	set(WITH_CODEC_QUICKTIME     OFF CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 
 #	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+#	apple_check_quicktime()
 endif()