Release Cycle: bump to Blender 3.3.6 release

f36543c5f5 took care of syncing multiple viewport`s cameras, but wasnt
fully meeting intentions [which was to only do this if both viewports
are locked to the scene camera].

Check was only done for the viewport this was executed in (if this was
locked to the scene camera, it would change all other viewports as
well), now also check if the target viewport prefers to use its own
local camera instead and skip it in that case.

Pull Request: blender/blender#106799

Pull Request: blender/blender#106858

.clang-format

@@ -162,7 +162,6 @@ PenaltyBreakString: 1000000
 ForEachMacros:
   - BEGIN_ANIMFILTER_SUBCHANNELS
   - BKE_pbvh_vertex_iter_begin
-  - BKE_pbvh_face_iter_begin
   - BLI_FOREACH_SPARSE_RANGE
   - BLI_SMALLSTACK_ITER_BEGIN
   - BMO_ITER
@@ -267,12 +266,11 @@ ForEachMacros:
   - MAP_SLOT_PROBING_BEGIN
   - VECTOR_SET_SLOT_PROBING_BEGIN
   - WL_ARRAY_FOR_EACH
-  - FOREACH_SPECTRUM_CHANNEL
 
 StatementMacros:
   - PyObject_HEAD
   - PyObject_VAR_HEAD
   - ccl_gpu_kernel_postfix
 
-MacroBlockBegin: "^OSL_CLOSURE_STRUCT_BEGIN$"
-MacroBlockEnd: "^OSL_CLOSURE_STRUCT_END$"
+MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$"
+MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$"

GNUmakefile

@@ -162,7 +162,6 @@ CPU:=$(shell uname -m)
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
-BLENDER_IS_PYTHON_MODULE:=
 
 # CMake arguments, assigned to local variable to make it mutable.
 CMAKE_CONFIG_ARGS := $(BUILD_CMAKE_ARGS)
@@ -230,18 +229,9 @@ endif
 
 
 # -----------------------------------------------------------------------------
-# Additional targets for the build configuration
+# additional targets for the build configuration
 
-# NOTE: These targets can be combined and are applied in reverse order listed here.
-# So it's important that `bpy` comes before `release` (for example)
-# `make bpy release` first loads `release` configuration, then `bpy`.
-# This is important as `bpy` will turn off some settings enabled by release.
-
-ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_bpy
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS)
-	BLENDER_IS_PYTHON_MODULE:=1
-endif
+# support 'make debug'
 ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_debug
 	BUILD_TYPE:=Debug
@@ -266,6 +256,10 @@ ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_headless
 	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake" $(CMAKE_CONFIG_ARGS)
 endif
+ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
+	BUILD_DIR:=$(BUILD_DIR)_bpy
+	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS)
+endif
 
 ifneq "$(findstring developer, $(MAKECMDGOALS))" ""
 	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS)
@@ -303,10 +297,8 @@ endif
 # use the default build path can still use utility helpers.
 ifeq ($(OS), Darwin)
 	BLENDER_BIN?="$(BUILD_DIR)/bin/Blender.app/Contents/MacOS/Blender"
-	BLENDER_BIN_DIR?="$(BUILD_DIR)/bin/Blender.app/Contents/MacOS/Blender"
 else
 	BLENDER_BIN?="$(BUILD_DIR)/bin/blender"
-	BLENDER_BIN_DIR?="$(BUILD_DIR)/bin"
 endif
 
 
@@ -363,12 +355,8 @@ all: .FORCE
 	@echo Building Blender ...
 	$(BUILD_COMMAND) -C "$(BUILD_DIR)" -j $(NPROCS) install
 	@echo
-	@echo Edit build configuration with: \"$(BUILD_DIR)/CMakeCache.txt\" run make again to rebuild.
-	@if test -z "$(BLENDER_IS_PYTHON_MODULE)"; then \
-		echo Blender successfully built, run from: $(BLENDER_BIN); \
-	else \
-		echo Blender successfully built as a Python module, \"bpy\" can be imported from: $(BLENDER_BIN_DIR); \
-	fi
+	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
+	@echo Blender successfully built, run from: $(BLENDER_BIN)
 	@echo
 
 debug: all

build_files/build_environment/CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-##################################################################################################
+####################################################################################################
 #
 # This is a build system used by platform maintainers to build library dependencies on
 # Windows, macOS and Linux.
@@ -22,18 +22,15 @@
 #   Install compiler cmake autoconf automake libtool yasm tcl
 #   Run "make deps" from main Blender directory
 #
-##################################################################################################
+####################################################################################################
 
 project("BlenderDependencies")
 cmake_minimum_required(VERSION 3.5)
-if(POLICY CMP0135)
-  cmake_policy(SET CMP0135 NEW) # CMake 3.24+ Set the date/time for extracted files to time of extraction
-endif()
+
 include(ExternalProject)
 include(cmake/check_software.cmake)
 include(cmake/options.cmake)
-# `versions.cmake` needs to be included after `options.cmake`
-# due to the `BLENDER_PLATFORM_ARM` variable being needed.
+# versions.cmake needs to be included after options.cmake due to the BLENDER_PLATFORM_ARM variable being needed.
 include(cmake/versions.cmake)
 include(cmake/boost_build_options.cmake)
 include(cmake/download.cmake)
@@ -44,7 +41,7 @@ if(ENABLE_MINGW64)
 else()
   set(mingw_LIBDIR ${LIBDIR})
 endif()
-include(cmake/ssl.cmake)
+
 include(cmake/zlib.cmake)
 include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
@@ -56,8 +53,8 @@ include(cmake/imath.cmake)
 include(cmake/openexr.cmake)
 include(cmake/brotli.cmake)
 include(cmake/freetype.cmake)
-include(cmake/epoxy.cmake)
 include(cmake/freeglut.cmake)
+include(cmake/glew.cmake)
 include(cmake/alembic.cmake)
 include(cmake/opensubdiv.cmake)
 include(cmake/sdl.cmake)
@@ -68,16 +65,18 @@ endif()
 if(UNIX)
   include(cmake/nasm.cmake)
 endif()
+include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
 if(WIN32)
   include(cmake/flexbison.cmake)
 elseif(UNIX AND NOT APPLE)
   include(cmake/flex.cmake)
 endif()
+include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
+include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/llvm.cmake)
-include(cmake/osl.cmake)
 option(USE_PIP_NUMPY "Install NumPy using pip wheel instead of building from source" OFF)
 if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   set(USE_PIP_NUMPY ON)
@@ -86,25 +85,19 @@ else()
 endif()
 include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
-include(cmake/openimageio.cmake)
 include(cmake/usd.cmake)
-include(cmake/materialx.cmake)
-include(cmake/openvdb.cmake)
 include(cmake/potrace.cmake)
 include(cmake/haru.cmake)
-# Boost needs to be included after `python.cmake` due to the PYTHON_BINARY variable being needed.
+# Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed.
 include(cmake/boost.cmake)
 include(cmake/pugixml.cmake)
 include(cmake/ispc.cmake)
 include(cmake/openimagedenoise.cmake)
 include(cmake/embree.cmake)
-include(cmake/openpgl.cmake)
 include(cmake/fmt.cmake)
 include(cmake/robinmap.cmake)
 include(cmake/xml2.cmake)
 
-include(cmake/fribidi.cmake)
-include(cmake/harfbuzz.cmake)
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
   if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
@@ -122,7 +115,6 @@ endif()
 include(cmake/expat.cmake)
 include(cmake/pystring.cmake)
 include(cmake/yamlcpp.cmake)
-include(cmake/minizipng.cmake)
 include(cmake/opencolorio.cmake)
 
 if(BLENDER_PLATFORM_ARM)
@@ -170,6 +162,7 @@ if(UNIX)
   include(cmake/bzip2.cmake)
   include(cmake/ffi.cmake)
   include(cmake/lzma.cmake)
+  include(cmake/ssl.cmake)
   include(cmake/sqlite.cmake)
 endif()
 
@@ -177,13 +170,7 @@ if(UNIX AND NOT APPLE)
   include(cmake/libglu.cmake)
   include(cmake/mesa.cmake)
   include(cmake/wayland_protocols.cmake)
-  # Can be removed when the build-bot upgrades to v1.20.x or newer.
-  include(cmake/wayland.cmake)
-  include(cmake/wayland_libdecor.cmake)
 endif()
-include(cmake/shaderc_deps.cmake)
-include(cmake/shaderc.cmake)
-include(cmake/vulkan.cmake)
-include(cmake/pybind11.cmake)
+
 include(cmake/harvest.cmake)
 include(cmake/cve_check.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -17,7 +17,6 @@ ExternalProject_Add(external_alembic
   URL file://${PACKAGE_DIR}/${ALEMBIC_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/alembic
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/alembic
@@ -42,5 +41,6 @@ endif()
 
 add_dependencies(
   external_alembic
+  external_openexr
   external_imath
 )

build_files/build_environment/cmake/blosc.cmake

@@ -38,3 +38,19 @@ if(WIN32)
     external_pthreads
   )
 endif()
+
+if(WIN32)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
+      DEPENDEES install
+    )
+  endif()
+endif()

build_files/build_environment/cmake/boost.cmake

@@ -3,18 +3,8 @@
 if(WIN32)
   set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
   set(BOOST_BUILD_COMMAND b2)
-  set(BOOST_BUILD_OPTIONS runtime-link=shared)
-  if(BUILD_MODE STREQUAL Debug)
-    list(APPEND BOOST_BUILD_OPTIONS python-debugging=on variant=debug)
-    if(WITH_OPTIMIZED_DEBUG)
-      list(APPEND BOOST_BUILD_OPTIONS debug-symbols=off)
-    else()
-      list(APPEND BOOST_BUILD_OPTIONS debug-symbols=on)
-    endif()
-  else()
-    list(APPEND BOOST_BUILD_OPTIONS variant=release)
-  endif()
-  set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/)
+  set(BOOST_BUILD_OPTIONS runtime-link=shared )
+  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-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
   endif()
@@ -23,24 +13,28 @@ elseif(APPLE)
   set(BOOST_BUILD_COMMAND ./b2)
   set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --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 ./b2)
   set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
+  set(BOOST_PATCH_COMMAND echo .)
 endif()
 
-set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
-configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
-set(BOOST_PYTHON_OPTIONS
-  --with-python
-  --user-config=${JAM_FILE}
-)
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
+if(WITH_BOOST_PYTHON)
+  set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
+  configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
   set(BOOST_PYTHON_OPTIONS
-    ${BOOST_PYTHON_OPTIONS}
-    define=BOOST_DEBUG_PYTHON
+    --with-python
+    --user-config=${JAM_FILE}
   )
+  if(WIN32 AND BUILD_MODE STREQUAL Debug)
+    set(BOOST_PYTHON_OPTIONS
+      ${BOOST_PYTHON_OPTIONS}
+      define=BOOST_DEBUG_PYTHON
+    )
+  endif()
 endif()
 
 set(BOOST_OPTIONS
@@ -70,15 +64,17 @@ ExternalProject_Add(external_boost
   URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
   PREFIX ${BUILD_DIR}/boost
   UPDATE_COMMAND  ""
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff
+  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
   CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=shared threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
   BUILD_IN_SOURCE 1
   INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
 
-add_dependencies(
-  external_boost
-  external_python
-  external_numpy
-)
+if(WITH_BOOST_PYTHON)
+  add_dependencies(
+    external_boost
+    external_python
+    external_numpy
+  )
+endif()

build_files/build_environment/cmake/boost_build_options.cmake

@@ -20,12 +20,11 @@ endif()
 set(DEFAULT_BOOST_FLAGS
   -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
   -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=OFF
+  -DBoost_USE_STATIC_LIBS=ON
   -DBoost_USE_STATIC_RUNTIME=OFF
   -DBOOST_ROOT=${LIBDIR}/boost
   -DBoost_NO_SYSTEM_PATHS=ON
   -DBoost_NO_BOOST_CMAKE=ON
   -DBoost_ADDITIONAL_VERSIONS=${BOOST_VERSION_SHORT}
   -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-  -DBoost_USE_DEBUG_PYTHON=On
 )

build_files/build_environment/cmake/check_software.cmake

@@ -12,17 +12,19 @@ if(UNIX)
     automake
     bison
     ${_libtoolize_name}
-    meson
-    ninja
     pkg-config
     tclsh
     yasm
   )
 
-  if(APPLE)
-    list(APPEND _required_software dos2unix)
-  else()
-    list(APPEND _required_software patchelf)
+  if(NOT APPLE)
+    set(_required_software
+      ${_required_software}
+
+      # Needed for Mesa.
+      meson
+      ninja
+    )
   endif()
 
   foreach(_software ${_required_software})
@@ -52,10 +54,10 @@ if(UNIX)
       "  ${_software_missing}\n"
       "\n"
       "On Debian and Ubuntu:\n"
-      "  apt install autoconf automake bison libtool yasm tcl ninja-build meson python3-mako patchelf\n"
+      "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
       "\n"
       "On macOS (with homebrew):\n"
-      "  brew install autoconf automake bison dos2unix flex libtool meson ninja pkg-config yasm\n"
+      "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
       "\n"
       "Other platforms:\n"
       "  Install equivalent packages.\n")

build_files/build_environment/cmake/cve_check.csv.in

@@ -1,5 +1,10 @@
 vendor,product,version,cve_number,remarks,comment
+@FMT_ID@,OSV-2021-991,Ignored,CVE marked as invalid but OSV not updated
+@FREETYPE_ID@,CVE-2022-27404,Ignored,does not affect blender usage of freetype
+@FREETYPE_ID@,CVE-2022-27405,Ignored,does not affect blender usage of freetype
+@FREETYPE_ID@,CVE-2022-27406,Ignored,does not affect blender usage of freetype
 @OPENJPEG_ID@,CVE-2016-9675,Ignored,issue in convert command line tool not used by blender
+@OPENJPEG_ID@,OSV-2022-416,Mitigated,using newer git revision with fix included
 @PYTHON_ID@,CVE-2009-2940,Ignored,issue in pygresql not used by blender
 @PYTHON_ID@,CVE-2020-29396,Ignored,issue in odoo not used by blender
 @PYTHON_ID@,CVE-2021-32052,Ignored,issue in django not used by blender
@@ -23,7 +28,13 @@ vendor,product,version,cve_number,remarks,comment
 @TIFF_ID@,CVE-2022-3599,Ignored,issue in tiff command line tool not used by blender
 @TIFF_ID@,CVE-2022-3626,Ignored,issue in tiff command line tool not used by blender
 @TIFF_ID@,CVE-2022-3627,Ignored,issue in tiff command line tool not used by blender
+@TIFF_ID@,CVE-2022-48281,Ignored,issue in tiff command line tool not used by blender
 @XML2_ID@,CVE-2016-3709,Ignored,not affecting blender and not considered a security issue upstream
+@XML2_ID@,OSV-2021-777,Ignored,already fixed in version used so OSV invalid
+@XML2_ID@,CVE-2022-40303,Ignored,fixed and cve_check version comparison is wrong
+@XML2_ID@,CVE-2022-40304,Ignored,fixed and cve_check version comparison is wrong
 @GMP_ID@,CVE-2021-43618,Mitigated,patched using upstream commit 561a9c25298e
 @SQLITE_ID@,CVE-2022-35737,Ignored,only affects SQLITE_ENABLE_STAT4 compile option not used by blender or python
+@SQLITE_ID@,CVE-2022-46908,Ignored,only affects CLI tools not used by blender or python
+@BROTLI_ID@,CVE-2020-8927,Ignored,fixed and cve_check version comparison is wrong
 @SBOMCONTENTS@

build_files/build_environment/cmake/download.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
+set(BLENDER_VERSION 3.3)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
@@ -80,14 +80,13 @@ download_source(BLOSC)
 download_source(PTHREADS)
 download_source(OPENEXR)
 download_source(FREETYPE)
-download_source(EPOXY)
+download_source(GLEW)
 download_source(FREEGLUT)
 download_source(ALEMBIC)
 download_source(OPENSUBDIV)
 download_source(SDL)
 download_source(OPENCOLLADA)
 download_source(OPENCOLORIO)
-download_source(MINIZIPNG)
 download_source(LLVM)
 download_source(OPENMP)
 download_source(OPENIMAGEIO)
@@ -126,28 +125,23 @@ download_source(SSL)
 download_source(SQLITE)
 download_source(EMBREE)
 download_source(USD)
-download_source(MATERIALX)
 download_source(OIDN)
 download_source(LIBGLU)
 download_source(MESA)
 download_source(NASM)
 download_source(XR_OPENXR_SDK)
 download_source(WL_PROTOCOLS)
-download_source(WAYLAND)
-download_source(WAYLAND_LIBDECOR)
 download_source(ISPC)
 download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
-download_source(SSE2NEON)
 download_source(FLEX)
 download_source(BROTLI)
 download_source(FMT)
 download_source(ROBINMAP)
 download_source(IMATH)
 download_source(PYSTRING)
-download_source(OPENPGL)
 download_source(LEVEL_ZERO)
 download_source(DPCPP)
 download_source(VCINTRINSICS)
@@ -165,12 +159,3 @@ download_source(IGC_SPIRV_TRANSLATOR)
 download_source(GMMLIB)
 download_source(OCLOC)
 download_source(AOM)
-download_source(FRIBIDI)
-download_source(HARFBUZZ)
-download_source(SHADERC)
-download_source(SHADERC_SPIRV_TOOLS)
-download_source(SHADERC_SPIRV_HEADERS)
-download_source(SHADERC_GLSLANG)
-download_source(VULKAN_HEADERS)
-download_source(VULKAN_LOADER)
-download_source(PYBIND11)

build_files/build_environment/cmake/dpcpp.cmake

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
-# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
-# for now. 
-string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
 
 if(WIN32)
   set(LLVM_GENERATOR "Ninja")
@@ -72,7 +68,7 @@ set(DPCPP_EXTRA_ARGS
 )
 
 if(WIN32)
-  list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
+   list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
 endif()
 
 ExternalProject_Add(external_dpcpp
@@ -83,12 +79,9 @@ ExternalProject_Add(external_dpcpp
   CMAKE_GENERATOR ${LLVM_GENERATOR}
   SOURCE_SUBDIR llvm
   LIST_SEPARATOR ^^
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DPCPP_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
-  # CONFIGURE_COMMAND
-  #   ${PYTHON_BINARY}
-  #   ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
-  # BUILD_COMMAND
-  #   echo "." # ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DEFAULT_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
+  #CONFIGURE_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
+  #BUILD_COMMAND echo "." #${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
   INSTALL_COMMAND ${CMAKE_COMMAND} --build . -- deploy-sycl-toolchain
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/dpcpp/src/external_dpcpp < ${PATCH_DIR}/dpcpp.diff
   INSTALL_DIR ${LIBDIR}/dpcpp

build_files/build_environment/cmake/epoxy.cmake

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-if(WIN32)
-  set(EPOXY_LIB_TYPE shared)
-else()
-  set(EPOXY_LIB_TYPE static)
-endif()
-ExternalProject_Add(external_epoxy
-  URL file://${PACKAGE_DIR}/${EPOXY_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
-  PREFIX ${BUILD_DIR}/epoxy
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/epoxy/src/external_epoxy/ < ${PATCH_DIR}/epoxy.diff
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_epoxy after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/epoxy/include ${HARVEST_TARGET}/epoxy/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/bin/epoxy-0.dll ${HARVEST_TARGET}/epoxy/bin/epoxy-0.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/lib/epoxy.lib ${HARVEST_TARGET}/epoxy/lib/epoxy.lib
-    DEPENDEES install
-  )
-endif()
-
-add_dependencies(
-  external_epoxy
-  external_python_site_packages
-)

build_files/build_environment/cmake/fmt.cmake

@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(FMT_EXTRA_ARGS
-  -DFMT_TEST=OFF
-  -DFMT_DOC=OFF
+  -DFMT_TEST=Off
 )
 
 ExternalProject_Add(external_fmt

build_files/build_environment/cmake/freetype.cmake

@@ -32,9 +32,6 @@ add_dependencies(
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_freetype after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-	# harfbuzz *NEEDS* to find freetype.lib and will not be conviced to take alternative names so just give it
-	# what it wants. 
-	COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/fribidi.cmake

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  set(CONFIGURE_ENV ${CONFIGURE_ENV_MSVC})
-endif()
-
-ExternalProject_Add(external_fribidi
-  URL file://${PACKAGE_DIR}/${FRIBIDI_FILE}
-  URL_HASH ${FRIBIDI_HASH_TYPE}=${FRIBIDI_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/fribidi
-  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-  INSTALL_DIR ${LIBDIR}/fribidi
-)
-
-add_dependencies(
-  external_fribidi
-  external_python
-  external_python_site_packages
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_fribidi after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/fribidi/include ${HARVEST_TARGET}/fribidi/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fribidi/lib/libfribidi.a ${HARVEST_TARGET}/fribidi/lib/libfribidi.lib
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/glew.cmake

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(GLEW_EXTRA_ARGS
+  -DBUILD_UTILS=Off
+  -DBUILD_SHARED_LIBS=Off
+)
+
+ExternalProject_Add(external_glew
+  URL file://${PACKAGE_DIR}/${GLEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${GLEW_HASH_TYPE}=${GLEW_HASH}
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
+  PREFIX ${BUILD_DIR}/glew
+  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glew
+)

build_files/build_environment/cmake/gmp.cmake

@@ -22,6 +22,14 @@ elseif(UNIX AND NOT APPLE)
   )
 endif()
 
+# Boolean crashes with Arm assembly, see T103423.
+if(BLENDER_PLATFORM_ARM)
+  set(GMP_OPTIONS
+    ${GMP_OPTIONS}
+    --disable-assembly
+  )
+endif()
+
 ExternalProject_Add(external_gmp
   URL file://${PACKAGE_DIR}/${GMP_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}

build_files/build_environment/cmake/harfbuzz.cmake

@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV_MSVC})
-  set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype)
-else()
-  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV})
-  set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:$PKG_CONFIG_PATH)
-endif()
-
-set(HARFBUZZ_EXTRA_OPTIONS
-  -Dtests=disabled
-  -Dfreetype=enabled
-  -Dglib=disabled
-  -Dgobject=disabled
-)
-
-ExternalProject_Add(external_harfbuzz
-  URL file://${PACKAGE_DIR}/${HARFBUZZ_FILE}
-  URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/harfbuzz
-  CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-  INSTALL_DIR ${LIBDIR}/harfbuzz
-)
-
-add_dependencies(
-  external_harfbuzz
-  external_python
-  external_python_site_packages
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_harfbuzz after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/harfbuzz/include ${HARVEST_TARGET}/harfbuzz/include
-    # We do not use the subset API currently, so copying only the main library will suffice for now
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/harfbuzz/lib/libharfbuzz.a ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz.lib
-    DEPENDEES install
-  )
-endif()
-

build_files/build_environment/cmake/harvest.cmake

@@ -11,270 +11,191 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
 
-if(BUILD_MODE STREQUAL Release)
-  add_custom_target(Harvest_Release_Results
-    COMMAND # jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        # png
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-        # freeglut-> opengl
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
-    DEPENDS
-  )
-endif()
-
-else(WIN32)
-
-function(harvest from to)
-  set(pattern "")
-  foreach(f ${ARGN})
-    set(pattern ${f})
-  endforeach()
-
-  if(pattern STREQUAL "")
-    get_filename_component(dirpath ${to} DIRECTORY)
-    get_filename_component(filename ${to} NAME)
-    install(
-      FILES ${LIBDIR}/${from}
-      DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename}
-    )
-  else()
-    install(
-      DIRECTORY ${LIBDIR}/${from}/
-      DESTINATION ${HARVEST_TARGET}/${to}
-      USE_SOURCE_PERMISSIONS
-      FILES_MATCHING PATTERN ${pattern}
-      PATTERN "pkgconfig" EXCLUDE
-      PATTERN "cmake" EXCLUDE
-      PATTERN "__pycache__" EXCLUDE
-      PATTERN "tests" EXCLUDE
-      PATTERN "meson*" EXCLUDE
+  if(BUILD_MODE STREQUAL Release)
+    add_custom_target(Harvest_Release_Results
+      COMMAND # jpeg rename libfile + copy include
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+      # png
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+      # freeglut-> opengl
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+      # glew-> opengl
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+      DEPENDS
     )
   endif()
-endfunction()
 
-# Set rpath on shared libraries to $ORIGIN since all will be installed in the same
-# lib folder, and remove any absolute paths.
-#
-# Ideally this would be done as part of the Blender build since it makes assumptions
-# about where the files will be installed. However it would add patchelf as a new
-# dependency for building.
-#
-# Also removes versioned symlinks, which give errors with macOS notarization.
-if(APPLE)
-  set(set_rpath_cmd python3 ${CMAKE_CURRENT_SOURCE_DIR}/darwin/set_rpath.py @loader_path)
 else()
-  set(set_rpath_cmd patchelf --set-rpath $ORIGIN)
-endif()
 
-function(harvest_rpath_lib from to pattern)
-  harvest(${from} ${to} ${pattern})
+  function(harvest from to)
+    set(pattern "")
+    foreach(f ${ARGN})
+      set(pattern ${f})
+    endforeach()
 
-  install(CODE "\
-    cmake_policy(SET CMP0009 NEW)\n
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}) \n
-    foreach(f \${shared_libs}) \n
-      if(IS_SYMLINK \${f})\n
-        if(APPLE)\n
-          file(REMOVE_RECURSE \${f})
-        endif()\n
-      else()\n
-        execute_process(COMMAND ${set_rpath_cmd} \${f}) \n
-      endif()\n
-    endforeach()")
-endfunction()
+    if(pattern STREQUAL "")
+      get_filename_component(dirpath ${to} DIRECTORY)
+      get_filename_component(filename ${to} NAME)
+      install(
+        FILES ${LIBDIR}/${from}
+        DESTINATION ${HARVEST_TARGET}/${dirpath}
+        RENAME ${filename}
+      )
+    else()
+      install(
+        DIRECTORY ${LIBDIR}/${from}/
+        DESTINATION ${HARVEST_TARGET}/${to}
+        USE_SOURCE_PERMISSIONS
+        FILES_MATCHING PATTERN ${pattern}
+        PATTERN "pkgconfig" EXCLUDE
+        PATTERN "cmake" EXCLUDE
+        PATTERN "__pycache__" EXCLUDE
+        PATTERN "tests" EXCLUDE
+      )
+    endif()
+  endfunction()
 
-# Set rpath on utility binaries assuming they are run from their install location.
-function(harvest_rpath_bin from to pattern)
-  harvest(${from} ${to} ${pattern})
+  harvest(alembic/include alembic/include "*.h")
+  harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
+  harvest(alembic/bin alembic/bin "*")
+  harvest(brotli/include brotli/include "*.h")
+  harvest(brotli/lib brotli/lib "*.a")
+  harvest(boost/include boost/include "*")
+  harvest(boost/lib boost/lib "*.a")
+  harvest(imath/include imath/include "*.h")
+  harvest(imath/lib imath/lib "*.a")
+  harvest(ffmpeg/include ffmpeg/include "*.h")
+  harvest(ffmpeg/lib ffmpeg/lib "*.a")
+  harvest(fftw3/include fftw3/include "*.h")
+  harvest(fftw3/lib fftw3/lib "*.a")
+  harvest(flac/lib sndfile/lib "libFLAC.a")
+  harvest(freetype/include freetype/include "*.h")
+  harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
+  harvest(glew/include glew/include "*.h")
+  harvest(glew/lib glew/lib "*.a")
+  harvest(gmp/include gmp/include "*.h")
+  harvest(gmp/lib gmp/lib "*.a")
+  harvest(jemalloc/include jemalloc/include "*.h")
+  harvest(jemalloc/lib jemalloc/lib "*.a")
+  harvest(jpeg/include jpeg/include "*.h")
+  harvest(jpeg/lib jpeg/lib "libjpeg.a")
+  harvest(lame/lib ffmpeg/lib "*.a")
+  if(NOT APPLE)
+    harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
+    harvest(level-zero/lib level-zero/lib "*.so*")
+  endif()
+  harvest(llvm/bin llvm/bin "clang-format")
+  if(BUILD_CLANG_TOOLS)
+    harvest(llvm/bin llvm/bin "clang-tidy")
+    harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
+  endif()
+  harvest(llvm/include llvm/include "*")
+  harvest(llvm/bin llvm/bin "llvm-config")
+  harvest(llvm/lib llvm/lib "libLLVM*.a")
+  harvest(llvm/lib llvm/lib "libclang*.a")
+  harvest(llvm/lib/clang llvm/lib/clang "*.h")
+  if(APPLE)
+    harvest(openmp/lib openmp/lib "*")
+    harvest(openmp/include openmp/include "*.h")
+  endif()
+  if(BLENDER_PLATFORM_ARM)
+    harvest(sse2neon sse2neon "*.h")
+  endif()
+  harvest(ogg/lib ffmpeg/lib "*.a")
+  harvest(openal/include openal/include "*.h")
+  if(UNIX AND NOT APPLE)
+    harvest(openal/lib openal/lib "*.a")
 
-  install(CODE "\
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}) \n
-    foreach(f \${shared_libs}) \n
-      execute_process(COMMAND ${set_rpath_cmd}/../lib; \${f}) \n
-    endforeach()")
-endfunction()
+    harvest(blosc/include blosc/include "*.h")
+    harvest(blosc/lib blosc/lib "*.a")
 
-# Set rpath on Python module to point to the shared libraries folder in the Blender
-# installation.
-function(harvest_rpath_python from to pattern)
-  harvest(${from} ${to} ${pattern})
+    harvest(zlib/include zlib/include "*.h")
+    harvest(zlib/lib zlib/lib "*.a")
 
-  install(CODE "\
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}\.so*) \n
-    foreach(f \${shared_libs}) \n
-      if(IS_SYMLINK \${f})\n
-        if(APPLE)\n
-          file(REMOVE_RECURSE \${f})
-        endif()\n
-      else()\n
-        get_filename_component(f_dir \${f} DIRECTORY) \n
-        file(RELATIVE_PATH relative_dir \${f_dir} ${HARVEST_TARGET}) \n
-        execute_process(COMMAND ${set_rpath_cmd}/\${relative_dir}../lib \${f}) \n
-      endif()\n
-    endforeach()")
-endfunction()
+    harvest(xml2/include xml2/include "*.h")
+    harvest(xml2/lib xml2/lib "*.a")
 
-harvest(alembic/include alembic/include "*.h")
-harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-harvest_rpath_bin(alembic/bin alembic/bin "*")
-harvest(brotli/include brotli/include "*.h")
-harvest(brotli/lib brotli/lib "*.a")
-harvest(boost/include boost/include "*")
-harvest_rpath_lib(boost/lib boost/lib "*${SHAREDLIBEXT}*")
-harvest(imath/include imath/include "*.h")
-harvest_rpath_lib(imath/lib imath/lib "*${SHAREDLIBEXT}*")
-harvest(ffmpeg/include ffmpeg/include "*.h")
-harvest(ffmpeg/lib ffmpeg/lib "*.a")
-harvest(fftw3/include fftw3/include "*.h")
-harvest(fftw3/lib fftw3/lib "*.a")
-harvest(flac/lib sndfile/lib "libFLAC.a")
-harvest(freetype/include freetype/include "*.h")
-harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
-harvest(fribidi/include fribidi/include "*.h")
-harvest(fribidi/lib fribidi/lib "*.a")
-harvest(epoxy/include epoxy/include "*.h")
-harvest(epoxy/lib epoxy/lib "*.a")
-harvest(gmp/include gmp/include "*.h")
-harvest(gmp/lib gmp/lib "*.a")
-harvest(harfbuzz/include harfbuzz/include "*.h")
-harvest(harfbuzz/lib harfbuzz/lib "*.a")
-harvest(jemalloc/include jemalloc/include "*.h")
-harvest(jemalloc/lib jemalloc/lib "*.a")
-harvest(jpeg/include jpeg/include "*.h")
-harvest(jpeg/lib jpeg/lib "libjpeg.a")
-harvest(lame/lib ffmpeg/lib "*.a")
-if(NOT APPLE)
-  harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
-  harvest(level-zero/lib level-zero/lib "*${SHAREDLIBEXT}*")
-endif()
-harvest(llvm/bin llvm/bin "clang-format")
-if(BUILD_CLANG_TOOLS)
-  harvest(llvm/bin llvm/bin "clang-tidy")
-  harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
-endif()
-harvest(llvm/include llvm/include "*")
-harvest(llvm/bin llvm/bin "llvm-config")
-harvest(llvm/lib llvm/lib "libLLVM*.a")
-harvest(llvm/lib llvm/lib "libclang*.a")
-harvest(llvm/lib/clang llvm/lib/clang "*.h")
-if(APPLE)
-  harvest(openmp/lib openmp/lib "libomp.dylib")
-  harvest(openmp/include openmp/include "*.h")
-endif()
-if(BLENDER_PLATFORM_ARM)
-  harvest(sse2neon sse2neon "*.h")
-endif()
-harvest(ogg/lib ffmpeg/lib "*.a")
-harvest(openal/include openal/include "*.h")
-if(UNIX AND NOT APPLE)
-  harvest(openal/lib openal/lib "*.a")
-
-  harvest(zlib/include zlib/include "*.h")
-  harvest(zlib/lib zlib/lib "*.a")
-
-  harvest(xml2/include xml2/include "*.h")
-  harvest(xml2/lib xml2/lib "*.a")
-
-  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
-    harvest(wayland/bin wayland/bin "wayland-scanner")
-    harvest(wayland/include wayland/include "*.h")
-    harvest(wayland_libdecor/include wayland_libdecor/include "*.h")
+    harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
   else()
     harvest(blosc/lib openvdb/lib "*.a")
-  harvest(xml2/lib opencollada/lib "*.a")
-endif()
-harvest(opencollada/include/opencollada opencollada/include "*.h")
-harvest(opencollada/lib/opencollada opencollada/lib "*.a")
-harvest(opencolorio/include opencolorio/include "*.h")
-harvest_rpath_lib(opencolorio/lib opencolorio/lib "*${SHAREDLIBEXT}*")
-harvest_rpath_python(opencolorio/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
-harvest(openexr/include openexr/include "*.h")
-harvest_rpath_lib(openexr/lib openexr/lib "*${SHAREDLIBEXT}*")
-harvest_rpath_bin(openimageio/bin openimageio/bin "idiff")
-harvest_rpath_bin(openimageio/bin openimageio/bin "maketx")
-harvest_rpath_bin(openimageio/bin openimageio/bin "oiiotool")
-harvest(openimageio/include openimageio/include "*")
-harvest_rpath_lib(openimageio/lib openimageio/lib "*${SHAREDLIBEXT}*")
-harvest_rpath_python(openimageio/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
-harvest(openimagedenoise/include openimagedenoise/include "*")
-harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
-harvest(embree/include embree/include "*.h")
-harvest(embree/lib embree/lib "*.a")
-harvest(openpgl/include openpgl/include "*.h")
-harvest(openpgl/lib openpgl/lib "*.a")
-harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")
-harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
-harvest(openjpeg/lib openjpeg/lib "*.a")
-harvest(opensubdiv/include opensubdiv/include "*.h")
-harvest_rpath_lib(opensubdiv/lib opensubdiv/lib "*${SHAREDLIBEXT}*")
-harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
-harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
-harvest_rpath_lib(openvdb/lib openvdb/lib "*${SHAREDLIBEXT}*")
-harvest_rpath_python(openvdb/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*pyopenvdb*")
-harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
-harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
-harvest_rpath_bin(osl/bin osl/bin "oslc")
-harvest(osl/include osl/include "*.h")
-harvest(osl/lib osl/lib "*.a")
-harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
-harvest(png/include png/include "*.h")
-harvest(png/lib png/lib "*.a")
-harvest(pugixml/include pugixml/include "*.hpp")
-harvest(pugixml/lib pugixml/lib "*.a")
-harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
-harvest(python/include python/include "*h")
-harvest(python/lib python/lib "*")
-harvest(sdl/include/SDL2 sdl/include "*.h")
-harvest(sdl/lib sdl/lib "libSDL2.a")
-harvest(sndfile/include sndfile/include "*.h")
-harvest(sndfile/lib sndfile/lib "*.a")
-harvest(spnav/include spnav/include "*.h")
-harvest(spnav/lib spnav/lib "*.a")
-harvest(tbb/include tbb/include "*.h")
-harvest_rpath_lib(tbb/lib tbb/lib "libtbb${SHAREDLIBEXT}")
-harvest(theora/lib ffmpeg/lib "*.a")
-harvest(tiff/include tiff/include "*.h")
-harvest(tiff/lib tiff/lib "*.a")
-harvest(vorbis/lib ffmpeg/lib "*.a")
-harvest(opus/lib ffmpeg/lib "*.a")
-harvest(vpx/lib ffmpeg/lib "*.a")
-harvest(x264/lib ffmpeg/lib "*.a")
-harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(aom/lib ffmpeg/lib "*.a")
-harvest(webp/lib webp/lib "*.a")
-harvest(webp/include webp/include "*.h")
-harvest(usd/include usd/include "*.h")
-harvest_rpath_lib(usd/lib usd/lib "libusd_ms${SHAREDLIBEXT}")
-harvest(usd/lib/usd usd/lib/usd "*")
-harvest_rpath_python(usd/lib/python/pxr python/lib/python${PYTHON_SHORT_VERSION}/site-packages/pxr "*")
-harvest(usd/plugin usd/plugin "*")
-harvest(materialx/include materialx/include "*.h")
-harvest_rpath_lib(materialx/lib materialx/lib "*${SHAREDLIBEXT}*")
-harvest(materialx/libraries materialx/libraries "*")
-harvest(materialx/lib/cmake/MaterialX materialx/lib/cmake/MaterialX "*.cmake")
-harvest_rpath_python(materialx/python/MaterialX python/lib/python${PYTHON_SHORT_VERSION}/site-packages/MaterialX "*")
-# We do not need anything from the resources folder, but the MaterialX config
-# file will complain if the folder does not exist, so just copy the readme.md
-# files to ensure the folder will exist.
-harvest(materialx/resources materialx/resources "README.md")
-harvest(potrace/include potrace/include "*.h")
-harvest(potrace/lib potrace/lib "*.a")
-harvest(haru/include haru/include "*.h")
-harvest(haru/lib haru/lib "*.a")
-harvest(zstd/include zstd/include "*.h")
-harvest(zstd/lib zstd/lib "*.a")
+    harvest(xml2/lib opencollada/lib "*.a")
+  endif()
+  harvest(opencollada/include/opencollada opencollada/include "*.h")
+  harvest(opencollada/lib/opencollada opencollada/lib "*.a")
+  harvest(opencolorio/include opencolorio/include "*.h")
+  harvest(opencolorio/lib opencolorio/lib "*.a")
+  harvest(opencolorio/lib/static opencolorio/lib "*.a")
+  harvest(openexr/include openexr/include "*.h")
+  harvest(openexr/lib openexr/lib "*.a")
+  harvest(openimageio/bin openimageio/bin "idiff")
+  harvest(openimageio/bin openimageio/bin "maketx")
+  harvest(openimageio/bin openimageio/bin "oiiotool")
+  harvest(openimageio/include openimageio/include "*")
+  harvest(openimageio/lib openimageio/lib "*.a")
+  harvest(openimagedenoise/include openimagedenoise/include "*")
+  harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
+  harvest(embree/include embree/include "*.h")
+  harvest(embree/lib embree/lib "*.a")
+  harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
+  harvest(openjpeg/lib openjpeg/lib "*.a")
+  harvest(opensubdiv/include opensubdiv/include "*.h")
+  harvest(opensubdiv/lib opensubdiv/lib "*.a")
+  harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
+  harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
+  harvest(openvdb/lib openvdb/lib "*.a")
+  harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
+  harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
+  harvest(osl/bin osl/bin "oslc")
+  harvest(osl/include osl/include "*.h")
+  harvest(osl/lib osl/lib "*.a")
+  harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
+  harvest(png/include png/include "*.h")
+  harvest(png/lib png/lib "*.a")
+  harvest(pugixml/include pugixml/include "*.hpp")
+  harvest(pugixml/lib pugixml/lib "*.a")
+  harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
+  harvest(python/include python/include "*h")
+  harvest(python/lib python/lib "*")
+  harvest(sdl/include/SDL2 sdl/include "*.h")
+  harvest(sdl/lib sdl/lib "libSDL2.a")
+  harvest(sndfile/include sndfile/include "*.h")
+  harvest(sndfile/lib sndfile/lib "*.a")
+  harvest(spnav/include spnav/include "*.h")
+  harvest(spnav/lib spnav/lib "*.a")
+  harvest(tbb/include tbb/include "*.h")
+  harvest(tbb/lib/libtbb_static.a tbb/lib/libtbb.a)
+  harvest(theora/lib ffmpeg/lib "*.a")
+  harvest(tiff/include tiff/include "*.h")
+  harvest(tiff/lib tiff/lib "*.a")
+  harvest(vorbis/lib ffmpeg/lib "*.a")
+  harvest(opus/lib ffmpeg/lib "*.a")
+  harvest(vpx/lib ffmpeg/lib "*.a")
+  harvest(x264/lib ffmpeg/lib "*.a")
+  harvest(xvidcore/lib ffmpeg/lib "*.a")
+  harvest(aom/lib ffmpeg/lib "*.a")
+  harvest(webp/lib webp/lib "*.a")
+  harvest(webp/include webp/include "*.h")
+  harvest(usd/include usd/include "*.h")
+  harvest(usd/lib/usd usd/lib/usd "*")
+  harvest(usd/plugin usd/plugin "*")
+  harvest(potrace/include potrace/include "*.h")
+  harvest(potrace/lib potrace/lib "*.a")
+  harvest(haru/include haru/include "*.h")
+  harvest(haru/lib haru/lib "*.a")
+  harvest(zstd/include zstd/include "*.h")
+  harvest(zstd/lib zstd/lib "*.a")
 
-if(UNIX AND NOT APPLE)
-  harvest(libglu/lib mesa/lib "*${SHAREDLIBEXT}*")
-  harvest(mesa/lib64 mesa/lib "*${SHAREDLIBEXT}*")
+  if(UNIX AND NOT APPLE)
+    harvest(libglu/lib mesa/lib "*.so*")
+    harvest(mesa/lib64 mesa/lib "*.so*")
+
+    harvest(dpcpp dpcpp "*")
+    harvest(igc dpcpp/lib/igc "*")
+    harvest(ocloc dpcpp/lib/ocloc "*")
+  endif()
 
-  harvest(dpcpp dpcpp "*")
-  harvest(igc dpcpp/lib/igc "*")
-  harvest(ocloc dpcpp/lib/ocloc "*")
-endif()
 endif()

build_files/build_environment/cmake/imath.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(IMATH_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DBUILD_TESTING=OFF
   -DIMATH_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
 )
@@ -11,7 +11,6 @@ ExternalProject_Add(external_imath
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
   PREFIX ${BUILD_DIR}/imath
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/imath
 )
@@ -20,7 +19,6 @@ if(WIN32)
   ExternalProject_Add_Step(external_imath after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -13,11 +13,9 @@ if(APPLE)
   )
   set(LLVM_BUILD_CLANG_TOOLS_EXTRA ^^clang-tools-extra)
   set(BUILD_CLANG_TOOLS ON)
-else()
-  # NVIDIA PTX for OSL on Windows and Linux.
-  set(LLVM_TARGETS ${LLVM_TARGETS}$<SEMICOLON>NVPTX)
 endif()
 
+
 set(LLVM_EXTRA_ARGS
   -DLLVM_USE_CRT_RELEASE=MD
   -DLLVM_USE_CRT_DEBUG=MDd
@@ -40,11 +38,6 @@ else()
   set(LLVM_GENERATOR "Unix Makefiles")
 endif()
 
-# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
-# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
-# for now. 
-string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
-
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
   URL file://${PACKAGE_DIR}/${LLVM_FILE}
@@ -55,7 +48,7 @@ ExternalProject_Add(ll
   PREFIX ${BUILD_DIR}/ll
   SOURCE_SUBDIR llvm
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${LLVM_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/llvm
 )
 

build_files/build_environment/cmake/materialx.cmake

@@ -1,57 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(MATERIALX_EXTRA_ARGS
-  -DMATERIALX_BUILD_PYTHON=ON
-  -DMATERIALX_BUILD_RENDER=OFF
-  -DMATERIALX_INSTALL_PYTHON=OFF
-  -DMATERIALX_PYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DMATERIALX_PYTHON_VERSION=${PYTHON_SHORT_VERSION}
-  -DMATERIALX_BUILD_SHARED_LIBS=ON
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_materialx
-  URL file://${PACKAGE_DIR}/${MATERIALX_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MATERIALX_HASH_TYPE}=${MATERIALX_HASH}
-  PREFIX ${BUILD_DIR}/materialx
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/materialx/src/external_materialx < ${PATCH_DIR}/materialx.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/materialx ${DEFAULT_CMAKE_FLAGS} ${MATERIALX_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/materialx
-)
-
-if(WIN32)
-  set(MATERIALX_PYTHON_TARGET ${HARVEST_TARGET}/materialx/python/${BUILD_MODE})
-  string(REPLACE "/" "\\" MATERIALX_PYTHON_TARGET_DOS "${MATERIALX_PYTHON_TARGET}")
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/include ${HARVEST_TARGET}/materialx/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/libraries ${HARVEST_TARGET}/materialx/libraries
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-      COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-      COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-      DEPENDEES install
-    )
-  endif()
-  unset(MATERIALX_PYTHON_TARGET)
-  unset(MATERIALX_PYTHON_TARGET_DOS)
-endif()
-
-add_dependencies(
-  external_materialx
-  external_python
-  external_pybind11
-)

build_files/build_environment/cmake/mesa.cmake

@@ -43,7 +43,7 @@ ExternalProject_Add(external_mesa
   PREFIX ${BUILD_DIR}/mesa
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
-    ${MESON} ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
+    meson ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja install
   INSTALL_DIR ${LIBDIR}/mesa
@@ -52,5 +52,4 @@ ExternalProject_Add(external_mesa
 add_dependencies(
   external_mesa
   ll
-  external_zlib
 )

build_files/build_environment/cmake/minizipng.cmake

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(MINIZIPNG_EXTRA_ARGS
-  -DMZ_FETCH_LIBS=OFF
-  -DMZ_LIBCOMP=OFF
-  -DMZ_PKCRYPT=OFF
-  -DMZ_WZAES=OFF
-  -DMZ_OPENSSL=OFF
-  -DMZ_SIGNING=OFF
-  -DMZ_LZMA=OFF
-  -DMZ_ZSTD=OFF
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DBZIP2_LIBRARY=${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}
-  -DBZIP2_INCLUDE_DIR=${LIBDIR}/bzip2/include/
-  # Because OCIO hardcodes a non standard include path
-  -DCMAKE_INSTALL_INCLUDEDIR=${LIBDIR}/minizipng/include/minizip-ng
-)
-
-ExternalProject_Add(external_minizipng
-  URL file://${PACKAGE_DIR}/${MINIZIPNG_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MINIZIPNG_HASH_TYPE}=${MINIZIPNG_HASH}
-  PREFIX ${BUILD_DIR}/minizipng
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/minizipng ${DEFAULT_CMAKE_FLAGS} ${MINIZIPNG_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/minizipng
-)
-
-add_dependencies(
-  external_minizipng
-  external_zlib
-)

build_files/build_environment/cmake/opencollada.cmake

@@ -9,17 +9,13 @@ if(UNIX)
   # as does the OPENCOLLADA package, if this can be corrected upstream that would be better.
   # For now use `sed` to force UNIX line endings so the patch applies.
   # Needed as neither ignoring white-space or applying as a binary resolve this problem.
-  if(APPLE)
-    set(_dos2unix dos2unix)
-  else()
-    set(_dos2unix sed -i "s/\\r//")
-  endif()
   set(PATCH_MAYBE_DOS2UNIX_CMD
-    ${_dos2unix}
+    sed -i "s/\\r//"
     ${PATCH_DIR}/opencollada.diff
     ${BUILD_DIR}/opencollada/src/external_opencollada/CMakeLists.txt
     ${BUILD_DIR}/opencollada/src/external_opencollada/Externals/LibXML/CMakeLists.txt &&
   )
+
 else()
   set(OPENCOLLADA_EXTRA_ARGS
     -DCMAKE_DEBUG_POSTFIX=_d

build_files/build_environment/cmake/opencolorio.cmake

@@ -2,10 +2,10 @@
 
 set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_BUILD_APPS=OFF
-  -DOCIO_BUILD_PYTHON=ON
+  -DOCIO_BUILD_PYTHON=OFF
   -DOCIO_BUILD_NUKE=OFF
   -DOCIO_BUILD_JAVA=OFF
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DOCIO_BUILD_DOCS=OFF
   -DOCIO_BUILD_TESTS=OFF
   -DOCIO_BUILD_GPU_TESTS=OFF
@@ -15,30 +15,10 @@ set(OPENCOLORIO_EXTRA_ARGS
 
   -Dexpat_ROOT=${LIBDIR}/expat
   -Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
-  -Dyaml-cpp_VERSION=${YAMLCPP_VERSION}
   -Dpystring_ROOT=${LIBDIR}/pystring
   -DImath_ROOT=${LIBDIR}/imath
-  -Dminizip-ng_ROOT=${LIBDIR}/minizipng
-  -Dminizip-ng_INCLUDE_DIR=${LIBDIR}/minizipng/include
-  -Dminizip-ng_LIBRARY=${LIBDIR}/minizipng/lib/libminizip${LIBEXT}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
 )
 
-if(APPLE)
-  set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
-    "-DCMAKE_SHARED_LINKER_FLAGS=-liconv ${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}"
-  )
-elseif(UNIX)
-  set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
-    "-DCMAKE_SHARED_LINKER_FLAGS=${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}"
-  )
-endif()
-
 if(BLENDER_PLATFORM_ARM)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
@@ -47,16 +27,11 @@ if(BLENDER_PLATFORM_ARM)
 endif()
 
 if(WIN32)
-  set(OPENCOLORIO_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIMATH_DLL")
-  if(BUILD_MODE STREQUAL Debug)
-    set(OPENCOLORIO_CXX_FLAGS "${OPENCOLORIO_CXX_FLAGS} -DPy_DEBUG")
-  endif()
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
-    -DCMAKE_DEBUG_POSTFIX=_d
-    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpat$<$<STREQUAL:${BUILD_MODE},Debug>:d>MD${LIBEXT}
-    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-    -DCMAKE_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS}
+    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpatMD
+    -Dyaml-cpp_LIBRARY=${LIBDIR}/expat/lib/libyaml-cppmd.lib
+    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}
   )
 else()
   set(OPENCOLORIO_EXTRA_ARGS
@@ -68,7 +43,6 @@ ExternalProject_Add(external_opencolorio
   URL file://${PACKAGE_DIR}/${OPENCOLORIO_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/opencolorio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
@@ -81,26 +55,25 @@ add_dependencies(
   external_expat
   external_imath
   external_pystring
-  external_zlib
-  external_minizipng
-  external_python
-  external_pybind11
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opencolorio after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_2_2.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_2_2.dll
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_d_2_2.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_d_2_2.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio_d.lib ${HARVEST_TARGET}/opencolorio/lib/OpenColorIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/site-packages ${HARVEST_TARGET}/opencolorio/lib/site-packages-debug
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openexr.cmake

@@ -16,7 +16,7 @@ set(OPENEXR_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBUILD_TESTING=OFF
   -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DOPENEXR_INSTALL_TOOLS=OFF
   -DOPENEXR_INSTALL_EXAMPLES=OFF
   -DImath_DIR=${LIBDIR}/imath/lib/cmake/Imath
@@ -27,7 +27,6 @@ ExternalProject_Add(external_openexr
   URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openexr
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openexr
@@ -37,11 +36,6 @@ if(WIN32)
   ExternalProject_Add_Step(external_openexr after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll
     DEPENDEES install
   )
 endif()
@@ -49,5 +43,4 @@ endif()
 add_dependencies(
   external_openexr
   external_zlib
-  external_imath
 )

build_files/build_environment/cmake/openimageio.cmake

@@ -15,16 +15,14 @@ else()
 endif()
 
 if(WIN32)
+  set(PNG_LIBNAME libpng16_static${LIBEXT})
   set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
   set(OPENJPEG_POSTFIX _msvc)
   if(BUILD_MODE STREQUAL Debug)
     set(TIFF_POSTFIX d)
-    set(PNG_POSTFIX d)
   else()
     set(TIFF_POSTFIX)
-    set(PNG_POSTFIX)
   endif()
-  set(PNG_LIBNAME libpng16_static${PNG_POSTFIX}${LIBEXT})
 else()
   set(PNG_LIBNAME libpng${LIBEXT})
   set(OIIO_SIMD_FLAGS)
@@ -42,7 +40,7 @@ else()
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   ${OPENIMAGEIO_LINKSTATIC}
   ${DEFAULT_BOOST_FLAGS}
   -DUSE_LIBSQUISH=OFF
@@ -56,7 +54,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_OPENGL=OFF
   -DUSE_TBB=OFF
   -DUSE_QT=OFF
-  -DUSE_PYTHON=ON
+  -DUSE_PYTHON=OFF
   -DUSE_GIF=OFF
   -DUSE_OPENCV=OFF
   -DUSE_OPENJPEG=ON
@@ -78,14 +76,13 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
   -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
   ${OPENJPEG_FLAGS}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
-  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DSTOP_ON_WARNING=OFF
   -DUSE_EXTERNAL_PUGIXML=ON
   -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
   -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
-  -Dpugixml_DIR=${LIBDIR}/pugixml/lib/cmake/pugixml
   -DBUILD_MISSING_ROBINMAP=OFF
   -DBUILD_MISSING_FMT=OFF
   -DFMT_INCLUDE_DIR=${LIBDIR}/fmt/include/
@@ -94,15 +91,12 @@ set(OPENIMAGEIO_EXTRA_ARGS
   ${OIIO_SIMD_FLAGS}
   -DOpenEXR_ROOT=${LIBDIR}/openexr
   -DImath_ROOT=${LIBDIR}/imath
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
 )
 
 ExternalProject_Add(external_openimageio
   URL file://${PACKAGE_DIR}/${OPENIMAGEIO_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openimageio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
@@ -123,8 +117,6 @@ add_dependencies(
   external_robinmap
   external_openjpeg${OPENJPEG_POSTFIX}
   external_webp
-  external_python
-  external_pybind11
 )
 
 if(WIN32)
@@ -133,8 +125,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util.dll
+
       DEPENDEES install
     )
   endif()
@@ -142,9 +133,6 @@ if(WIN32)
     ExternalProject_Add_Step(external_openimageio after_install
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}/ ${HARVEST_TARGET}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}_debug/
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openpgl.cmake

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Note the utility apps may use png/tiff/gif system libraries, but the
-# library itself does not depend on them, so should give no problems.
-
-set(OPENPGL_EXTRA_ARGS
-    -DOPENPGL_BUILD_STATIC=ON
-    -DOPENPGL_TBB_ROOT=${LIBDIR}/tbb
-    -DTBB_ROOT=${LIBDIR}/tbb
-    -DCMAKE_DEBUG_POSTFIX=_d
-)
-
-if(TBB_STATIC_LIBRARY)
-  set(OPENPGL_EXTRA_ARGS
-    ${OPENPGL_EXTRA_ARGS}
-    -DOPENPGL_TBB_COMPONENT=tbb_static
-  )
-endif()
-
-ExternalProject_Add(external_openpgl
-    URL file://${PACKAGE_DIR}/${OPENPGL_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OPENPGL_HASH_TYPE}=${OPENPGL_HASH}
-    PREFIX ${BUILD_DIR}/openpgl
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openpgl ${DEFAULT_CMAKE_FLAGS} ${OPENPGL_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/openpgl
-)
-
-add_dependencies(
-    external_openpgl
-    external_tbb
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openpgl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openpgl ${HARVEST_TARGET}/openpgl
-      DEPENDEES install
-    )
-  else()
-  ExternalProject_Add_Step(external_openpgl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/openpgl_d.lib ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake ${HARVEST_TARGET}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/opensubdiv.cmake

@@ -32,7 +32,7 @@ else()
   set(OPENSUBDIV_EXTRA_ARGS
     ${OPENSUBDIV_EXTRA_ARGS}
     -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb${SHAREDLIBEXT}
+    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
   )
 endif()
 

build_files/build_environment/cmake/openvdb.cmake

@@ -4,14 +4,23 @@ if(BUILD_MODE STREQUAL Debug)
   set(BLOSC_POST _d)
 endif()
 
+if(WIN32)
+  set(OPENVDB_SHARED ON)
+  set(OPENVDB_STATIC OFF)
+else()
+  set(OPENVDB_SHARED OFF)
+  set(OPENVDB_STATIC ON)
+endif()
+
 set(OPENVDB_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
-  -DUSE_STATIC_DEPENDENCIES=OFF   # This is the global toggle for static libs
-  # Once the above switch is off, you can set it
-  # for each individual library below.
-  -DBLOSC_USE_STATIC_LIBS=ON
-  -DTBB_USE_STATIC_LIBS=OFF
-  -DBoost_USE_STATIC_LIBS=OFF
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
@@ -19,36 +28,32 @@ set(OPENVDB_EXTRA_ARGS
   -DBlosc_LIBRARY_RELEASE=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
   -DBlosc_LIBRARY_DEBUG=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
   -DOPENVDB_BUILD_UNITTESTS=OFF
+  -DOPENVDB_BUILD_PYTHON_MODULE=OFF
   -DOPENVDB_BUILD_NANOVDB=ON
   -DNANOVDB_BUILD_TOOLS=OFF
   -DBlosc_ROOT=${LIBDIR}/blosc/
   -DTBB_ROOT=${LIBDIR}/tbb/
-  -DTbb_INCLUDE_DIR=${LIBDIR}/tbb/include
-  -DTbb_LEGACY_INCLUDE_DIR=${LIBDIR}/tbb/include
-  -DOPENVDB_CORE_SHARED=ON
-  -DOPENVDB_CORE_STATIC=OFF
+  -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
+  -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
   -DOPENVDB_BUILD_BINARIES=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
   -DBLOSC_USE_STATIC_LIBS=ON
   -DUSE_NANOVDB=ON
-  -DOPENVDB_BUILD_PYTHON_MODULE=ON
-  -DOPENVDB_PYTHON_WRAP_ALL_GRID_TYPES=ON
-  -DUSE_NUMPY=ON
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-
-  # OPENVDB_AX Disabled for now as it adds ~25MB distribution wise
-  # with no blender code depending on it, seems wasteful.
-  # -DOPENVDB_BUILD_AX=ON
-  # -DOPENVDB_AX_SHARED=ON
-  # -DOPENVDB_AX_STATIC=OFF
-  # -DLLVM_DIR=${LIBDIR}/llvm/lib/cmake/llvm
 )
 
+if(WIN32)
+  # Namespaces seem to be buggy and cause linker errors due to things not
+  # being in the correct namespace
+  # needs to link pthreads due to it being a blosc dependency
+  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+    -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
+  )
+endif()
+
 ExternalProject_Add(openvdb
   URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openvdb
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
@@ -61,8 +66,6 @@ add_dependencies(
   external_boost
   external_zlib
   external_blosc
-  external_python
-  external_numpy
 )
 
 if(WIN32)
@@ -71,7 +74,6 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb.pyd
       DEPENDEES install
     )
   endif()
@@ -79,7 +81,6 @@ if(WIN32)
     ExternalProject_Add_Step(openvdb after_install
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb_d.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb_d.dll ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb_d.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb_d.pyd
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/options.cmake

@@ -3,8 +3,7 @@
 if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
 endif()
-option(FORCE_CHECK_HASH "Force a check of all hashses during CMake the configure phase" OFF)
-
+option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
 cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
 
@@ -21,8 +20,8 @@ else()
 endif()
 
 set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
-
-set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages" CACHE PATH "default path for downloaded packages")
+# This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py:
+set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages")
 option(PACKAGE_USE_UPSTREAM_SOURCES "Use sources upstream to download the package sources, when OFF the blender mirror will be used" ON)
 
 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
@@ -41,36 +40,31 @@ if(WIN32)
   set(LIBEXT ".lib")
   set(SHAREDLIBEXT ".lib")
   set(LIBPREFIX "")
-  set(MESON ${LIBDIR}/python/Scripts/meson)
+
   # For OIIO and OSL
-  set(COMMON_DEFINES /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+  set(COMMON_DEFINES /DPSAPI_VERSION=2 /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()
   string(APPEND COMMON_MSVC_FLAGS " /bigobj")
-  # To keep MSVC from oversubscribing the CPU, force it to single threaded mode
-  # msbuild/ninja will queue as many compile units as there are cores, no need for
-  # msvc to be internally threading as well.
-  string(APPEND COMMON_MSVC_FLAGS " /cgthreads1 ")
+  if(WITH_OPTIMIZED_DEBUG)
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  else()
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  endif()
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
-  if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D_DEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
-  else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
-  endif()
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   set(PLATFORM_FLAGS)
   set(PLATFORM_CXX_FLAGS)
@@ -81,18 +75,6 @@ if(WIN32)
   set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
   set(MINGW_HOST x86_64-w64-mingw32)
 
-  # some build systems like meson will respect the *nix like environment vars
-  # like CFLAGS and LDFlags but will still build with the MSVC compiler, so for
-  # those we need to empty out the gcc style flags that are normally in there.
-  set(CONFIGURE_ENV_MSVC
-    cd ${MINGW_PATH} &&
-    call ${PERL_SHELL} &&
-    call ${MINGW_SHELL} &&
-    set path &&
-    set CFLAGS= &&
-    set LDFLAGS=
-  )
-
   set(CONFIGURE_ENV
     cd ${MINGW_PATH} &&
     call ${PERL_SHELL} &&
@@ -115,11 +97,10 @@ if(WIN32)
 else()
   set(PATCH_CMD patch)
   set(LIBEXT ".a")
+  set(SHAREDLIBEXT ".so")
   set(LIBPREFIX "lib")
-  set(MESON ${LIBDIR}/python/bin/meson)
-if(APPLE)
-    set(SHAREDLIBEXT ".dylib")
 
+  if(APPLE)
     # Use same Xcode detection as Blender itself.
     include(../cmake/platform/platform_apple_xcode.cmake)
 
@@ -128,7 +109,7 @@ if(APPLE)
     endif()
 
     set(PLATFORM_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++17 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
     set(PLATFORM_LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
@@ -141,14 +122,12 @@ if(APPLE)
       -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
     )
   else()
-    set(SHAREDLIBEXT ".so")
-
     if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
       set(BLENDER_PLATFORM_ARM ON)
     endif()
 
     set(PLATFORM_CFLAGS "-fPIC")
-    set(PLATFORM_CXXFLAGS "-std=c++17 -fPIC")
+    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
     set(PLATFORM_LDFLAGS)
     set(PLATFORM_BUILD_TARGET)
     set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
@@ -195,7 +174,6 @@ set(DEFAULT_CMAKE_FLAGS
   -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
   -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-  -DCMAKE_CXX_STANDARD=17
   ${PLATFORM_CMAKE_FLAGS}
 )
 
@@ -214,11 +192,3 @@ if(MSVC)
 endif()
 
 set(CMAKE_INSTALL_MESSAGE LAZY)
-
-# On windows we sometimes want to build with ninja, but not all projects quite
-# yet, so for select project we pass PLATFORM_ALT_GENERATOR as the generator
-if(WIN32)
-  set(PLATFORM_ALT_GENERATOR "Ninja")
-else()
-  set(PLATFORM_ALT_GENERATOR "Unix Makefiles")
-endif()

build_files/build_environment/cmake/opus.cmake

@@ -9,7 +9,6 @@ ExternalProject_Add(external_opus
     --disable-shared
     --enable-static
     --with-pic
-    --disable-maintainer-mode
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make install
   INSTALL_DIR ${LIBDIR}/opus

build_files/build_environment/cmake/osl.cmake

@@ -6,7 +6,7 @@ if(WIN32)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/OpenImageIO${SHAREDLIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}")
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
 endif()
 
 set(OSL_EXTRA_ARGS
@@ -21,7 +21,7 @@ set(OSL_EXTRA_ARGS
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILD_SHARED_LIBS=OFF
-  -DLINKSTATIC=OFF
+  -DLINKSTATIC=ON
   -DOSL_BUILD_PLUGINS=OFF
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
@@ -35,14 +35,13 @@ set(OSL_EXTRA_ARGS
   -DTIFF_ROOT=${LIBDIR}/tiff
   -DJPEG_ROOT=${LIBDIR}/jpeg
   -DUSE_PYTHON=OFF
+  -DCMAKE_CXX_STANDARD=14
   -DImath_ROOT=${LIBDIR}/imath
-  -DUSE_OIIO_STATIC=OFF
 )
 
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   LIST_SEPARATOR ^^
   URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
   PREFIX ${BUILD_DIR}/osl
@@ -84,7 +83,6 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslnoise.lib ${HARVEST_TARGET}/osl/lib/oslnoise_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/pybind11.cmake

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(PYBIND11_EXTRA_ARGS
-  -DPYBIND11_TEST=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_pybind11
-  URL file://${PACKAGE_DIR}/${PYBIND11_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PYBIND11_HASH_TYPE}=${PYBIND11_HASH}
-  PREFIX ${BUILD_DIR}/pybind11
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pybind11 ${DEFAULT_CMAKE_FLAGS} ${PYBIND11_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pybind11
-)
-
-add_dependencies(
-  external_pybind11
-  external_python
-)

build_files/build_environment/cmake/python.cmake

@@ -16,12 +16,10 @@ if(WIN32)
 
   set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
   set(ZLIB_SOURCE_FOLDER ${BUILD_DIR}/zlib/src/external_zlib)
-  set(SSL_SOURCE_FOLDER ${BUILD_DIR}/ssl/src/external_ssl)
   set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
 
   cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
   cmake_to_dos_path(${ZLIB_SOURCE_FOLDER} ZLIB_SOURCE_FOLDER_DOS)
-  cmake_to_dos_path(${SSL_SOURCE_FOLDER} SSL_SOURCE_FOLDER_DOS)
   cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
   ExternalProject_Add(external_python
@@ -32,14 +30,12 @@ if(WIN32)
     # Python will download its own deps and there's very little we can do about
     # that beyond placing some code in their externals dir before it tries.
     # the foldernames *HAVE* to match the ones inside pythons get_externals.cmd.
-    # regardless of the version actually in there.
-    PATCH_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.13 ${ZLIB_SOURCE_FOLDER_DOS} &&
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-1.1.1q ${SSL_SOURCE_FOLDER_DOS} &&
-      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
-      ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
-    CONFIGURE_COMMAND echo "."
-    BUILD_COMMAND ${CONFIGURE_ENV_MSVC} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
+    # python 3.10.8 still ships zlib 1.2.12, replace it with our 1.2.13
+    # copy until they update.
+    CONFIGURE_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
+      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.12 ${ZLIB_SOURCE_FOLDER_DOS} &&
+      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.12/zconf.h
+    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
   add_dependencies(
@@ -73,10 +69,11 @@ else()
       set(PYTHON_FUNC_CONFIGS ${PYTHON_FUNC_CONFIGS} && export PYTHON_DECIMAL_WITH_MACHINE=ansi64)
     endif()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
   else()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
   endif()
-  set(PYTHON_BINARY ${LIBDIR}/python/bin/python${PYTHON_SHORT_VERSION})
   # Link against zlib statically (Unix). Avoid rpath issues (macOS).
   set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
   set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
@@ -100,31 +97,14 @@ else()
     INSTALL_DIR ${LIBDIR}/python)
 endif()
 
-add_dependencies(
-  external_python
-  external_ssl
-  external_zlib
-)
 if(UNIX)
   add_dependencies(
     external_python
     external_bzip2
     external_ffi
     external_lzma
+    external_ssl
     external_sqlite
+    external_zlib
   )
 endif()
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_python after_install
-      # Boost can't keep it self from linking release python
-      # in a debug configuration even if all options are set
-      # correctly to instruct it to use the debug version
-      # of python. So just copy the debug imports file over
-      # and call it a day...
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/python_site_packages.cmake

@@ -15,9 +15,21 @@ ExternalProject_Add(external_python_site_packages
   CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
   BUILD_COMMAND ""
   PREFIX ${BUILD_DIR}/site_packages
-  # setuptools is downgraded to 63.2.0 (same as python 3.10.8) since numpy 1.23.x seemingly has 
+  # setuptools is downgraded to 63.2.0 (same as python 3.10.8) since numpy 1.23.x seemingly has
   # issues building on windows with the newer versions that ships with python 3.10.9+
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} setuptools==63.2.0 cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_VERSION} meson==${MESON_VERSION} --no-binary :all:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA}
+  setuptools==63.2.0
+  cython==${CYTHON_VERSION}
+  idna==${IDNA_VERSION}
+  charset-normalizer==${CHARSET_NORMALIZER_VERSION}
+  urllib3==${URLLIB3_VERSION}
+  certifi==${CERTIFI_VERSION}
+  requests==${REQUESTS_VERSION}
+  zstandard==${ZSTANDARD_VERSION}
+  autopep8==${AUTOPEP8_VERSION}
+  pycodestyle==${PYCODESTYLE_VERSION}
+  toml==${TOML_VERSION}
+  --no-binary :all:
 )
 
 if(USE_PIP_NUMPY)

build_files/build_environment/cmake/setup_mingw64.cmake

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-##################################################################################################
+####################################################################################################################
 # Mingw64 Builds
-##################################################################################################
+####################################################################################################################
 # This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/fftw3
-##################################################################################################
+####################################################################################################################
 
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)

build_files/build_environment/cmake/shaderc.cmake

@@ -1,64 +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 *****
-set(SHADERC_EXTRA_ARGS
-  -DSHADERC_SKIP_TESTS=On
-  -DSHADERC_SPIRV_TOOLS_DIR=${BUILD_DIR}/shaderc_spirv_tools/src/external_shaderc_spirv_tools
-  -DSHADERC_SPIRV_HEADERS_DIR=${BUILD_DIR}/shaderc_spirv_headers/src/external_shaderc_spirv_headers
-  -DSHADERC_GLSLANG_DIR=${BUILD_DIR}/shaderc_glslang/src/external_shaderc_glslang
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_shaderc
-  URL file://${PACKAGE_DIR}/${SHADERC_FILE}
-  URL_HASH ${SHADERC_HASH_TYPE}=${SHADERC_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/shaderc ${DEFAULT_CMAKE_FLAGS} ${SHADERC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/shaderc
-)
-
-add_dependencies(
-  external_shaderc
-  external_shaderc_spirv_tools
-  external_shaderc_spirv_headers
-  external_shaderc_glslang
-  external_python
-)
-
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/shaderc/include ${HARVEST_TARGET}/shaderc/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared.lib
-
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared_d.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared_d.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
-
-

build_files/build_environment/cmake/shaderc_deps.cmake

@@ -1,51 +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 *****
-
-# These are build time requirements for shaderc. We only have to unpack these
-# shaderc will build them.
-
-ExternalProject_Add(external_shaderc_glslang
-  URL file://${PACKAGE_DIR}/${SHADERC_GLSLANG_FILE}
-  URL_HASH ${SHADERC_GLSLANG_HASH_TYPE}=${SHADERC_GLSLANG_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_glslang
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_shaderc_spirv_headers
-  URL file://${PACKAGE_DIR}/${SHADERC_SPIRV_HEADERS_FILE}
-  URL_HASH ${SHADERC_SPIRV_HEADERS_HASH_TYPE}=${SHADERC_SPIRV_HEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_spirv_headers
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_shaderc_spirv_tools
-  URL file://${PACKAGE_DIR}/${SHADERC_SPIRV_TOOLS_FILE}
-  URL_HASH ${SHADERC_SPIRV_TOOLS_HASH_TYPE}=${SHADERC_SPIRV_TOOLS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_spirv_tools
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-

build_files/build_environment/cmake/sndfile.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(SNDFILE_EXTRA_ARGS)
-set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR})
+set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
   set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
@@ -30,7 +30,6 @@ add_dependencies(
   external_sndfile
   external_ogg
   external_vorbis
-  external_opus
 )
 if(UNIX)
   add_dependencies(

build_files/build_environment/cmake/sse2neon.cmake

@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ExternalProject_Add(external_sse2neon
-  URL file://${PACKAGE_DIR}/${SSE2NEON_FILE}
+  GIT_REPOSITORY  ${SSE2NEON_GIT}
+  GIT_TAG ${SSE2NEON_GIT_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SSE2NEON_HASH_TYPE}=${SSE2NEON_HASH}
   PREFIX ${BUILD_DIR}/sse2neon
   CONFIGURE_COMMAND echo sse2neon - Nothing to configure
   BUILD_COMMAND echo sse2neon - nothing to build

build_files/build_environment/cmake/ssl.cmake

@@ -3,47 +3,33 @@
 set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
-if(WIN32)
-  # Python will build this with its preferred build options and patches. We only need to unpack openssl
-  ExternalProject_Add(external_ssl
-    URL file://${PACKAGE_DIR}/${SSL_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
-    PREFIX ${BUILD_DIR}/ssl
-    CONFIGURE_COMMAND echo "." 
-    BUILD_COMMAND echo "." 
-    INSTALL_COMMAND echo "." 
-    INSTALL_DIR ${LIBDIR}/ssl
-  )
+if(APPLE)
+  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
+  set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
 else()
-  if(APPLE)
-    set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
-    set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
+  if(BLENDER_PLATFORM_ARM)
+    set(SSL_OS_COMPILER "blender-linux-aarch64")
+  elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
+    set(SSL_OS_COMPILER "blender-linux-x86_64")
   else()
-    if(BLENDER_PLATFORM_ARM)
-      set(SSL_OS_COMPILER "blender-linux-aarch64")
-    elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-      set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-      set(SSL_OS_COMPILER "blender-linux-x86_64")
-    else()
-      set(SSL_OS_COMPILER "blender-linux-x86")
-    endif()
+    set(SSL_OS_COMPILER "blender-linux-x86")
   endif()
+endif()
 
-  ExternalProject_Add(external_ssl
-    URL file://${PACKAGE_DIR}/${SSL_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
-    PREFIX ${BUILD_DIR}/ssl
-    PATCH_COMMAND ${SSL_PATCH_CMD}
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-      --openssldir=${LIBDIR}/ssl
-      no-shared
-      no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-      --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-      ${SSL_OS_COMPILER}
-    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-    INSTALL_DIR ${LIBDIR}/ssl
-  )
-endif()
+ExternalProject_Add(external_ssl
+  URL file://${PACKAGE_DIR}/${SSL_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
+  PREFIX ${BUILD_DIR}/ssl
+  PATCH_COMMAND ${SSL_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
+    --openssldir=${LIBDIR}/ssl
+    no-shared
+    no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
+    --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
+    ${SSL_OS_COMPILER}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
+  INSTALL_DIR ${LIBDIR}/ssl
+)

build_files/build_environment/cmake/tbb.cmake

@@ -1,14 +1,26 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-set(TBB_EXTRA_ARGS
-  -DTBB_BUILD_SHARED=On
-  -DTBB_BUILD_TBBMALLOC=On
-  -DTBB_BUILD_TBBMALLOC_PROXY=On
-  -DTBB_BUILD_STATIC=Off
-  -DTBB_BUILD_TESTS=Off
-  -DCMAKE_DEBUG_POSTFIX=_debug
-)
-set(TBB_LIBRARY tbb)
-set(TBB_STATIC_LIBRARY Off)
+if(WIN32)
+  set(TBB_EXTRA_ARGS
+    -DTBB_BUILD_SHARED=On
+    -DTBB_BUILD_TBBMALLOC=On
+    -DTBB_BUILD_TBBMALLOC_PROXY=On
+    -DTBB_BUILD_STATIC=Off
+    -DTBB_BUILD_TESTS=Off
+    -DCMAKE_DEBUG_POSTFIX=_debug
+  )
+  set(TBB_LIBRARY tbb)
+  set(TBB_STATIC_LIBRARY Off)
+else()
+  set(TBB_EXTRA_ARGS
+    -DTBB_BUILD_SHARED=Off
+    -DTBB_BUILD_TBBMALLOC=On
+    -DTBB_BUILD_TBBMALLOC_PROXY=Off
+    -DTBB_BUILD_STATIC=On
+    -DTBB_BUILD_TESTS=Off
+  )
+  set(TBB_LIBRARY tbb_static)
+  set(TBB_STATIC_LIBRARY On)
+endif()
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb

build_files/build_environment/cmake/usd.cmake

@@ -7,56 +7,32 @@ if(WIN32)
     # USD does not look for debug libs, nor does it link them
     # when building static, so this is just to keep find_package happy
     # if we ever link dynamically on windows util will need to be linked as well.
-    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}^^${LIBDIR}/openimageio/lib/OpenImageIO_util_d${LIBEXT}")
+    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}")
   endif()
   set(USD_PLATFORM_FLAGS
     ${USD_OIIO_CMAKE_DEFINES}
     -DCMAKE_CXX_FLAGS=${USD_CXX_FLAGS}
-    -D_PXR_CXX_DEFINITIONS=/DBOOST_ALL_NO_LIB
-    -DCMAKE_SHARED_LINKER_FLAGS_INIT=/LIBPATH:${LIBDIR}/tbb/lib
-    -DPython_FIND_REGISTRY=NEVER
-    -DPYTHON_INCLUDE_DIRS=${LIBDIR}/python/include
-    -DPYTHON_LIBRARY=${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}${LIBEXT}
   )
-  if(BUILD_MODE STREQUAL Debug)
-    list(APPEND USD_PLATFORM_FLAGS -DPXR_USE_DEBUG_PYTHON=ON)
-    list(APPEND USD_PLATFORM_FLAGS -DOPENVDB_LIBRARY=${LIBDIR}/openvdb/lib/openvdb_d.lib)
-  endif()
-elseif(UNIX)
-  # Workaround USD not linking correctly with static Python library, where it would embed
-  # part of the interpret in the USD library. Allow undefined Python symbols and replace
-  # Python library with TBB so it doesn't complain about missing library.
-  set(USD_PLATFORM_FLAGS
-    -DPYTHON_INCLUDE_DIR=${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/
-    -DPYTHON_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
-   )
-
-  if(APPLE)
-    set(USD_SHARED_LINKER_FLAGS "-Xlinker -undefined -Xlinker dynamic_lookup")
-    list(APPEND USD_PLATFORM_FLAGS
-      -DCMAKE_SHARED_LINKER_FLAGS=${USD_SHARED_LINKER_FLAGS})
-  endif()
 endif()
 
 set(USD_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
   ${USD_PLATFORM_FLAGS}
+  # This is a preventative measure that avoids possible conflicts when add-ons
+  # try to load another USD library into the same process space.
+  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
   -DOPENSUBDIV_ROOT_DIR=${LIBDIR}/opensubdiv
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio
-  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
-  -DImath_DIR=${LIBDIR}/imath
-  -DOPENVDB_LOCATION=${LIBDIR}/openvdb
-  -DPXR_ENABLE_PYTHON_SUPPORT=ON
-  -DPXR_USE_PYTHON_3=ON
+  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
   -DPXR_BUILD_IMAGING=ON
   -DPXR_BUILD_TESTS=OFF
   -DPXR_BUILD_EXAMPLES=OFF
   -DPXR_BUILD_TUTORIALS=OFF
-  -DPXR_BUILD_USDVIEW=OFF
   -DPXR_ENABLE_HDF5_SUPPORT=OFF
   -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-  -DPXR_ENABLE_OPENVDB_SUPPORT=ON
+  -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
   -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
   -DPXR_BUILD_MONOLITHIC=ON
   # OSL is an optional dependency of the Imaging module. However, since that
@@ -64,36 +40,40 @@ set(USD_EXTRA_ARGS
   # cube, etc.) to geometry, it's not necessary. Disabling it will make it
   # simpler to build Blender; currently only Cycles uses OSL.
   -DPXR_ENABLE_OSL_SUPPORT=OFF
-  # Enable OpenGL for Hydra support. Note that this indirectly also adds an X11
-  # dependency on Linux. This would be good to eliminate for headless and Wayland
-  # only builds, however is not worse than what Blender already links to for
-  # official releases currently.
-  -DPXR_ENABLE_GL_SUPPORT=ON
-  # OIIO is used for loading image textures in Hydra Storm / Embree renderers.
-  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
+  # GL support on Linux also links to X11 libraries. Enabling it would break
+  # headless or Wayland-only builds. OpenGL support would be useful if someone
+  # wants to work on a Hydra viewport in Blender; when that's actually being
+  # worked on, we could patch in a new PXR_ENABLE_X11_SUPPORT option (to
+  # separate OpenGL from X11) and contribute it upstream.
+  -DPXR_ENABLE_GL_SUPPORT=OFF
+  # Disable Metal since USD fails to build this when OpenGL is disabled.
+  -DPXR_ENABLE_METAL_SUPPORT=OFF
+  # OIIO is used for loading image textures in Hydra Storm / Embree renderers,
+  # which we don't use.
+  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=OFF
   # USD 22.03 does not support OCIO 2.x
   # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
   -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF
   -DPXR_ENABLE_PTEX_SUPPORT=OFF
   -DPXR_BUILD_USD_TOOLS=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=Off
+  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
+  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
+  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
   -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
-  -DTBB_tbb_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
+  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
+  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
   # USD wants the tbb debug lib set even when you are doing a release build
   # Otherwise it will error out during the cmake configure phase.
-  -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
+  -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
 )
 
 ExternalProject_Add(external_usd
   URL file://${PACKAGE_DIR}/${USD_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${USD_HASH_TYPE}=${USD_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/usd
-  LIST_SEPARATOR ^^
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/usd
@@ -104,9 +84,6 @@ add_dependencies(
   external_tbb
   external_boost
   external_opensubdiv
-  external_python
-  external_openimageio
-  openvdb
 )
 
 # Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
@@ -122,16 +99,27 @@ endif()
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd ${HARVEST_TARGET}/usd
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_usd_m.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/debug/python
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_ms_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_ms_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_usd_m_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m_d.lib
       DEPENDEES install
     )
   endif()
+else()
+  # USD has two build options. The default build creates lots of small libraries,
+  # whereas the 'monolithic' build produces only a single library. The latter
+  # makes linking simpler, so that's what we use in Blender. However, running
+  # 'make install' in the USD sources doesn't install the static library in that
+  # case (only the shared library). As a result, we need to grab the `libusd_m.a`
+  # file from the build directory instead of from the install directory.
+  ExternalProject_Add_Step(external_usd after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/lib${PXR_LIB_PREFIX}usd_m.a ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.a
+    DEPENDEES install
+  )
 endif()

build_files/build_environment/cmake/versions.cmake

@@ -35,12 +35,12 @@ set(JPEG_HASH_TYPE MD5)
 set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
 set(JPEG_CPE "cpe:2.3:a:d.r.commander:libjpeg-turbo:${JPEG_VERSION}:*:*:*:*:*:*:*")
 
-set(BOOST_VERSION 1.80.0)
-set(BOOST_VERSION_SHORT 1.80)
-set(BOOST_VERSION_NODOTS 1_80_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_80)
+set(BOOST_VERSION 1.78.0)
+set(BOOST_VERSION_SHORT 1.78)
+set(BOOST_VERSION_NODOTS 1_78_0)
+set(BOOST_VERSION_NODOTS_SHORT 1_78)
 set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH 077f074743ea7b0cb49c6ed43953ae95)
+set(BOOST_HASH c2f6428ac52b0e5a3c9b2e1d8cc832b5)
 set(BOOST_HASH_TYPE MD5)
 set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
 set(BOOST_CPE "cpe:2.3:a:boost:boost:${BOOST_VERSION}:*:*:*:*:*:*:*")
@@ -77,11 +77,11 @@ if(WIN32)
   # we need to tell the build the postfix is _s while
   # telling all other deps the postfix is _s_d
   if(BUILD_MODE STREQUAL Release)
-    set(OPENEXR_VERSION_POSTFIX )
-    set(OPENEXR_VERSION_BUILD_POSTFIX )
+    set(OPENEXR_VERSION_POSTFIX _s)
+    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   else()
-    set(OPENEXR_VERSION_POSTFIX _d)
-    set(OPENEXR_VERSION_BUILD_POSTFIX )
+    set(OPENEXR_VERSION_POSTFIX _s_d)
+    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   endif()
 else()
   set(OPENEXR_VERSION_BUILD_POSTFIX)
@@ -95,11 +95,11 @@ set(FREETYPE_HASH_TYPE MD5)
 set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
 SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
 
-set(EPOXY_VERSION 1.5.10)
-set(EPOXY_URI https://github.com/anholt/libepoxy/archive/refs/tags/${EPOXY_VERSION}.tar.gz)
-set(EPOXY_HASH f0730aad115c952e77591fcc805b1dc1)
-set(EPOXY_HASH_TYPE MD5)
-set(EPOXY_FILE libepoxy-${EPOXY_VERSION}.tar.gz)
+set(GLEW_VERSION 1.13.0)
+set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
+set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)
+set(GLEW_HASH_TYPE MD5)
+set(GLEW_FILE glew-${GLEW_VERSION}.tgz)
 
 set(FREEGLUT_VERSION 3.0.0)
 set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
@@ -114,9 +114,9 @@ set(ALEMBIC_HASH_TYPE MD5)
 set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
 SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
 
-set(OPENSUBDIV_VERSION v3_5_0)
+set(OPENSUBDIV_VERSION v3_4_4)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
-set(OPENSUBDIV_HASH 230f5cd2911d6240e58a3773b9c6e5e4)
+set(OPENSUBDIV_HASH 39ecc5caf0abebc943d1ce131855e76e)
 set(OPENSUBDIV_HASH_TYPE MD5)
 set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
@@ -133,18 +133,12 @@ set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
 set(OPENCOLLADA_HASH_TYPE MD5)
 set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
-set(OPENCOLORIO_VERSION 2.2.0)
+set(OPENCOLORIO_VERSION 2.1.1)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH d58a5980adba2d89a363100a09daa5f3)
+set(OPENCOLORIO_HASH 604f562e073f23d88ce89ed4f7f709ba)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-set(MINIZIPNG_VERSION 3.0.7)
-set(MINIZIPNG_URI https://github.com/zlib-ng/minizip-ng/archive/${MINIZIPNG_VERSION}.tar.gz)
-set(MINIZIPNG_HASH 09dcc8a9def348e1be9659e384c2cd55)
-set(MINIZIPNG_HASH_TYPE MD5)
-set(MINIZIPNG_FILE minizip-ng-${MINIZIPNG_VERSION}.tar.gz)
-
 set(LLVM_VERSION 12.0.0)
 set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
 set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
@@ -165,9 +159,9 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.4.6.0)
+set(OPENIMAGEIO_VERSION v2.3.20.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH c7acc1b9a8fda04ef48f7de1feda4dae)
+set(OPENIMAGEIO_HASH defb1fe7c8e64bac60eb3cacaf5c3736)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -188,24 +182,19 @@ set(ROBINMAP_HASH c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8e
 set(ROBINMAP_HASH_TYPE SHA256)
 set(ROBINMAP_FILE robinmap-${ROBINMAP_VERSION}.tar.gz)
 
-set(TIFF_VERSION 4.4.0)
+set(TIFF_VERSION 4.5.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 376f17f189e9d02280dfe709b2b2bbea)
+set(TIFF_HASH db9e220a1971acc64487f1d51a20dcaa)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
 
-set(OSL_VERSION 1.12.7.1)
-set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${OSL_VERSION}.tar.gz)
-set(OSL_HASH 53211da86c34ba6e0344998c1a6d219c)
+set(OSL_VERSION 1.11.17.0)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
+set(OSL_HASH 63265472ce14548839ace2e21e401544)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
-# NOTE: When updating the python version, it's required to check the versions of
-# it wants to use in PCbuild/get_externals.bat for the following dependencies:
-# BZIP2, FFI, SQLITE and change the versions in this file as well. For compliance 
-# reasons there can be no exceptions to this.
-
 set(PYTHON_VERSION 3.10.9)
 set(PYTHON_SHORT_VERSION 3.10)
 set(PYTHON_SHORT_VERSION_NO_DOTS 310)
@@ -223,9 +212,9 @@ set(TBB_HASH_TYPE MD5)
 set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
 set(TBB_CPE "cpe:2.3:a:intel:threading_building_blocks:${TBB_YEAR}:*:*:*:*:*:*:*")
 
-set(OPENVDB_VERSION 10.0.0)
+set(OPENVDB_VERSION 9.0.0)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 64301c737e16b26c8f3085a31e6397e9)
+set(OPENVDB_HASH 684ce40c2f74f3a0c9cac530e1c7b07e)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
@@ -235,22 +224,20 @@ set(URLLIB3_VERSION 1.26.8)
 set(URLLIB3_CPE "cpe:2.3:a:urllib3:urllib3:${URLLIB3_VERSION}:*:*:*:*:*:*:*")
 set(CERTIFI_VERSION 2021.10.8)
 set(REQUESTS_VERSION 2.27.1)
-set(CYTHON_VERSION 0.29.30)
-# The version of the zstd library used to build the Python package should match ZSTD_VERSION
-# defined below. At this time of writing, 0.17.0 was already released,
-# but built against zstd 1.5.1, while we use 1.5.0.
+set(CYTHON_VERSION 0.29.26)
+# The version of the zstd library used to build the Python package should match ZSTD_VERSION defined below.
+# At this time of writing, 0.17.0 was already released, but built against zstd 1.5.1, while we use 1.5.0.
 set(ZSTANDARD_VERSION 0.16.0)
 set(AUTOPEP8_VERSION 1.6.0)
 set(PYCODESTYLE_VERSION 2.8.0)
 set(TOML_VERSION 0.10.2)
-set(MESON_VERSION 0.63.0)
 
-set(NUMPY_VERSION 1.23.5)
-set(NUMPY_SHORT_VERSION 1.23)
-set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.tar.gz)
-set(NUMPY_HASH 8b2692a511a3795f3af8af2cd7566a15)
+set(NUMPY_VERSION 1.22.0)
+set(NUMPY_SHORT_VERSION 1.22)
+set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
+set(NUMPY_HASH 252de134862a27bd66705d29622edbfe)
 set(NUMPY_HASH_TYPE MD5)
-set(NUMPY_FILE numpy-${NUMPY_VERSION}.tar.gz)
+set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
 set(NUMPY_CPE "cpe:2.3:a:numpy:numpy:${NUMPY_VERSION}:*:*:*:*:*:*:*")
 
 set(LAME_VERSION 3.100)
@@ -279,9 +266,9 @@ set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
 set(THEORA_HASH_TYPE SHA256)
 set(THEORA_FILE libtheora-${THEORA_VERSION}.tar.bz2)
 
-set(FLAC_VERSION 1.3.4)
+set(FLAC_VERSION 1.4.2)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 )
+set(FLAC_HASH e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4 )
 set(FLAC_HASH_TYPE SHA256)
 set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
 set(FLAC_CPE "cpe:2.3:a:flac_project:flac:${FLAC_VERSION}:*:*:*:*:*:*:*")
@@ -313,10 +300,11 @@ set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
 
 set(OPENJPEG_VERSION 2.5.0)
 set(OPENJPEG_SHORT_VERSION 2.5)
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a)
+set(OPENJPEG_GIT_HASH 2d606701e8b7aa83f657d113c3367508e99bd12b)
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/${OPENJPEG_GIT_HASH}.tar.gz)
+set(OPENJPEG_HASH f90941955eb66a81762df5e989f13ade48d753d3182e7f9a82d2bfce3fb5cef2)
 set(OPENJPEG_HASH_TYPE SHA256)
-set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
+set(OPENJPEG_FILE openjpeg-v${OPENJPEG_GIT_HASH}.tar.gz)
 set(OPENJPEG_CPE "cpe:2.3:a:uclouvain:openjpeg:${OPENJPEG_VERSION}:*:*:*:*:*:*:*")
 
 set(FFMPEG_VERSION 5.1.2)
@@ -371,9 +359,9 @@ set(XML2_HASH_TYPE MD5)
 set(XML2_FILE libxml2-${XML2_VERSION}.tar.xz)
 set(XML2_CPE "cpe:2.3:a:xmlsoft:libxml2:${XML2_VERSION}:*:*:*:*:*:*:*")
 
-set(YAMLCPP_VERSION 0.7.0)
+set(YAMLCPP_VERSION 0.6.3)
 set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
-set(YAMLCPP_HASH 74d646a3cc1b5d519829441db96744f0)
+set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
 set(YAMLCPP_HASH_TYPE MD5)
 set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
 set(YAMLCPP "cpe:2.3:a:yaml-cpp_project:yaml-cpp:${YAMLCPP_VERSION}:*:*:*:*:*:*:*")
@@ -442,7 +430,9 @@ set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
 set(LZMA_HASH_TYPE SHA256)
 set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
 
-# NOTE: Python's build has been modified to use our ssl version.
+# NOTE: This will *HAVE* to match the version python ships on windows which
+# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
+# can be no exceptions to this.
 set(SSL_VERSION 1.1.1q)
 set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
 set(SSL_HASH d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca)
@@ -453,10 +443,10 @@ set(SSL_CPE "cpe:2.3:a:openssl:openssl:${SSL_VERSION}:*:*:*:*:*:*:*")
 # Note: This will *HAVE* to match the version python ships on windows which
 # is hardcoded in pythons PCbuild/get_externals.bat for compliance reasons there
 # can be no exceptions to this.
-set(SQLITE_VERSION 3.39.4)
-set(SQLLITE_LONG_VERSION 3390400)
+set(SQLITE_VERSION 3.37.2)
+set(SQLLITE_LONG_VERSION 3370200)
 set(SQLITE_URI https://www.sqlite.org/2022/sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
-set(SQLITE_HASH c4c5c39269d1b9bb1487cff580c1f583608229b2)
+set(SQLITE_HASH e56faacadfb4154f8fbd0f2a3f827d13706b70a1)
 set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
 set(SQLITE_CPE "cpe:2.3:a:sqlite:sqlite:${SQLITE_VERSION}:*:*:*:*:*:*:*")
@@ -467,18 +457,12 @@ set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
-set(USD_VERSION 22.11)
+set(USD_VERSION 22.03)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 8c89459e48a2ef0e7ae9e7e490377507)
+set(USD_HASH e0e441a05057692a83124a1195b09eed)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(MATERIALX_VERSION 1.38.6)
-set(MATERIALX_URI https://github.com/AcademySoftwareFoundation/MaterialX/archive/refs/tags/v${MATERIALX_VERSION}.tar.gz)
-set(MATERIALX_HASH d49c9fdef34b5702fc60058d3e1864f2)
-set(MATERIALX_HASH_TYPE MD5)
-set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz)
-
 set(OIDN_VERSION 1.4.3)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
 set(OIDN_HASH 027093eaf5e8b4e45835b991137b38e6)
@@ -517,18 +501,6 @@ set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/
 set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
 set(WL_PROTOCOLS_HASH_TYPE MD5)
 
-set(WAYLAND_VERSION 1.21.0)
-set(WAYLAND_FILE wayland-${WAYLAND_VERSION}.tar.xz)
-set(WAYLAND_URI https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-${WAYLAND_VERSION}.tar.xz)
-set(WAYLAND_HASH f2653a2293bcd882d756c6a83d278903)
-set(WAYLAND_HASH_TYPE MD5)
-
-set(WAYLAND_LIBDECOR_VERSION 0.1.0)
-set(WAYLAND_LIBDECOR_FILE libdecor-${WAYLAND_LIBDECOR_VERSION}.tar.xz)
-set(WAYLAND_LIBDECOR_URI https://gitlab.gnome.org/jadahl/libdecor/uploads/81adf91d27620e20bcc5f6b9b312d768/libdecor-${WAYLAND_LIBDECOR_VERSION}.tar.xz )
-set(WAYLAND_LIBDECOR_HASH 47b59eba76faa3787f0878bf8700e912)
-set(WAYLAND_LIBDECOR_HASH_TYPE MD5)
-
 set(ISPC_VERSION v1.17.0)
 set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
 set(ISPC_HASH 4f476a3109332a77fe839a9014c60ca9)
@@ -562,11 +534,8 @@ set(ZSTD_HASH_TYPE SHA256)
 set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
 set(ZSTD_CPE "cpe:2.3:a:facebook:zstandard:${ZSTD_VERSION}:*:*:*:*:*:*:*")
 
-set(SSE2NEON_VERSION fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
-set(SSE2NEON_URI https://github.com/DLTcollab/sse2neon/archive/${SSE2NEON_VERSION}.tar.gz)
-set(SSE2NEON_HASH 0780253525d299c31775ef95853698d03db9c7739942af8570000f4a25a5d605)
-set(SSE2NEON_HASH_TYPE SHA256)
-set(SSE2NEON_FILE sse2neon-${SSE2NEON_VERSION}.tar.gz)
+set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
+set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
 
 set(BROTLI_VERSION 1.0.9)
 set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/v${BROTLI_VERSION}.tar.gz)
@@ -575,22 +544,15 @@ set(BROTLI_HASH_TYPE SHA256)
 set(BROTLI_FILE brotli-v${BROTLI_VERSION}.tar.gz)
 set(BROTLI_CPE "cpe:2.3:a:google:brotli:${BROTLI_VERSION}:*:*:*:*:*:*:*")
 
-set(OPENPGL_VERSION v0.4.1-beta)
-set(OPENPGL_SHORT_VERSION 0.4.1)
-set(OPENPGL_URI https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/${OPENPGL_VERSION}.tar.gz)
-set(OPENPGL_HASH db63f5dac5cfa8c110ede241f0c413f00db0c4748697381c4fa23e0f9e82a754)
-set(OPENPGL_HASH_TYPE SHA256)
-set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)
-
-set(LEVEL_ZERO_VERSION v1.8.5)
+set(LEVEL_ZERO_VERSION v1.7.15)
 set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
-set(LEVEL_ZERO_HASH b6e9663bbcc53c148d32376998298bec6f7c434ef2218c61fa708963e3a09394)
+set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
 set(LEVEL_ZERO_HASH_TYPE SHA256)
 set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
 
-set(DPCPP_VERSION 20221019)
+set(DPCPP_VERSION 20220812)
 set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH 2f533946e91ce3829431758ea17b0b834b960c1a796e9e4563c86e03eb9603a2)
+set(DPCPP_HASH 0e3c95346c295f5cf80f3a42d80b1c49481955898530242636ddc002627248d6)
 set(DPCPP_HASH_TYPE SHA256)
 set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
 
@@ -603,9 +565,9 @@ set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
 # will take care of building them, unpack is being done in dpcpp_deps.cmake
 
 # Source llvm/lib/SYCLLowerIR/CMakeLists.txt
-set(VCINTRINSICS_VERSION abce9184b7a3a7fe1b02289b9285610d9dc45465)
+set(VCINTRINSICS_VERSION 984bb27baacce6ee5c716c2e64845f2a1928025b)
 set(VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
-set(VCINTRINSICS_HASH 3e9fd471246b87633b26f7e15e17ab7733d357458c53d5c5881c03929d6c551f)
+set(VCINTRINSICS_HASH abea415a15a0dd11fdc94dee8fb462910f2548311b787e02f42509789e1b0d7b)
 set(VCINTRINSICS_HASH_TYPE SHA256)
 set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
 
@@ -617,9 +579,9 @@ set(OPENCLHEADERS_HASH_TYPE SHA256)
 set(OPENCLHEADERS_FILE opencl_headers-${OPENCLHEADERS_VERSION}.tar.gz)
 
 # Source opencl/CMakeLists.txt
-set(ICDLOADER_VERSION 792682ad3d877ab38573b997808bab3b43902b70)
+set(ICDLOADER_VERSION aec3952654832211636fc4af613710f80e203b0a)
 set(ICDLOADER_URI https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${ICDLOADER_VERSION}.tar.gz)
-set(ICDLOADER_HASH b33a0320d94bf300efa1da97931ded506d27813bd1148da6858fe79d412d1ea2)
+set(ICDLOADER_HASH e1880551d67bd8dc31d13de63b94bbfd6b1f315b6145dad1ffcd159b89bda93c)
 set(ICDLOADER_HASH_TYPE SHA256)
 set(ICDLOADER_FILE icdloader-${ICDLOADER_VERSION}.tar.gz)
 
@@ -634,9 +596,9 @@ set(MP11_FILE mp11-${MP11_VERSION}.tar.gz)
 
 # Source llvm-spirv/CMakeLists.txt (repo)
 # Source llvm-spirv/spirv-headers-tag.conf (hash)
-set(SPIRV_HEADERS_VERSION 5a121866927a16ab9d49bed4788b532c7fcea766)
+set(SPIRV_HEADERS_VERSION 36c0c1596225e728bd49abb7ef56a3953e7ed468)
 set(SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_VERSION}.tar.gz)
-set(SPIRV_HEADERS_HASH ec8ecb471a62672697846c436501638ab25447ae9d4a6761e0bfe8a9a839502a)
+set(SPIRV_HEADERS_HASH 7a5c89633f8740456fe8adee052033e134476d267411d1336c0cb1e587a9229a)
 set(SPIRV_HEADERS_HASH_TYPE SHA256)
 set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
 
@@ -651,9 +613,9 @@ set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
 # compiler, the versions used are taken from the following location
 # https://github.com/intel/intel-graphics-compiler/releases
 
-set(IGC_VERSION 1.0.12149.1)
+set(IGC_VERSION 1.0.11222)
 set(IGC_URI https://github.com/intel/intel-graphics-compiler/archive/refs/tags/igc-${IGC_VERSION}.tar.gz)
-set(IGC_HASH 44f67f24e3bc5130f9f062533abf8154782a9d0a992bc19b498639a8521ae836)
+set(IGC_HASH d92f0608dcbb52690855685f9447282e5c09c0ba98ae35fabf114fcf8b1e9fcf)
 set(IGC_HASH_TYPE SHA256)
 set(IGC_FILE igc-${IGC_VERSION}.tar.gz)
 
@@ -673,15 +635,15 @@ set(IGC_LLVM_FILE ${IGC_LLVM_VERSION}.tar.gz)
 #
 # WARNING WARNING WARNING
 
-set(IGC_OPENCL_CLANG_VERSION 363a5262d8c7cff3fb28f3bdb5d85c8d7e91c1bb)
+set(IGC_OPENCL_CLANG_VERSION bbdd1587f577397a105c900be114b56755d1f7dc)
 set(IGC_OPENCL_CLANG_URI https://github.com/intel/opencl-clang/archive/${IGC_OPENCL_CLANG_VERSION}.tar.gz)
-set(IGC_OPENCL_CLANG_HASH aa8cf72bb239722ce8ce44f79413c6887ecc8ca18477dd520aa5c4809756da9a)
+set(IGC_OPENCL_CLANG_HASH d08315f1b0d8a6fef33de2b3e6aa7356534c324910634962c72523d970773efc)
 set(IGC_OPENCL_CLANG_HASH_TYPE SHA256)
 set(IGC_OPENCL_CLANG_FILE opencl-clang-${IGC_OPENCL_CLANG_VERSION}.tar.gz)
 
-set(IGC_VCINTRINSICS_VERSION v0.5.0)
+set(IGC_VCINTRINSICS_VERSION v0.4.0)
 set(IGC_VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/refs/tags/${IGC_VCINTRINSICS_VERSION}.tar.gz)
-set(IGC_VCINTRINSICS_HASH 70bb47c5e32173cf61514941e83ae7c7eb4485e6d2fca60cfa1f50d4f42c41f2)
+set(IGC_VCINTRINSICS_HASH c8b92682ad5031cf9d5b82a40e7d5c0e763cd9278660adbcaa69aab988e4b589)
 set(IGC_VCINTRINSICS_HASH_TYPE SHA256)
 set(IGC_VCINTRINSICS_FILE vc-intrinsics-${IGC_VCINTRINSICS_VERSION}.tar.gz)
 
@@ -697,9 +659,9 @@ set(IGC_SPIRV_TOOLS_HASH 6e19900e948944243024aedd0a201baf3854b377b9cc7a386553bc1
 set(IGC_SPIRV_TOOLS_HASH_TYPE SHA256)
 set(IGC_SPIRV_TOOLS_FILE SPIR-V-Tools-${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
 
-set(IGC_SPIRV_TRANSLATOR_VERSION a31ffaeef77e23d500b3ea3d35e0c42ff5648ad9)
+set(IGC_SPIRV_TRANSLATOR_VERSION 99420daab98998a7e36858befac9c5ed109d4920)
 set(IGC_SPIRV_TRANSLATOR_URI https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
-set(IGC_SPIRV_TRANSLATOR_HASH 9e26c96a45341b8f8af521bacea20e752623346340addd02af95d669f6e89252)
+set(IGC_SPIRV_TRANSLATOR_HASH 77dfb4ddb6bfb993535562c02ddea23f0a0d1c5a0258c1afe7e27c894ff783a8)
 set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256)
 set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
 
@@ -707,15 +669,15 @@ set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.
 ### Intel Graphics Compiler DEPS END ###
 ########################################
 
-set(GMMLIB_VERSION intel-gmmlib-22.1.8)
+set(GMMLIB_VERSION intel-gmmlib-22.1.2)
 set(GMMLIB_URI https://github.com/intel/gmmlib/archive/refs/tags/${GMMLIB_VERSION}.tar.gz)
-set(GMMLIB_HASH bf23e9a3742b4fb98c7666c9e9b29f3219e4b2fb4d831aaf4eed71f5e2d17368)
+set(GMMLIB_HASH 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334)
 set(GMMLIB_HASH_TYPE SHA256)
 set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz)
 
-set(OCLOC_VERSION 22.38.24278)
+set(OCLOC_VERSION 22.20.23198)
 set(OCLOC_URI https://github.com/intel/compute-runtime/archive/refs/tags/${OCLOC_VERSION}.tar.gz)
-set(OCLOC_HASH db0c542fccd651e6404b15a74d46027f1ce0eda8dc9e25a40cbb6c0faef257ee)
+set(OCLOC_HASH ab22b8bf2560a57fdd3def0e35a62ca75991406f959c0263abb00cd6cd9ae998)
 set(OCLOC_HASH_TYPE SHA256)
 set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz)
 
@@ -724,60 +686,3 @@ set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.ta
 set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
 set(AOM_HASH_TYPE SHA256)
 set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)
-
-set(FRIBIDI_VERSION v1.0.12)
-set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz)
-set(FRIBIDI_HASH 2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d)
-set(FRIBIDI_HASH_TYPE SHA256)
-set(FRIBIDI_FILE fribidi-${FRIBIDI_VERSION}.tar.gz)
-
-set(HARFBUZZ_VERSION 5.1.0)
-set(HARFBUZZ_URI https://github.com/harfbuzz/harfbuzz/archive/refs/tags/${HARFBUZZ_VERSION}.tar.gz)
-set(HARFBUZZ_HASH 5352ff2eec538ea9a63a485cf01ad8332a3f63aa79921c5a2e301cef185caea1)
-set(HARFBUZZ_HASH_TYPE SHA256)
-set(HARFBUZZ_FILE harfbuzz-${HARFBUZZ_VERSION}.tar.gz)
-
-set(SHADERC_VERSION v2022.3)
-set(SHADERC_URI https://github.com/google/shaderc/archive/${SHADERC_VERSION}.tar.gz)
-set(SHADERC_HASH 5cb762af57637caf997d5f46baa4e8a4)
-set(SHADERC_HASH_TYPE MD5)
-set(SHADERC_FILE shaderc-${SHADERC_VERSION}.tar.gz)
-
-# The versions of shaderc's dependencies can be found in the root of shaderc's
-# source in a file called DEPS.
-
-set(SHADERC_SPIRV_TOOLS_VERSION eb0a36633d2acf4de82588504f951ad0f2cecacb)
-set(SHADERC_SPIRV_TOOLS_URI https://github.com/KhronosGroup/SPIRV-Tools/archive/${SHADERC_SPIRV_TOOLS_VERSION}.tar.gz)
-set(SHADERC_SPIRV_TOOLS_HASH a4bdb8161f0e959c75d0d82d367c24f2)
-set(SHADERC_SPIRV_TOOLS_HASH_TYPE MD5)
-set(SHADERC_SPIRV_TOOLS_FILE SPIRV-Tools-${SHADERC_SPIRV_TOOLS_VERSION}.tar.gz)
-
-set(SHADERC_SPIRV_HEADERS_VERSION 85a1ed200d50660786c1a88d9166e871123cce39)
-set(SHADERC_SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SHADERC_SPIRV_HEADERS_VERSION}.tar.gz)
-set(SHADERC_SPIRV_HEADERS_HASH 10d5e8160f39344a641523810b075568)
-set(SHADERC_SPIRV_HEADERS_HASH_TYPE MD5)
-set(SHADERC_SPIRV_HEADERS_FILE SPIRV-Headers-${SHADERC_SPIRV_HEADERS_VERSION}.tar.gz)
-
-set(SHADERC_GLSLANG_VERSION 89db4e1caa273a057ea46deba709c6e50001b314)
-set(SHADERC_GLSLANG_URI https://github.com/KhronosGroup/glslang/archive/${SHADERC_GLSLANG_VERSION}.tar.gz)
-set(SHADERC_GLSLANG_HASH 3b3c79ad8e9132ffcb8b63cc29c532e2)
-set(SHADERC_GLSLANG_HASH_TYPE MD5)
-set(SHADERC_GLSLANG_FILE glslang-${SHADERC_GLSLANG_VERSION}.tar.gz)
-
-set(VULKAN_VERSION v1.2.198)
-
-set(VULKAN_HEADERS_URI https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/${VULKAN_VERSION}.tar.gz)
-set(VULKAN_HEADERS_HASH 64fe73e887c963ad546bfc7f9505fa1d)
-set(VULKAN_HEADERS_HASH_TYPE MD5)
-set(VULKAN_HEADERS_FILE Vulkan-Headers-${VULKAN_VERSION}.tar.gz)
-
-set(VULKAN_LOADER_URI https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/${VULKAN_VERSION}.tar.gz)
-set(VULKAN_LOADER_HASH 015170a74f648fd2b41e209b6bf1ebc4)
-set(VULKAN_LOADER_HASH_TYPE MD5)
-set(VULKAN_LOADER_FILE Vulkan-Loader-${VULKAN_VERSION}.tar.gz)
-
-set(PYBIND11_VERSION 2.10.1)
-set(PYBIND11_URI https://github.com/pybind/pybind11/archive/refs/tags/v${PYBIND11_VERSION}.tar.gz)
-set(PYBIND11_HASH ce07bfd5089245da7807b3faf6cbc878)
-set(PYBIND11_HASH_TYPE MD5)
-set(PYBIND11_FILE pybind-v${PYBIND11_VERSION}.tar.gz)

build_files/build_environment/cmake/vulkan.cmake

@@ -1,55 +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 *****
-
-set(VULKAN_HEADERS_EXTRA_ARGS)
-
-ExternalProject_Add(external_vulkan_headers
-  URL file://${PACKAGE_DIR}/${VULKAN_HEADERS_FILE}
-  URL_HASH ${VULKAN_HEADERS_HASH_TYPE}=${VULKAN_HEADERS_HASH}
-  PREFIX ${BUILD_DIR}/vulkan_headers
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_headers -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_HEADERS_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/vulkan_headers
-)
-
-set(VULKAN_LOADER_EXTRA_ARGS
-  -DVULKAN_HEADERS_INSTALL_DIR=${LIBDIR}/vulkan_headers
-)
-
-ExternalProject_Add(external_vulkan_loader
-  URL file://${PACKAGE_DIR}/${VULKAN_LOADER_FILE}
-  URL_HASH ${VULKAN_LOADER_HASH_TYPE}=${VULKAN_LOADER_HASH}
-  PREFIX ${BUILD_DIR}/vulkan_loader
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_loader -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_LOADER_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/vulkan_loader
-)
-
-add_dependencies(
-  external_vulkan_loader
-  external_vulkan_headers
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_vulkan_loader after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_loader/ ${HARVEST_TARGET}/vulkan
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_headers/ ${HARVEST_TARGET}/vulkan
-      DEPENDEES install
-    )
-  endif()
-endif()
-

build_files/build_environment/cmake/wayland.cmake

@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-ExternalProject_Add(external_wayland
-  URL file://${PACKAGE_DIR}/${WAYLAND_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH}
-  PREFIX ${BUILD_DIR}/wayland
-  PATCH_COMMAND ${PATCH_CMD} -d ${BUILD_DIR}/wayland/src/external_wayland < ${PATCH_DIR}/wayland.diff
-  # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT & LIBXML2.
-  #
-  # NOTE: passing link args "ffi/lib" should not be needed, but
-  # `pkgconfig` would incorrectly look in "ffi/lib/../lib64" otherwise.
-  #
-  # NOTE: `-lm` is needed for `libxml2` which is a static library that uses `libm.so`,
-  # without this, math symbols such as `floor` aren't found.
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH
-                    ${MESON} --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -D "c_link_args=-L${LIBDIR}/ffi/lib -lm" . ../external_wayland
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)
-
-add_dependencies(
-  external_wayland
-  external_expat
-  external_xml2
-  external_ffi
-)

build_files/build_environment/cmake/wayland_libdecor.cmake

@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# NOTE: currently only the header file is extracted, no compilation is needed
-# as the library is dynamically loaded when found on the system.
-
-ExternalProject_Add(external_wayland_libdecor
-  URL file://${PACKAGE_DIR}/${WAYLAND_LIBDECOR_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WAYLAND_LIBDECOR_HASH_TYPE}=${WAYLAND_LIBDECOR_HASH}
-  PREFIX ${BUILD_DIR}/wayland_libdecor
-  BUILD_COMMAND echo .
-  CONFIGURE_COMMAND echo .
-  INSTALL_COMMAND cp ../external_wayland_libdecor/src/libdecor.h ${LIBDIR}/wayland_libdecor/include/libdecor-0/libdecor.h
-  INSTALL_DIR ${LIBDIR}/wayland_libdecor/include/libdecor-0
-)

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -5,14 +5,7 @@ ExternalProject_Add(external_wayland_protocols
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
   PREFIX ${BUILD_DIR}/wayland-protocols
-  # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own WAYLAND.
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH
-                    ${MESON} --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
+  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
-
-add_dependencies(
-  external_wayland_protocols
-  external_wayland
-)

build_files/build_environment/cmake/yamlcpp.cmake

@@ -18,7 +18,6 @@ ExternalProject_Add(external_yamlcpp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
   PREFIX ${BUILD_DIR}/yamlcpp
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/yamlcpp
 )

build_files/build_environment/darwin/set_rpath.py

@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-# macOS utility to remove all rpaths and add a new one.
-
-import os
-import re
-import subprocess
-import sys
-
-# Strip version numbers from dependenciesm macOS notarizatiom fails
-# with version symlinks.
-def strip_lib_version(name):
-    name = re.sub(r'(\.[0-9]+)+.dylib', '.dylib', name)
-    name = re.sub(r'(\.[0-9]+)+.so', '.so', name)
-    name = re.sub(r'(\.[0-9]+)+.cpython', '.cpython', name)
-    return name
-
-rpath = sys.argv[1]
-file = sys.argv[2]
-
-# Find existing rpaths and delete them one by one.
-p = subprocess.run(['otool', '-l', file], capture_output=True)
-tokens = p.stdout.split()
-
-for i, token in enumerate(tokens):
-    if token == b'LC_RPATH':
-        old_rpath = tokens[i + 4]
-        subprocess.run(['install_name_tool', '-delete_rpath', old_rpath, file])
-
-subprocess.run(['install_name_tool', '-add_rpath', rpath, file])
-
-# Strip version from dependencies.
-p = subprocess.run(['otool', '-L', file], capture_output=True)
-tokens = p.stdout.split()
-for i, token in enumerate(tokens):
-    token = token.decode("utf-8")
-    if token.startswith("@rpath"):
-        new_token = strip_lib_version(token)
-        subprocess.run(['install_name_tool', '-change', token, new_token, file])
-
-# Strip version from library itself.
-new_file = strip_lib_version(file)
-new_id = '@rpath/' + os.path.basename(new_file)
-os.rename(file, new_file)
-subprocess.run(['install_name_tool', '-id', new_id, new_file])

build_files/build_environment/install_deps.sh

@@ -40,15 +40,15 @@ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-xr-openxr:,ver-
 force-all,force-python,force-boost,force-tbb,\
 force-ocio,force-imath,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
 force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,force-usd,\
-force-xr-openxr,force-level-zero,force-openpgl,\
+force-xr-openxr,force-level-zero,\
 build-all,build-python,build-boost,build-tbb,\
 build-ocio,build-imath,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
 build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-usd,\
-build-xr-openxr,build-level-zero,build-openpgl,\
+build-xr-openxr,build-level-zero,\
 skip-python,skip-boost,skip-tbb,\
 skip-ocio,skip-imath,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
 skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd,\
-skip-xr-openxr,skip-level-zero,skip-openpgl \
+skip-xr-openxr,skip-level-zero \
 -- "$@" \
 )
 
@@ -232,9 +232,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --build-level-zero=<ver>
         Force the build of OneAPI Level Zero library.
 
-    --build-openpgl
-        Force the build of OpenPGL library.
-
     Note about the --build-foo options:
         * They force the script to prefer building dependencies rather than using available packages.
           This may make things simpler and allow working around some distribution bugs, but on the other hand it will
@@ -305,9 +302,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --force-level-zero=<ver>
         Force the rebuild of OneAPI Level Zero library.
 
-    --force-openpgl
-        Force the rebuild of OpenPGL library.
-
     Note about the --force-foo options:
         * They obviously only have an effect if those libraries are built by this script
           (i.e. if there is no available and satisfactory package)!
@@ -369,10 +363,7 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
         Unconditionally skip OpenXR-SDK installation/building.
 
     --skip-level-zero=<ver>
-        Unconditionally skip OneAPI Level Zero installation/building.
-
-    --skip-openpgl
-        Unconditionally skip OpenPGL installation/building.\""
+        Unconditionally skip OneAPI Level Zero installation/building.\""
 
 # ----------------------------------------------------------------------------
 # Main Vars
@@ -394,7 +385,7 @@ CLANG_FORMAT_VERSION="10.0"
 CLANG_FORMAT_VERSION_MIN="6.0"
 CLANG_FORMAT_VERSION_MEX="14.0"
 
-PYTHON_VERSION="3.10.8"
+PYTHON_VERSION="3.10.2"
 PYTHON_VERSION_SHORT="3.10"
 PYTHON_VERSION_MIN="3.10"
 PYTHON_VERSION_MEX="3.12"
@@ -505,7 +496,7 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="2.3.20.0"
+OIIO_VERSION="2.3.13.0"
 OIIO_VERSION_SHORT="2.3"
 OIIO_VERSION_MIN="2.1.12"
 OIIO_VERSION_MEX="2.4.0"
@@ -523,8 +514,8 @@ LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.12.6.2"
-OSL_VERSION_SHORT="1.12"
+OSL_VERSION="1.11.17.0"
+OSL_VERSION_SHORT="1.11"
 OSL_VERSION_MIN="1.11"
 OSL_VERSION_MEX="2.0"
 OSL_FORCE_BUILD=false
@@ -602,14 +593,6 @@ LEVEL_ZERO_FORCE_BUILD=false
 LEVEL_ZERO_FORCE_REBUILD=false
 LEVEL_ZERO_SKIP=false
 
-OPENPGL_VERSION="0.4.1"
-OPENPGL_VERSION_SHORT="0.4"
-OPENPGL_VERSION_MIN="0.4.1"
-OPENPGL_VERSION_MEX="0.5"
-OPENPGL_FORCE_BUILD=false
-OPENPGL_FORCE_REBUILD=false
-OPENPGL_SKIP=false
-
 XR_OPENXR_VERSION="1.0.22"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
@@ -618,8 +601,8 @@ XR_OPENXR_FORCE_BUILD=false
 XR_OPENXR_FORCE_REBUILD=false
 XR_OPENXR_SKIP=false
 
-FFMPEG_VERSION="5.1.2"
-FFMPEG_VERSION_SHORT="5.1"
+FFMPEG_VERSION="5.0"
+FFMPEG_VERSION_SHORT="5.0"
 FFMPEG_VERSION_MIN="4.0"
 FFMPEG_VERSION_MEX="6.0"
 FFMPEG_FORCE_BUILD=false
@@ -844,7 +827,6 @@ while true; do
       USD_FORCE_BUILD=true
       XR_OPENXR_FORCE_BUILD=true
       LEVEL_ZERO_FORCE_BUILD=true
-      OPENPGL_FORCE_BUILD=true
       shift; continue
     ;;
     --build-python)
@@ -905,9 +887,6 @@ while true; do
     --build-level-zero)
       LEVEL_ZERO_FORCE_BUILD=true; shift; continue
     ;;
-    --build-openpgl)
-      OPENPGL_FORCE_BUILD=true; shift; continue
-    ;;
     --force-all)
       PYTHON_FORCE_REBUILD=true
       BOOST_FORCE_REBUILD=true
@@ -928,7 +907,6 @@ while true; do
       USD_FORCE_REBUILD=true
       XR_OPENXR_FORCE_REBUILD=true
       LEVEL_ZERO_FORCE_REBUILD=true
-      OPENPGL_FORCE_REBUILD=true
       shift; continue
     ;;
     --force-python)
@@ -989,9 +967,6 @@ while true; do
     --force-level-zero)
       LEVEL_ZERO_FORCE_REBUILD=true; shift; continue
     ;;
-    --force-openpgl)
-      OPENPGL_FORCE_REBUILD=true; shift; continue
-    ;;
     --skip-python)
       PYTHON_SKIP=true; shift; continue
     ;;
@@ -1049,9 +1024,6 @@ while true; do
     --skip-level-zero)
       LEVEL_ZERO_SKIP=true; shift; continue
     ;;
-    --skip-openpgl)
-      OPENPGL_SKIP=true; shift; continue
-    ;;
     --)
       # no more arguments to parse
       break
@@ -1139,7 +1111,7 @@ LLVM_SOURCE=( "$_LLVM_SOURCE_ROOT/llvm-$LLVM_VERSION.src.tar.xz" )
 LLVM_CLANG_SOURCE=( "$_LLVM_SOURCE_ROOT/clang-$LLVM_VERSION.src.tar.xz" "$_LLVM_SOURCE_ROOT/cfe-$LLVM_VERSION.src.tar.xz" )
 
 OSL_USE_REPO=false
-OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/v$OSL_VERSION.tar.gz" )
+OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" )
 #~ OSL_SOURCE_REPO=( "https://github.com/imageworks/OpenShadingLanguage.git" )
 #~ OSL_SOURCE_REPO_BRANCH="master"
 #~ OSL_SOURCE_REPO_UID="85179714e1bc69cd25ecb6bb711c1a156685d395"
@@ -1201,9 +1173,6 @@ XR_OPENXR_REPO_BRANCH="master"
 
 LEVEL_ZERO_SOURCE=("https://github.com/oneapi-src/level-zero/archive/refs/tags/v${LEVEL_ZERO_VERSION}.tar.gz")
 
-OPENPGL_USE_REPO=false
-OPENPGL_SOURCE=( "https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/v${OPENPGL_VERSION}-beta.tar.gz" )
-
 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 # C++11 is required now
@@ -1222,9 +1191,9 @@ Those libraries should be available as packages in all recent distributions (opt
     * Basics of dev environment (cmake, gcc, svn , git, ...).
     * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
-    * libwayland-client0, libdecor, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
+    * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
     * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
-    * libsdl2, libepoxy, libpugixml, libpotrace, [libgmp], fontconfig, [libharu/libhpdf].\""
+    * libsdl2, libglew, libpugixml, libpotrace, [libgmp], fontconfig, [libharu/libhpdf].\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
 
@@ -1258,8 +1227,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
     * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).
     * [Universal Scene Description $USD_VERSION] (from $USD_SOURCE).
     * [OpenXR-SDK $XR_OPENXR_VERSION] (from $XR_OPENXR_SOURCE).
-    * [OneAPI Level Zero $LEVEL_ZERO_VERSION] (from $LEVEL_ZERO_SOURCE).
-    * [OpenPGL $OPENPGL_VERSION] (from $OPENPGL_SOURCE).\""
+    * [OneAPI Level Zero $LEVEL_ZERO_VERSION] (from $LEVEL_ZERO_SOURCE).\""
 
 if [ "$DO_SHOW_DEPS" = true ]; then
   PRINT ""
@@ -1693,7 +1661,6 @@ _update_deps_tbb() {
     USD_FORCE_BUILD=true
     EMBREE_FORCE_BUILD=true
     OIDN_FORCE_BUILD=true
-    OPENPGL_FORCE_BUILD=true
   fi
   if [ "$2" = true ]; then
     OSD_FORCE_REBUILD=true
@@ -1701,7 +1668,6 @@ _update_deps_tbb() {
     USD_FORCE_REBUILD=true
     EMBREE_FORCE_REBUILD=true
     OIDN_FORCE_REBUILD=true
-    OPENPGL_FORCE_REBUILD=true
   fi
 }
 
@@ -3187,6 +3153,7 @@ compile_USD() {
     if [ -d $INST/tbb ]; then
       cmake_d="$cmake_d $cmake_d -D TBB_ROOT_DIR=$INST/tbb"
     fi
+    cmake_d="$cmake_d -DPXR_SET_INTERNAL_NAMESPACE=usdBlender"
     cmake_d="$cmake_d -DPXR_ENABLE_PYTHON_SUPPORT=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_IMAGING=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_TESTS=OFF"
@@ -3339,12 +3306,7 @@ _init_embree() {
 }
 
 _update_deps_embree() {
-  if [ "$1" = true ]; then
-    OPENPGL_FORCE_BUILD=true
-  fi
-  if [ "$2" = true ]; then
-    OPENPGL_FORCE_REBUILD=true
-  fi
+  :
 }
 
 clean_Embree() {
@@ -3363,7 +3325,7 @@ compile_Embree() {
   fi
 
   # To be changed each time we make edits that would modify the compiled results!
-  embree_magic=12
+  embree_magic=11
   _init_embree
 
   # Force having own builds for the dependencies.
@@ -4000,112 +3962,6 @@ compile_Level_Zero() {
 }
 
 
-# ----------------------------------------------------------------------------
-# Build OpenPGL
-
-_init_openpgl() {
-  _src=$SRC/openpgl-$OPENPGL_VERSION
-  _git=false
-  _inst=$INST/openpgl-$OPENPGL_VERSION_SHORT
-  _inst_shortcut=$INST/openpgl
-}
-
-_update_deps_openpgl() {
-  :
-}
-
-clean_OpenPGL() {
-  _init_openpgl
-  if [ -d $_inst ]; then
-    # Force rebuilding the dependencies if needed.
-    _update_deps_openpgl false true
-  fi
-  _clean
-}
-
-compile_OpenPGL() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenPGL will not be compiled!"
-    return
-  fi
-
-  # To be changed each time we make edits that would modify the compiled results!
-  openpgl_magic=1
-  _init_openpgl
-
-  # Force having own builds for the dependencies.
-  _update_deps_openpgl true false
-
-  # Clean install if needed!
-  magic_compile_check openpgl-$OPENPGL_VERSION $openpgl_magic
-  if [ $? -eq 1 -o "$OPENPGL_FORCE_REBUILD" = true ]; then
-    clean_OpenPGL
-  fi
-
-  if [ ! -d $_inst ]; then
-    INFO "Building OpenPGL-$OPENPGL_VERSION"
-
-    # Force rebuilding the dependencies.
-    _update_deps_openpgl true true
-
-    prepare_inst
-
-    if [ ! -d $_src ]; then
-      mkdir -p $SRC
-      download OPENPGL_SOURCE[@] "$_src.tar.gz"
-      INFO "Unpacking OpenPGL-$OPENPGL_VERSION"
-      tar -C $SRC --transform "s,(.*/?)openpgl-$OPENPGL_VERSION-beta[^/]*(.*),\1openpgl-$OPENPGL_VERSION\2,x" \
-          -xf $_src.tar.gz
-    fi
-
-    cd $_src
-
-    INFO "$_src"
-
-    # Always refresh the whole build!
-    if [ -d build ]; then
-      rm -rf build
-    fi
-    mkdir build
-    cd build
-
-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
-    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
-    cmake_d="$cmake_d -D OPENPGL_BUILD_STATIC=OFF"
-    cmake_d="$cmake_d -D OPENPGL_BUILD_PYTHON=OFF"
-    cmake_d="$cmake_d -D EMBREE_ISPC_SUPPORT=OFF"
-    if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D OPENPGL_TBB_ROOT=$INST/tbb"
-      cmake_d="$cmake_d -D TBB_ROOT=$INST/tbb"
-    fi
-
-    cmake $cmake_d ../
-
-    make -j$THREADS && make install
-    make clean
-
-    if [ ! -d $_inst ]; then
-      ERROR "OpenPGL-$OPENPGL_VERSION failed to compile, exiting"
-      exit 1
-    fi
-
-    magic_compile_set openpgl-$OPENPGL_VERSION $openpgl_magic
-
-    cd $CWD
-    INFO "Done compiling OpenPGL-$OPENPGL_VERSION!"
-  else
-    INFO "Own OpenPGL-$OPENPGL_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, use the --force-openpgl option."
-  fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
-
-  run_ldconfig "openpgl"
-}
-
-
 # ----------------------------------------------------------------------------
 # Install on DEB-like
 
@@ -4204,12 +4060,11 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
-             libwayland-dev libdecor-0-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
+             libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
-             libopenal-dev libepoxy-dev yasm \
+             libopenal-dev libglew-dev yasm \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
-             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev libpystring-dev \
-             libglfw3-dev"
+             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev libpystring-dev"
 
   VORBIS_USE=true
   OGG_USE=true
@@ -4739,18 +4594,6 @@ install_DEB() {
     PRINT ""
     compile_Level_Zero
   fi
-
-  PRINT ""
-  if [ "$OPENPGL_SKIP" = true ]; then
-    WARNING "Skipping OpenPGL installation, as requested..."
-  elif [ "$OPENPGL_FORCE_BUILD" = true ]; then
-    INFO "Forced OpenPGL building, as requested..."
-    compile_OpenPGL
-  else
-    # No package currently!
-    PRINT ""
-    compile_OpenPGL
-  fi
 }
 
 
@@ -4927,9 +4770,9 @@ install_RPM() {
   _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
              libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
-             wayland-devel libdecor-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
+             wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
-             libepoxy-devel yasm patch \
+             glew-devel yasm patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \
              gmp-devel pugixml-devel potrace-devel libharu-devel libzstd-devel pystring-devel"
 
@@ -5458,18 +5301,6 @@ install_RPM() {
     PRINT ""
     compile_Level_Zero
   fi
-
-  PRINT ""
-  if [ "$OPENPGL_SKIP" = true ]; then
-    WARNING "Skipping OpenPGL installation, as requested..."
-  elif [ "$OPENPGL_FORCE_BUILD" = true ]; then
-    INFO "Forced OpenPGL building, as requested..."
-    compile_OpenPGL
-  else
-    # No package currently!
-    PRINT ""
-    compile_OpenPGL
-  fi
 }
 
 
@@ -5581,7 +5412,7 @@ install_ARCH() {
   fi
 
   _packages="$BASE_DEVEL git cmake fontconfig flex \
-             libxi libxcursor libxrandr libxinerama libepoxy libdecor libpng libtiff wget openal \
+             libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
              $OPENJPEG_DEV yasm sdl2 fftw \
              libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu \
              zstd pystring"
@@ -6066,18 +5897,6 @@ install_ARCH() {
     PRINT ""
     compile_Level_Zero
   fi
-
-  PRINT ""
-  if [ "$OPENPGL_SKIP" = true ]; then
-    WARNING "Skipping OpenPGL installation, as requested..."
-  elif [ "$OPENPGL_FORCE_BUILD" = true ]; then
-    INFO "Forced OpenPGL building, as requested..."
-    compile_OpenPGL
-  else
-    # No package currently!
-    PRINT ""
-    compile_OpenPGL
-  fi
 }
 
 
@@ -6260,14 +6079,6 @@ install_OTHER() {
     INFO "Forced Level Zero building, as requested..."
     compile_Level_Zero
   fi
-
-  PRINT ""
-  if [ "$OPENPGL_SKIP" = true ]; then
-    WARNING "Skipping OpenPGL installation, as requested..."
-  elif [ "$OPENPGL_FORCE_BUILD" = true ]; then
-    INFO "Forced OpenPGL building, as requested..."
-    compile_OpenPGL
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -6285,7 +6096,7 @@ print_info() {
   _buildargs="-U *SNDFILE* -U PYTHON* -U *BOOST* -U *Boost* -U *TBB*"
   _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CLANG* -U *CYCLES*"
   _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB*  -U *BLOSC* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC* -U *USD*"
-  _buildargs="$_buildargs -U *EMBREE* -U *OPENIMAGEDENOISE* -U *OPENXR* -U *OPENPGL*"
+  _buildargs="$_buildargs -U *EMBREE* -U *OPENIMAGEDENOISE* -U *OPENXR*"
 
   _1="-D WITH_CODEC_SNDFILE=ON"
   PRINT "  $_1"
@@ -6516,16 +6327,6 @@ print_info() {
     #~ fi
   #~ fi
 
-  if [ "$OPENPGL_SKIP" = false ]; then
-    if [ -d $INST/openpgl ]; then
-      _1="-D openpgl_DIR=$INST/openpgl/lib/cmake/openpgl-$OPENPGL_VERSION"
-      _2="-D WITH_CYCLES_PATH_GUIDING=ON"
-      PRINT "  $_1"
-      PRINT "  $_2"
-      _buildargs="$_buildargs $_1 $_2"
-    fi
-  fi
-
   PRINT ""
   PRINT "Or even simpler, just run (in your blender-source dir):"
   PRINT "  make -j$THREADS BUILD_CMAKE_ARGS=\"$_buildargs\""

build_files/build_environment/linux/linux-centos7-setup.sh

@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# This script is part of the official build environment, see WIKI page for details.
-# https://wiki.blender.org/wiki/Building_Blender/Other/CentOS7ReleaseEnvironment
-
-set -e
-
-if [ `id -u` -ne 0 ]; then
-   echo "This script must be run as root"
-   exit 1
-fi
-
-# yum-config-manager does not come in the default minimal install,
-# so make sure it is installed and available.
-yum -y update
-yum -y install yum-utils
-
-# Install all the packages needed for a new toolchain.
-#
-# NOTE: Keep this separate from the packages install, since otherwise
-# older toolchain will be installed.
-yum -y update
-yum -y install epel-release
-yum -y install centos-release-scl
-yum -y install devtoolset-9
-
-# Install packages needed for Blender's dependencies.
-PACKAGES_FOR_LIBS=(
-    # Used to checkout Blender's code.
-    git
-    # Used to checkout Blender's `../lib/` directory.
-    subversion
-    # Used to extract packages.
-    bzip2
-    # Used to extract packages.
-    tar
-    # Blender and some dependencies use `cmake`.
-    cmake3
-    # Apply patches from Blender's: `./build_files/build_environment/patches`
-    patch
-    # Use by `cmake` and `autoconf`.
-    make
-
-    # Required by: `external_nasm` which uses an `autoconf` build-system.
-    autoconf
-    automake
-    libtool
-
-    # Meta-build system used by various packages.
-    meson
-    # Builds generated by meson use Ninja for the actual build.
-    ninja-build
-
-    # Required by Blender build option: `WITH_GHOST_X11`.
-    libXrandr-devel
-    libXinerama-devel
-    libXcursor-devel
-    libXi-devel
-    libX11-devel
-    libXt-devel
-
-    # Required by Blender build option: `WITH_GHOST_WAYLAND`.
-    mesa-libEGL-devel
-    # Required by: Blender & `external_opensubdiv` (probably others).
-    mesa-libGL-devel
-    mesa-libGLU-devel
-
-    # Required by: `external_ispc`.
-    zlib-devel
-    # TODO: dependencies build without this, consider removal.
-    rubygem-asciidoctor
-    # TODO: dependencies build without this, consider removal.
-    wget
-    # Required by: `external_sqlite` as a build-time dependency (needed for the `tclsh` command).
-    tcl
-    # Required by: `external_aom`.
-    # TODO: Blender is already building `external_nasm` which is listed as an alternative to `yasm`.
-    # Why are both needed?
-    yasm
-
-    # Required by: `meson` (Python based build system).
-    python36
-    # Required by: `mako` (Python module used for building `external_mesa`)
-    python-setuptools
-
-    # Required by: `external_igc` & `external_osl` as a build-time dependency.
-    bison
-    # Required by: `external_osl` as a build-time dependency.
-    flex
-    # TODO: dependencies build without this, consider removal.
-    ncurses-devel
-)
-
-# Additional packages needed for building Blender.
-PACKAGES_FOR_BLENDER=(
-    # Required by Blender build option: `WITH_GHOST_WAYLAND`.
-    libxkbcommon-devel
-)
-
-yum -y install -y ${PACKAGES_FOR_LIBS[@]} ${PACKAGES_FOR_BLENDER[@]}
-
-# Dependencies for Mesa
-yum -y install expat-devel
-python3 -m pip install mako
-
-# Dependencies for pip (needed for buildbot-worker).
-yum -y install python36-pip python36-devel
-
-# Dependencies for asound.
-yum -y install -y  \
-    alsa-lib-devel pulseaudio-libs-devel
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake  \
-    --family cmake
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest3  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack3  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3  \
-    --family cmake
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest3  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack3  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3  \
-    --family cmake

build_files/build_environment/patches/boost.diff

@@ -1,12 +0,0 @@
---- a/boost/python//detail/wrap_python.hpp	2022-12-09 19:16:17
-+++ b/boost/python//detail/wrap_python.hpp	2022-12-09 19:18:08
-@@ -206,7 +206,8 @@
- 
- #ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
- # undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
--# define _DEBUG
-+// BLENDER: TBB excepts this to have a value.
-+# define _DEBUG 1
- # ifdef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
- #  undef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
- #  undef _CRT_NOFORCE_MANIFEST

build_files/build_environment/patches/boost.user.jam.in

@@ -1,4 +1,4 @@
 using python : @PYTHON_SHORT_VERSION@ : @PYTHON_BINARY@
- : @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@/ 
+ : @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@m/ 
  : @LIBDIR@/python/libs  
 ;

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

@@ -177,8 +177,7 @@ if(ILMBASE_INCLUDE_DIR)
              "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
       set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
     else()
-      # Old versions (before 2.0?) do not have any version string,
-      # just assuming 2.0 should be fine though.
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
       message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
       set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
     endif()
@@ -196,13 +195,8 @@ 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}
-  # )
+#   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()
 
 

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

@@ -175,8 +175,7 @@ if(OPENEXR_INCLUDE_DIR)
              "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
       set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
     else()
-      # Old versions (before 2.0?) do not have any version string,
-      # just assuming 2.0 should be fine though.
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
       message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
       set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
     endif()

build_files/build_environment/patches/cmakelists_glew.txt

@@ -0,0 +1,2 @@
+cmake_minimum_required (VERSION 2.4)
+add_subdirectory(build/cmake)

build_files/build_environment/patches/epoxy.diff

@@ -1,19 +0,0 @@
---- a/src/dispatch_wgl.c	2022-08-04 17:45:13.144924705 +0200
-+++ b/src/dispatch_wgl.c	2022-08-04 17:45:47.657482971 +0200
-@@ -78,6 +78,8 @@
-     if (!first_context_current) {
-         first_context_current = true;
-     } else {
-+      /* BLENDER: disable slow dispatch table switching. */
-+#if 0
-         if (!already_switched_to_dispatch_table) {
-             already_switched_to_dispatch_table = true;
-             gl_switch_to_dispatch_table();
-@@ -86,6 +88,7 @@
- 
-         gl_init_dispatch_table();
-         wgl_init_dispatch_table();
-+#endif
-     }
- }
- 

build_files/build_environment/patches/materialx.diff

@@ -1,13 +0,0 @@
-diff -Naur orig/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake external_materialx/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake
---- orig/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake      2022-11-04 14:23:29 -0600
-+++ external_materialx/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake        2022-11-08 11:58:45 -0700
-@@ -181,6 +181,9 @@
- string(REGEX REPLACE "\\\\" "/" PYTHON_SITE_PACKAGES "${PYTHON_SITE_PACKAGES}")
-
- if(CMAKE_HOST_WIN32)
-+  if(PYTHON_EXECUTABLE MATCHES "_d.exe$")
-+    set(PYTHON_LIBRARY_SUFFIX ${PYTHON_LIBRARY_SUFFIX}_d)
-+  endif()
-   set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
-
-   # when run in a venv, PYTHON_PREFIX points to it. But the libraries remain in the

build_files/build_environment/patches/opencollada.diff

@@ -3,19 +3,19 @@ index 95abbe2..4f14f30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
- endif()
- 
- #adding PCRE
--find_package(PCRE)
-+#find_package(PCRE)
- if (PCRE_FOUND)
- 	message(STATUS "SUCCESSFUL: PCRE found")
- else ()  # if pcre not found building its local copy from ./Externals
--	if (WIN32 OR APPLE)
-+	if (1)
- 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
- 		add_definitions(-DPCRE_STATIC)
- 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
+ endif()
+ 
+ #adding PCRE
+-find_package(PCRE)
++#find_package(PCRE)
+ if (PCRE_FOUND)
+ 	message(STATUS "SUCCESSFUL: PCRE found")
+ else ()  # if pcre not found building its local copy from ./Externals
+-	if (WIN32 OR APPLE)
++	if (1)
+ 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
+ 		add_definitions(-DPCRE_STATIC)
+ 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
 diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
 index 03ad540..f7d05cf 100644
 --- a/DAEValidator/CMakeLists.txt
@@ -66,13 +66,13 @@ index 40081e7..e1d1bfa 100644
 --- a/Externals/LibXML/CMakeLists.txt
 +++ b/Externals/LibXML/CMakeLists.txt
 @@ -9,6 +9,7 @@ add_definitions(
- 		-DLIBXML_SCHEMAS_ENABLED
- 		-DLIBXML_XPATH_ENABLED
- 		-DLIBXML_TREE_ENABLED
-+		-DLIBXML_STATIC
- 	)
- 	
- if(USE_STATIC_MSVC_RUNTIME)
+ 		-DLIBXML_SCHEMAS_ENABLED
+ 		-DLIBXML_XPATH_ENABLED
+ 		-DLIBXML_TREE_ENABLED
++		-DLIBXML_STATIC
+ 	)
+ 	
+ if(USE_STATIC_MSVC_RUNTIME)
 diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
 index 1f9a3ee..d151e9a 100644
 --- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
@@ -155,15 +155,3 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  
  # Library export
  install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake)
-diff -Naur OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h
---- OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h	2018-11-26 14:43:10 -0700
-+++ external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h	2022-08-19 11:36:04 -0600
-@@ -23,7 +23,7 @@
- #	include <tr1/unordered_map>
- #endif
- 
--#ifdef _LIBCPP_VERSION
-+#if defined(_LIBCPP_VERSION) || defined(WIN32)
- // If we're compiling with libc++, create a namespace alias for tr1 that points to std.
- // Not particularly elegant, and largely should be filed under "hack", but it works for OS X with clang for now.
- namespace std {

build_files/build_environment/patches/openimageio.diff

@@ -21,3 +21,16 @@ diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler
  endif (MSVC)
  
  if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
+diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h
+--- orig/src/include/OpenImageIO/platform.h	2020-05-10 21:43:52 -0600
++++ external_openimageio/src/include/OpenImageIO/platform.h	2020-05-13 17:04:36 -0600
+@@ -41,6 +41,9 @@
+ #    ifndef NOMINMAX
+ #        define NOMINMAX
+ #    endif
++#    ifndef NOGDI
++#        define NOGDI
++#    endif
+ #    include <windows.h>
+ #endif
+ 

build_files/build_environment/patches/openvdb.diff

@@ -1,6 +1,30 @@
+diff -ur openvdb-9.0.0/cmake/FindTBB.cmake openvdb/cmake/FindTBB.cmake
+--- openvdb-9.0.0/cmake/FindTBB.cmake	2021-10-30 03:55:40.000000000 +0100
++++ openvdb/cmake/FindTBB.cmake	2022-03-31 11:33:15.592329750 +0100
+@@ -252,7 +252,8 @@
+       set(_TBB_LIB_NAME "${_TBB_LIB_NAME}${TBB_DEBUG_SUFFIX}")
+     endif()
+ 
+-    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE} ${_TBB_LIB_NAME}
++    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE}
++      NAMES ${_TBB_LIB_NAME} ${_TBB_LIB_NAME}_static
+       ${_FIND_TBB_ADDITIONAL_OPTIONS}
+       PATHS ${_TBB_LIBRARYDIR_SEARCH_DIRS}
+       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib64 lib
 diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/CMakeLists.txt
 --- openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt	2020-12-24 10:13:14 -0700
 +++ openvdb/openvdb/openvdb/CMakeLists.txt	2021-02-05 11:18:33 -0700
+@@ -107,7 +107,9 @@
+   #        http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
+   #        https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
+   set(BUILD_SHARED_LIBS ON)
+-  set(Boost_USE_STATIC_LIBS OFF)
++  if(NOT WIN32) # blender links boost statically on windows
++    set(Boost_USE_STATIC_LIBS OFF)
++  endif()
+ endif()
+ 
+ find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
 @@ -146,6 +148,7 @@
          Boost::disable_autolinking  # add -DBOOST_ALL_NO_LIB
        )
@@ -75,18 +99,321 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/v
 +
 +    END
 +END
-diff -Naur orig/openvdb/openvdb/tree/ValueAccessor.h openvdb/openvdb/openvdb/tree/ValueAccessor.h
---- orig/openvdb/openvdb/tree/ValueAccessor.h	2022-11-02 13:58:26 -0600
-+++ openvdb/openvdb/openvdb/tree/ValueAccessor.h	2022-11-02 18:55:09 -0600
-@@ -872,7 +872,10 @@
-     using LeafNodeType = typename NodeType::LeafNodeType;
-     using CoordLimits = std::numeric_limits<Int32>;
+diff --git a/nanovdb/nanovdb/NanoVDB.h b/nanovdb/nanovdb/NanoVDB.h
+index cc2e54b77..703d2eabc 100644
+--- a/nanovdb/nanovdb/NanoVDB.h
++++ b/nanovdb/nanovdb/NanoVDB.h
+@@ -161,8 +161,8 @@ typedef unsigned long long uint64_t;
  
--    static_assert(std::is_same<NodeType, LeafNodeType>::value);
-+    // Blender: Technically not an issue in OpenVDB, but USD 21.11 still builds 
-+    // as C++14 which does not support terse asserts yet. Add a message to 
-+    // explicitly select the C++14 supported static assert.
-+    static_assert(std::is_same<NodeType, LeafNodeType>::value, "cache item node type is not leaf node type");
+ #endif // __CUDACC_RTC__
  
-     CacheItem(TreeCacheT& parent)
-         : mParent(&parent)
+-#ifdef __CUDACC__
+-// Only define __hostdev__ when using NVIDIA CUDA compiler
++#if defined(__CUDACC__) || defined(__HIP__)
++// Only define __hostdev__ when using NVIDIA CUDA or HIP compiler
+ #define __hostdev__ __host__ __device__
+ #else
+ #define __hostdev__
+@@ -611,7 +611,7 @@ struct Delta<double>
+ /// Maximum floating-point values
+ template<typename T>
+ struct Maximum;
+-#ifdef __CUDA_ARCH__
++#if defined(__CUDA_ARCH__) || defined(__HIP__)
+ template<>
+ struct Maximum<int>
+ {
+@@ -1176,10 +1176,10 @@ using Vec3f = Vec3<float>;
+ using Vec3i = Vec3<int>;
+ 
+ /// @brief Return a single precision floating-point vector of this coordinate
+-Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
++__hostdev__ inline Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
+ 
+ /// @brief Return a double precision floating-point vector of this coordinate
+-Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
++__hostdev__ inline Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
+ 
+ // ----------------------------> Vec4 <--------------------------------------
+ 
+@@ -2042,7 +2042,7 @@ struct Map
+ }; // Map
+ 
+ template<typename Mat4T>
+-void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
++__hostdev__ void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
+ {
+     float * mf = mMatF, *vf = mVecF;
+     float*  mif = mInvMatF;
+@@ -2486,7 +2486,7 @@ class Grid : private GridData
+ }; // Class Grid
+ 
+ template<typename TreeT>
+-int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
++__hostdev__ int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
+ {
+     for (uint32_t i = 0, n = this->blindDataCount(); i < n; ++i)
+         if (this->blindMetaData(i).mSemantic == semantic)
+@@ -2671,7 +2671,7 @@ class Tree : private TreeData<RootT::LEVEL>
+ }; // Tree class
+ 
+ template<typename RootT>
+-void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
++__hostdev__ void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
+ {
+     min = this->root().minimum();
+     max = this->root().maximum();
+@@ -3880,7 +3880,7 @@ class LeafNode : private LeafData<BuildT, CoordT, MaskT, Log2Dim>
+ }; // LeafNode class
+ 
+ template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
+-inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
++__hostdev__ inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
+ {
+     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
+     if (!this->isActive()) return;
+diff --git a/nanovdb/nanovdb/util/SampleFromVoxels.h b/nanovdb/nanovdb/util/SampleFromVoxels.h
+index 852123dac..e779d66cf 100644
+--- a/nanovdb/nanovdb/util/SampleFromVoxels.h
++++ b/nanovdb/nanovdb/util/SampleFromVoxels.h
+@@ -22,7 +22,7 @@
+ #define NANOVDB_SAMPLE_FROM_VOXELS_H_HAS_BEEN_INCLUDED
+ 
+ // Only define __hostdev__ when compiling as NVIDIA CUDA
+-#ifdef __CUDACC__
++#if defined(__CUDACC__) || defined(__HIP__)
+ #define __hostdev__ __host__ __device__
+ #else
+ #include <cmath> // for floor
+@@ -136,7 +136,7 @@ class SampleFromVoxels<TreeOrAccT, 0, false>
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
+ {
+     const CoordT ijk = Round<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -147,7 +147,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
+ {
+     if (ijk != mPos) {
+         mPos = ijk;
+@@ -158,7 +158,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
+ {
+     return mAcc.getValue(Round<CoordT>(xyz));
+ }
+@@ -195,7 +195,7 @@ class TrilinearSampler
+ }; // TrilinearSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
++__hostdev__ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
+ {
+     v[0][0][0] = mAcc.getValue(ijk); // i, j, k
+ 
+@@ -224,7 +224,7 @@ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) co
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+ #if 0
+   auto lerp = [](ValueT a, ValueT b, ValueT w){ return fma(w, b-a, a); };// = w*(b-a) + a
+@@ -239,7 +239,7 @@ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
+ #if 0
+@@ -270,7 +270,7 @@ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(con
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
++__hostdev__ bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -363,21 +363,21 @@ class SampleFromVoxels<TreeOrAccT, 1, true> : public TrilinearSampler<TreeOrAccT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[0][0][0] : BaseT::mAcc.getValue(ijk);
+ }
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::gradient(xyz, mVal);
+@@ -393,7 +393,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, true>::zeroCrossing(Vec3T<RealT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -406,7 +406,7 @@ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -418,7 +418,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     auto lerp = [](ValueT a, ValueT b, RealT w) { return a + ValueT(w) * (b - a); };
+ 
+@@ -463,7 +463,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
++__hostdev__ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -473,7 +473,7 @@ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, fal
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -510,7 +510,7 @@ class TriquadraticSampler
+ }; // TriquadraticSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
++__hostdev__ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
+ {
+     CoordT p(ijk[0] - 1, 0, 0);
+     for (int dx = 0; dx < 3; ++dx, ++p[0]) {
+@@ -526,7 +526,7 @@ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
++__hostdev__ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
+ {
+     auto kernel = [](const ValueT* value, double weight)->ValueT {
+         return weight * (weight * (0.5f * (value[0] + value[2]) - value[1]) +
+@@ -545,7 +545,7 @@ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
++__hostdev__ bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -624,14 +624,14 @@ class SampleFromVoxels<TreeOrAccT, 2, true> : public TriquadraticSampler<TreeOrA
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[1][1][1] : BaseT::mAcc.getValue(ijk);
+ }
+@@ -646,7 +646,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, true>::zeroCrossing(Vec3T<RealT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -657,7 +657,7 @@ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -667,7 +667,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -710,7 +710,7 @@ class TricubicSampler
+ }; // TricubicSampler
+ 
+ template<typename TreeOrAccT>
+-void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
++__hostdev__ void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
+ {
+     auto fetch = [&](int i, int j, int k) -> ValueT& { return C[((i + 1) << 4) + ((j + 1) << 2) + k + 1]; };
+ 
+@@ -929,7 +929,7 @@ class SampleFromVoxels<TreeOrAccT, 3, true> : public TricubicSampler<TreeOrAccT>
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mC);
+@@ -937,7 +937,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+

build_files/build_environment/patches/osl.diff

@@ -1,8 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d527232..5ad6eaa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,6 +99,11 @@ set (OSL_PTX_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/ptx"
+diff -Naur OpenShadingLanguage-1.12.6.2/CMakeLists.txt external_osl/CMakeLists.txt
+--- OpenShadingLanguage-1.12.6.2/CMakeLists.txt	2022-09-30 17:43:53 -0600
++++ external_osl/CMakeLists.txt	2022-10-15 14:49:26 -0600
+@@ -101,6 +101,11 @@
       CACHE STRING "Directory where OptiX PTX files will be installed")
  set (CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library naming postfix for Debug builds (e.g., '_debug')")
  
@@ -14,11 +13,10 @@ index d527232..5ad6eaa 100644
  
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index a7e098b..dad11d0 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -77,6 +77,7 @@ link_directories ("${Boost_LIBRARY_DIRS}")
+diff -Naur OpenShadingLanguage-1.12.6.2/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
+--- OpenShadingLanguage-1.12.6.2/src/cmake/externalpackages.cmake	2022-09-30 17:43:53 -0600
++++ external_osl/src/cmake/externalpackages.cmake	2022-10-15 14:49:26 -0600
+@@ -77,6 +77,7 @@
  
  
  checked_find_package (ZLIB REQUIRED)  # Needed by several packages
@@ -26,10 +24,29 @@ index a7e098b..dad11d0 100644
  
  # IlmBase & OpenEXR
  checked_find_package (OpenEXR REQUIRED
-diff --git a/src/liboslcomp/oslcomp.cpp b/src/liboslcomp/oslcomp.cpp
-index 8c2e77b..211b8a7 100644
---- a/src/liboslcomp/oslcomp.cpp
-+++ b/src/liboslcomp/oslcomp.cpp
+diff -Naur OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
+--- OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h	2022-09-30 17:43:53 -0600
++++ external_osl/src/include/OSL/llvm_util.h	2022-10-15 15:37:24 -0600
+@@ -9,6 +9,8 @@
+ #include <unordered_set>
+ #include <vector>
+ 
++#define OSL_HAS_BLENDER_CLEANUP_FIX
++
+ #ifdef LLVM_NAMESPACE
+ namespace llvm = LLVM_NAMESPACE;
+ #endif
+@@ -101,6 +103,6 @@
+         ScopedJitMemoryUser();
+         ~ScopedJitMemoryUser();
+     };
+-
++    static void Cleanup ();
+     /// Set debug level
+     void debug(int d) { m_debug = d; }
+diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
+--- OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp	2022-09-30 17:43:53 -0600
++++ external_osl/src/liboslcomp/oslcomp.cpp	2022-10-15 14:49:26 -0600
 @@ -21,6 +21,13 @@
  #if !defined(__STDC_CONSTANT_MACROS)
  #    define __STDC_CONSTANT_MACROS 1
@@ -44,34 +61,20 @@ index 8c2e77b..211b8a7 100644
  #include <clang/Basic/TargetInfo.h>
  #include <clang/Frontend/CompilerInstance.h>
  #include <clang/Frontend/TextDiagnosticPrinter.h>
-diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp
-index 8f52546..8c2d0c7 100644
---- a/src/liboslexec/llvm_instance.cpp
-+++ b/src/liboslexec/llvm_instance.cpp
-@@ -1363,6 +1363,10 @@ BackendLLVM::run()
- #ifdef OSL_LLVM_NO_BITCODE
-         OSL_ASSERT(!use_rs_bitcode());
-         ll.module(ll.new_module("llvm_ops"));
-+        if (use_optix()) {
-+            ll.module()->setDataLayout("e-i64:64-i128:128-v16:16-v32:32-n16:32:64");
-+            ll.module()->setTargetTriple("nvptx64-nvidia-cuda");
-+        }
- #else
-         if (!use_optix()) {
-             if (use_rs_bitcode()) {
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 46e4529..8e86486 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -2121,6 +2121,11 @@ ShadingSystemImpl::getattribute(ShaderGroup* group, string_view name,
-         return true;
-     }
- 
-+    if (name == "groupdata_size" && type == TypeDesc::TypeInt) {
-+        *(int*)val = (int)group->m_llvm_groupdata_size;
-+        return true;
-+    }
-+
-     return false;
+diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp external_osl/src/liboslexec/llvm_util.cpp
+--- OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp	2022-09-30 17:43:53 -0600
++++ external_osl/src/liboslexec/llvm_util.cpp	2022-10-15 15:53:11 -0600
+@@ -182,6 +180,13 @@
+     ++jit_mem_hold_users;
  }
  
++void
++LLVM_Util::Cleanup()
++{
++    if (jitmm_hold)
++        jitmm_hold->clear();
++}
++
+ 
+ LLVM_Util::ScopedJitMemoryUser::~ScopedJitMemoryUser()
+ {

build_files/build_environment/patches/python_unix.diff

@@ -36,39 +36,3 @@ index a97a755..07ce853 100644
                  if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
                      ffi_lib = lib_name
                      break
---- a/Modules/posixmodule.c	2022-12-09 21:44:03
-+++ b/Modules/posixmodule.c	2022-12-09 21:39:46
-@@ -10564,10 +10564,15 @@
-         Py_BEGIN_ALLOW_THREADS
- #ifdef HAVE_MKFIFOAT
-         if (dir_fd != DEFAULT_DIR_FD) {
-+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
-+// https://github.com/python/cpython/issues/97897
-+#ifndef __APPLE__
-             if (HAVE_MKFIFOAT_RUNTIME) {
-                 result = mkfifoat(dir_fd, path->narrow, mode);
- 
-+            } else
-+#endif
-+            {
--            } else {
-                 mkfifoat_unavailable = 1;
-                 result = 0;
-             }
-@@ -10638,10 +10633,15 @@
-         Py_BEGIN_ALLOW_THREADS
- #ifdef HAVE_MKNODAT
-         if (dir_fd != DEFAULT_DIR_FD) {
-+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
-+// https://github.com/python/cpython/issues/97897
-+#ifndef __APPLE__
-             if (HAVE_MKNODAT_RUNTIME) {
-                 result = mknodat(dir_fd, path->narrow, mode, device);
- 
-+            } else
-+#endif
-+            {
--            } else {
-                 mknodat_unavailable = 1;
-                 result = 0;
-             }

build_files/build_environment/patches/python_windows.diff

@@ -1,22 +0,0 @@
---- a/PCbuild/prepare_ssl.bat	2022-10-30 11:48:14 -0600
-+++ b/PCbuild/prepare_ssl.bat	2022-10-30 11:53:16 -0600
-@@ -47,12 +47,13 @@
- if "%PERL%" == "" where perl > "%TEMP%\perl.loc" 2> nul && set /P PERL= <"%TEMP%\perl.loc" & del "%TEMP%\perl.loc"
- if "%PERL%" == "" (echo Cannot locate perl.exe on PATH or as PERL variable & exit /b 4)
- 
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
--if errorlevel 1 exit /b
-+REM Blender: we only need x64, ssl is kind of a long build, so just build what we need
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
-+REM if errorlevel 1 exit /b
- %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=x64
- if errorlevel 1 exit /b
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
--if errorlevel 1 exit /b
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
--if errorlevel 1 exit /b
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
-+REM if errorlevel 1 exit /b
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
-+REM if errorlevel 1 exit /b
- 

build_files/build_environment/patches/sdl.diff

@@ -30,19 +30,3 @@ diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c
      if (SDL_strcmp(_this->name, "cocoa") == 0) {  /* don't do this for X11, etc */
          if (Cocoa_IsWindowInFullscreenSpace(window)) {
              return SDL_FALSE;
---- CMakeLists.txt	2022-12-09 20:40:00
-+++ CMakeLists.txt	2022-12-09 20:40:00
-@@ -526,6 +526,13 @@
-     list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
-   endif()
- 
-+  # BLENDER: make libs compatible with older Xcode.
-+  # https://github.com/KhronosGroup/MoltenVK/issues/1756
-+  check_c_compiler_flag(-fno-objc-msgsend-selector-stubs HAVE_GCC_NO_OBJC_MSGSEND_SELECTOR_STUBS)
-+  if(HAVE_GCC_NO_OBJC_MSGSEND_SELECTOR_STUBS)
-+    list(APPEND EXTRA_CFLAGS "-fno-objc-msgsend-selector-stubs")
-+  endif()
-+
-   check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
-   if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
-     check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)

build_files/build_environment/patches/usd.diff

@@ -1,7 +1,7 @@
-diff -Naur orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
---- orig/cmake/defaults/Packages.cmake	2022-10-27 12:56:33 -0600
-+++ external_usd/cmake/defaults/Packages.cmake	2022-10-27 13:05:08 -0600
-@@ -129,7 +129,7 @@
+diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
+--- usd.orig/cmake/defaults/Packages.cmake	2019-10-24 22:39:53.000000000 +0200
++++ external_usd/cmake/defaults/Packages.cmake	2019-11-28 13:00:33.185957483 +0100
+@@ -64,7 +64,7 @@
  endif()
  
  # --TBB
@@ -10,9 +10,10 @@ diff -Naur orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packag
  add_definitions(${TBB_DEFINITIONS})
  
  # --math
-diff -Naur orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
---- orig/cmake/defaults/msvcdefaults.cmake	2022-10-27 12:56:33 -0600
-+++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-10-27 13:05:08 -0600
+
+diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
+--- usd_orig/cmake/defaults/msvcdefaults.cmake	2022-02-18 14:49:09 -0700
++++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-03-14 11:41:50 -0600
 @@ -120,9 +120,6 @@
  # for all translation units.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
@@ -23,10 +24,38 @@ diff -Naur orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/ms
  # Enable multiprocessor builds.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")
-diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
---- orig/pxr/base/arch/timing.h	2022-10-27 12:56:34 -0600
-+++ external_usd/pxr/base/arch/timing.h	2022-10-27 13:05:08 -0600
-@@ -84,6 +84,10 @@
+
+diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
+--- a/pxr/base/work/singularTask.h
++++ b/pxr/base/work/singularTask.h
+@@ -120,7 +120,7 @@
+                     // case we go again to ensure the task can do whatever it
+                     // was awakened to do.  Once we successfully take the count
+                     // to zero, we stop.
+-                    size_t old = count;
++                    std::size_t old = count;
+                     do { _fn(); } while (
+                         !count.compare_exchange_strong(old, 0));
+                 });
+
+diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h
+--- a/pxr/usd/sdr/shaderMetadataHelpers.h
++++ b/pxr/usd/sdr/shaderMetadataHelpers.h
+@@ -32,6 +32,8 @@
+ #include "pxr/base/tf/token.h"
+ #include "pxr/usd/sdr/declare.h"
+ 
++#include <limits>
++
+ PXR_NAMESPACE_OPEN_SCOPE
+ 
+ /// \namespace ShaderMetadataHelpers
+
+diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
+index 517561f..fda5a1f 100644
+--- a/pxr/base/arch/timing.h
++++ b/pxr/base/arch/timing.h
+@@ -91,6 +91,10 @@ ArchGetTickTime()
  inline uint64_t
  ArchGetStartTickTime()
  {
@@ -37,7 +66,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -116,6 +120,7 @@
+@@ -123,6 +127,7 @@ ArchGetStartTickTime()
  #error "Unsupported architecture."
  #endif
    return t;
@@ -45,7 +74,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
  }
  
  /// Get a "stop" tick time for measuring an interval of time.  See
-@@ -125,6 +130,10 @@
+@@ -132,6 +137,10 @@ ArchGetStartTickTime()
  inline uint64_t
  ArchGetStopTickTime()
  {
@@ -56,7 +85,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -155,11 +164,11 @@
+@@ -162,11 +171,11 @@ ArchGetStopTickTime()
  #error "Unsupported architecture."
  #endif
    return t;
@@ -71,46 +100,3 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
  
  /// A simple timer class for measuring an interval of time using the
  /// ArchTickTimer facilities.
-diff -Naur orig/pxr/imaging/hioOpenVDB/CMakeLists.txt external_usd/pxr/imaging/hioOpenVDB/CMakeLists.txt
---- orig/pxr/imaging/hioOpenVDB/CMakeLists.txt	2022-10-27 12:56:35 -0600
-+++ external_usd/pxr/imaging/hioOpenVDB/CMakeLists.txt	2022-10-27 13:05:08 -0600
-@@ -20,6 +20,12 @@
-     LIST(APPEND __VDB_IMATH_LIBS ${OPENEXR_Half_LIBRARY})
- endif()
- 
-+if (WIN32)
-+    # OpenVDB uses constants from <cmath> that aren't available on
-+    # Windows unless this is defined.
-+    add_definitions(-D_USE_MATH_DEFINES)
-+endif()
-+
- pxr_library(hioOpenVDB
-     LIBRARIES
-         ar
-diff -Naur orig/pxr/usdImaging/CMakeLists.txt external_usd/pxr/usdImaging/CMakeLists.txt
---- orig/pxr/usdImaging/CMakeLists.txt	2022-10-27 12:56:37 -0600
-+++ external_usd/pxr/usdImaging/CMakeLists.txt	2022-10-27 13:05:08 -0600
-@@ -7,7 +7,7 @@
-     usdVolImaging
-     usdAppUtils
-     usdviewq
--    bin
-+#    bin
-     plugin
- )
- 
-diff -Naur orig/cmake/macros/Private.cmake external_usd/cmake/macros/Private.cmake
---- orig/cmake/macros/Private.cmake     2022-02-18 14:49:09 -0700
-+++ external_usd/cmake/macros/Private.cmake     2022-08-05 10:42:03 -0600
-@@ -900,8 +900,10 @@
-         return()
-     endif()
-
--    if (WIN32 AND PXR_USE_DEBUG_PYTHON)
-+    if (WIN32 AND PXR_USE_DEBUG_PYTHON AND NOT CMAKE_DEBUG_POSTFIX)
-         # On Windows when compiling with debug python the library must be named with _d.
-+        # Blender: but this can be skipped if CMAKE_DEBUG_POSTFIX is set, it knows
-+        # what it is doing and we don't want libraries ending in _d_d.pyd 
-         set(LIBRARY_NAME "_${NAME}_d")
-     else()
-         set(LIBRARY_NAME "_${NAME}")

build_files/build_environment/patches/wayland.diff

@@ -1,11 +0,0 @@
---- meson.build.orig	2022-06-30 22:59:11.000000000 +0100
-+++ meson.build	2022-09-27 13:21:26.428517668 +0100
-@@ -2,7 +2,7 @@
- 	'wayland', 'c',
- 	version: '1.21.0',
- 	license: 'MIT',
--	meson_version: '>= 0.56.0',
-+	meson_version: '>= 0.55.1',
- 	default_options: [
- 		'warning_level=2',
- 		'buildtype=debugoptimized',

build_files/build_environment/windows/build_deps.cmd

@@ -103,19 +103,15 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 set StatusFile=%BUILD_DIR%\%1_%2.log
-set original_path=%path%
-set oiio_paths=%Staging%\%BuildDir%%ARCH%R\Release\openimageio\bin;%Staging%\%BuildDir%%ARCH%D\Debug\openimageio\bin
-set boost_paths=%Staging%\%BuildDir%%ARCH%R\Release\boost\lib;%Staging%\%BuildDir%%ARCH%D\Debug\boost\lib
-set openexr_paths=%Staging%\%BuildDir%%ARCH%R\Release\openexr\bin;%Staging%\%BuildDir%%ARCH%D\Debug\openexr\bin
-set imath_paths=%Staging%\%BuildDir%%ARCH%R\Release\imath\bin;%Staging%\%BuildDir%%ARCH%D\Debug\imath\bin
-set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads\nasm-2.12.01\;%path%;%boost_paths%;%oiio_paths%;%openexr_paths%;%imath_paths%
+set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_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%" %CMAKE_BUILD_ARCH% -Thost=x64  %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild -maxcpucount:1 "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
+	msbuild /m:1 "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
+	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
 	echo %DATE% %TIME% : Release Build done >> %StatusFile%
 	cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
 )
@@ -127,7 +123,8 @@ cd %Staging%\%BuildDir%%ARCH%D
 cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild -maxcpucount:1 "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
+	msbuild /m:1 "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
+	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
 	echo %DATE% %TIME% : Debug Build done >> %StatusFile%
 	cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
 )
@@ -135,5 +132,4 @@ echo %DATE% %TIME% : Debug Harvest done >> %StatusFile%
 cd %BUILD_DIR%
 
 :exit
-set path=%original_path%
 Echo .

build_files/buildbot/config/blender_linux.cmake

@@ -28,4 +28,4 @@ set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRI
 # Platform specific configuration, to ensure static linking against everything.
 
 # Additional linking libraries
-set(CMAKE_EXE_LINKER_FLAGS   "-lrt -no-pie"  CACHE STRING "" FORCE)
+set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)

build_files/cmake/Modules/FindEpoxy.cmake

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# This module defines
-#  Epoxy_INCLUDE_DIRS, where to find epoxy/gl.h
-#  Epoxy_LIBRARY, where to find the epoxy library.
-#  Epoxy_ROOT_DIR, The base directory to search for epoxy.
-#                     This can also be an environment variable.
-#  Epoxy_FOUND, If false, do not try to use epoxy.
-
-IF(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "")
-  SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
-ENDIF()
-
-FIND_PATH(Epoxy_INCLUDE_DIR
-  NAMES
-    epoxy/gl.h
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(Epoxy_LIBRARY
-  NAMES
-    epoxy
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set Epoxy_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Epoxy DEFAULT_MSG
-    Epoxy_LIBRARY Epoxy_INCLUDE_DIR)
-
-IF(Epoxy_FOUND)
-  SET(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR})
-  SET(Epoxy_LIBRARIES ${Epoxy_LIBRARY})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  Epoxy_INCLUDE_DIR
-  Epoxy_LIBRARY
-)

build_files/cmake/Modules/FindGLEW.cmake

@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2014 Blender Foundation.
+
+# - Find GLEW library
+# Find the native Glew includes and library
+# This module defines
+#  GLEW_INCLUDE_DIRS, where to find glew.h, Set when
+#                        GLEW_INCLUDE_DIR is found.
+#  GLEW_ROOT_DIR, The base directory to search for Glew.
+#                    This can also be an environment variable.
+#  GLEW_FOUND, If false, do not try to use Glew.
+#
+# also defined,
+#  GLEW_LIBRARY, where to find the Glew library.
+
+# If GLEW_ROOT_DIR was defined in the environment, use it.
+IF(NOT GLEW_ROOT_DIR AND NOT $ENV{GLEW_ROOT_DIR} STREQUAL "")
+  SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR})
+ENDIF()
+
+SET(_glew_SEARCH_DIRS
+  ${GLEW_ROOT_DIR}
+)
+
+FIND_PATH(GLEW_INCLUDE_DIR
+  NAMES
+    GL/glew.h
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+)
+
+FIND_LIBRARY(GLEW_LIBRARY
+  NAMES
+    GLEW
+  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)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG
+    GLEW_LIBRARY GLEW_INCLUDE_DIR)
+
+IF(GLEW_FOUND)
+  SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+ENDIF()
+
+MARK_AS_ADVANCED(
+  GLEW_INCLUDE_DIR
+  GLEW_LIBRARY
+)
+
+UNSET(_glew_SEARCH_DIRS)

build_files/cmake/Modules/FindLibEpoxy.cmake

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# This module defines
-#  LibEpoxy_INCLUDE_DIRS, where to find epoxy/gl.h
-#  LibEpoxy_LIBRARY, where to find the epoxy library.
-#  LibEpoxy_ROOT_DIR, The base directory to search for libepoxy.
-#                     This can also be an environment variable.
-#  LibEpoxy_FOUND, If false, do not try to use libepoxy.
-
-IF(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "")
-  SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
-ENDIF()
-
-FIND_PATH(LibEpoxy_INCLUDE_DIR
-  NAMES
-    epoxy/gl.h
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(LibEpoxy_LIBRARY
-  NAMES
-    epoxy
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set LibEpoxy_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEpoxy DEFAULT_MSG
-    LibEpoxy_LIBRARY LibEpoxy_INCLUDE_DIR)
-
-IF(LibEpoxy_FOUND)
-  SET(LibEpoxy_INCLUDE_DIRS ${LibEpoxy_INCLUDE_DIR})
-  SET(LibEpoxy_LIBRARIES ${LibEpoxy_LIBRARY})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  LibEpoxy_INCLUDE_DIR
-  LibEpoxy_LIBRARY
-)

build_files/cmake/Modules/FindMoltenVK.cmake

@@ -1,59 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# - Find MoltenVK libraries
-# Find the MoltenVK includes and libraries
-# This module defines
-#  MOLTENVK_INCLUDE_DIRS, where to find MoltenVK headers, Set when
-#                        MOLTENVK_INCLUDE_DIR is found.
-#  MOLTENVK_LIBRARIES, libraries to link against to use MoltenVK.
-#  MOLTENVK_ROOT_DIR, The base directory to search for MoltenVK.
-#                    This can also be an environment variable.
-#  MOLTENVK_FOUND, If false, do not try to use MoltenVK.
-#
-
-# If MOLTENVK_ROOT_DIR was defined in the environment, use it.
-IF(NOT MOLTENVK_ROOT_DIR AND NOT $ENV{MOLTENVK_ROOT_DIR} STREQUAL "")
-  SET(MOLTENVK_ROOT_DIR $ENV{MOLTENVK_ROOT_DIR})
-ENDIF()
-
-SET(_moltenvk_SEARCH_DIRS
-  ${MOLTENVK_ROOT_DIR}
-  ${LIBDIR}/vulkan/MoltenVK
-)
-
-
-FIND_PATH(MOLTENVK_INCLUDE_DIR
-  NAMES
-    MoltenVK/vk_mvk_moltenvk.h
-  HINTS
-    ${_moltenvk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(MOLTENVK_LIBRARY
-  NAMES
-    MoltenVK
-  HINTS
-    ${_moltenvk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    dylib/macOS
-)
-
-# handle the QUIETLY and REQUIRED arguments and set MOLTENVK_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MoltenVK DEFAULT_MSG MOLTENVK_LIBRARY MOLTENVK_INCLUDE_DIR)
-
-IF(MOLTENVK_FOUND)
-  SET(MOLTENVK_LIBRARIES ${MOLTENVK_LIBRARY})
-  SET(MOLTENVK_INCLUDE_DIRS ${MOLTENVK_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  MOLTENVK_INCLUDE_DIR
-  MOLTENVK_LIBRARY
-)
-
-UNSET(_moltenvk_SEARCH_DIRS)

build_files/cmake/Modules/FindOSL.cmake

@@ -20,7 +20,6 @@ IF(NOT OSL_ROOT_DIR AND NOT $ENV{OSL_ROOT_DIR} STREQUAL "")
 ENDIF()
 
 SET(_osl_FIND_COMPONENTS
-  oslnoise
   oslcomp
   oslexec
   oslquery
@@ -40,6 +39,7 @@ FIND_PATH(OSL_INCLUDE_DIR
     include
 )
 
+SET(_osl_LIBRARIES)
 FOREACH(COMPONENT ${_osl_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
 
@@ -51,20 +51,9 @@ FOREACH(COMPONENT ${_osl_FIND_COMPONENTS})
     PATH_SUFFIXES
       lib64 lib
     )
+  LIST(APPEND _osl_LIBRARIES "${OSL_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()
 
-# Note linking order matters, and oslnoise existence depends on version.
-SET(_osl_LIBRARIES ${OSL_OSLCOMP_LIBRARY})
-IF(APPLE)
-  list(APPEND _osl_LIBRARIES -force_load ${OSL_OSLEXEC_LIBRARY})
-ELSE()
-  list(APPEND _osl_LIBRARIES ${OSL_OSLEXEC_LIBRARY})
-ENDIF()
-list(APPEND _osl_LIBRARIES ${OSL_OSLQUERY_LIBRARY})
-IF(OSL_OSLNOISE_LIBRARY)
-  list(APPEND _osl_LIBRARIES ${OSL_OSLNOISE_LIBRARY})
-ENDIF()
-
 FIND_PROGRAM(OSL_COMPILER oslc
              HINTS ${_osl_SEARCH_DIRS}
              PATH_SUFFIXES bin)

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -24,7 +24,6 @@ SET(_opencolorio_FIND_COMPONENTS
   yaml-cpp
   expat
   pystring
-  minizip
 )
 
 SET(_opencolorio_SEARCH_DIRS

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -26,8 +26,7 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
   SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
 ENDIF()
 
-# Old versions (before 2.0?) do not have any version string,
-# just assuming this should be fine though.
+# Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
 SET(_openexr_libs_ver_init "2.0")
 
 SET(_openexr_SEARCH_DIRS

build_files/cmake/Modules/FindOpenGLES.cmake

@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2014 Blender Foundation.
+
+# - Try to find OpenGLES
+# Once done this will define
+#
+#  OPENGLES_FOUND           - system has OpenGLES and EGL
+#  OPENGL_EGL_FOUND         - system has EGL
+#  OPENGLES_INCLUDE_DIR     - the GLES include directory
+#  OPENGLES_LIBRARY         - the GLES library
+#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
+#  OPENGLES_EGL_LIBRARY     - the EGL library
+#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
+#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
+
+# If OPENGLES_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENGLES_ROOT_DIR AND NOT $ENV{OPENGLES_ROOT_DIR} STREQUAL "")
+  SET(OPENGLES_ROOT_DIR $ENV{OPENGLES_ROOT_DIR})
+ENDIF()
+
+SET(_opengles_SEARCH_DIRS
+  ${OPENGLES_ROOT_DIR}
+)
+
+FIND_PATH(OPENGLES_INCLUDE_DIR
+  NAMES
+    GLES2/gl2.h
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+)
+
+FIND_LIBRARY(OPENGLES_LIBRARY
+  NAMES
+    GLESv2
+  PATHS
+    ${_opengles_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+
+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR
+  NAMES
+    EGL/egl.h
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+)
+
+FIND_LIBRARY(OPENGLES_EGL_LIBRARY
+  NAMES
+    EGL
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+
+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+  SET(OPENGL_EGL_FOUND "YES")
+ELSE()
+  SET(OPENGL_EGL_FOUND "NO")
+ENDIF()
+
+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
+   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+  SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
+                           ${OPENGLES_EGL_LIBRARY})
+  SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
+  SET(OPENGLES_FOUND "YES")
+ELSE()
+  SET(OPENGLES_FOUND "NO")
+ENDIF()
+
+MARK_AS_ADVANCED(
+  OPENGLES_EGL_INCLUDE_DIR
+  OPENGLES_EGL_LIBRARY
+  OPENGLES_LIBRARY
+  OPENGLES_INCLUDE_DIR
+)
+
+UNSET(_opengles_SEARCH_DIRS)

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -13,7 +13,6 @@
 #
 # This module defines
 #  PYTHON_VERSION
-#  PYTHON_VERSION_NO_DOTS
 #  PYTHON_INCLUDE_DIRS
 #  PYTHON_INCLUDE_CONFIG_DIRS
 #  PYTHON_LIBRARIES
@@ -35,17 +34,11 @@ SET(PYTHON_VERSION 3.10 CACHE STRING "Python Version (major and minor only)")
 MARK_AS_ADVANCED(PYTHON_VERSION)
 
 
-if(APPLE)
-  if(WITH_PYTHON_MODULE)
-    set(PYTHON_LINKFLAGS "-undefined dynamic_lookup")
-  else()
-    set(PYTHON_LINKFLAGS)
-  endif()
-else()
-  # See: http://docs.python.org/extending/embedding.html#linking-requirements
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for python")
-  MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
-endif()
+# See: http://docs.python.org/extending/embedding.html#linking-requirements
+#      for why this is needed
+SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for python")
+MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
+
 
 # if the user passes these defines as args, we don't want to overwrite
 SET(_IS_INC_DEF OFF)
@@ -65,11 +58,11 @@ IF(DEFINED PYTHON_LIBPATH)
   SET(_IS_LIB_PATH_DEF ON)
 ENDIF()
 
-STRING(REPLACE "." "" PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
 SET(_python_SEARCH_DIRS
   ${PYTHON_ROOT_DIR}
-  "$ENV{HOME}/py${PYTHON_VERSION_NO_DOTS}"
+  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
   "/opt/lib/python-${PYTHON_VERSION}"
 )
 
@@ -212,6 +205,7 @@ IF(PYTHONLIBSUNIX_FOUND)
   )
 ENDIF()
 
+UNSET(_PYTHON_VERSION_NO_DOTS)
 UNSET(_PYTHON_ABI_FLAGS)
 UNSET(_python_SEARCH_DIRS)
 

build_files/cmake/Modules/FindSYCL.cmake

@@ -30,7 +30,6 @@ SET(_sycl_search_dirs
 # dpcpp binary.
 FIND_PROGRAM(SYCL_COMPILER
   NAMES
-    icpx
     dpcpp
     clang++
   HINTS
@@ -45,8 +44,7 @@ FIND_PROGRAM(SYCL_COMPILER
 # compiler.
 if(NOT SYCL_COMPILER)
   FIND_PROGRAM(SYCL_COMPILER
-    NAMES
-      icpx
+   NAMES
       dpcpp
     HINTS
       ${_sycl_search_dirs}
@@ -57,8 +55,6 @@ endif()
 
 FIND_LIBRARY(SYCL_LIBRARY
   NAMES
-    sycl7
-    sycl6
     sycl
   HINTS
     ${_sycl_search_dirs}
@@ -66,48 +62,23 @@ FIND_LIBRARY(SYCL_LIBRARY
     lib64 lib
 )
 
-if(WIN32)
-  FIND_LIBRARY(SYCL_LIBRARY_DEBUG
-    NAMES
-      sycl7d
-      sycl6d
-      sycld
-    HINTS
-      ${_sycl_search_dirs}
-    PATH_SUFFIXES
-      lib64 lib
-  )
-endif()
-
 FIND_PATH(SYCL_INCLUDE_DIR
   NAMES
-    sycl/sycl.hpp
+    CL/sycl.hpp
   HINTS
     ${_sycl_search_dirs}
   PATH_SUFFIXES
     include
+    include/sycl
 )
 
-IF(EXISTS "${SYCL_INCLUDE_DIR}/sycl/version.hpp")
-  FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_major_version REGEX "^#define __LIBSYCL_MAJOR_VERSION[ \t].*$")
-  STRING(REGEX MATCHALL "[0-9]+" _libsycl_major_version ${_libsycl_major_version})
-  FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_minor_version REGEX "^#define __LIBSYCL_MINOR_VERSION[ \t].*$")
-  STRING(REGEX MATCHALL "[0-9]+" _libsycl_minor_version ${_libsycl_minor_version})
-  FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_patch_version REGEX "^#define __LIBSYCL_PATCH_VERSION[ \t].*$")
-  STRING(REGEX MATCHALL "[0-9]+" _libsycl_patch_version ${_libsycl_patch_version})
-
-  SET(SYCL_VERSION "${_libsycl_major_version}.${_libsycl_minor_version}.${_libsycl_patch_version}")
-ENDIF()
-
 INCLUDE(FindPackageHandleStandardArgs)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL
-  REQUIRED_VARS SYCL_LIBRARY SYCL_INCLUDE_DIR
-  VERSION_VAR SYCL_VERSION
-)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL DEFAULT_MSG SYCL_LIBRARY SYCL_INCLUDE_DIR)
 
 IF(SYCL_FOUND)
-  SET(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${SYCL_INCLUDE_DIR}/sycl)
+  get_filename_component(_SYCL_INCLUDE_PARENT_DIR ${SYCL_INCLUDE_DIR} DIRECTORY)
+  SET(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${_SYCL_INCLUDE_PARENT_DIR})
 ELSE()
   SET(SYCL_SYCL_FOUND FALSE)
 ENDIF()

build_files/cmake/Modules/FindUSD.cmake

@@ -32,8 +32,7 @@ FIND_PATH(USD_INCLUDE_DIR
   DOC "Universal Scene Description (USD) header files"
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e.
-# "libusd_m.a" became "libusd_usd_m.a".
+# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
 # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
 FIND_LIBRARY(USD_LIBRARY
   NAMES
@@ -59,9 +58,6 @@ ELSE()
     get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY)
     SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR})
     set(USD_LIBRARIES ${USD_LIBRARY})
-    IF(EXISTS ${USD_INCLUDE_DIR}/pxr/base/tf/pyModule.h)
-      SET(USD_PYTHON_SUPPORT ON)
-    ENDIF()
   ENDIF()
 ENDIF()
 

build_files/cmake/Modules/GTest.cmake

@@ -268,8 +268,7 @@ same as the Google Test name (i.e. ``suite.testcase``); see also
 cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW) # if IN_LIST
 
-# -----------------------------------------------------------------------------
-
+#------------------------------------------------------------------------------
 function(gtest_add_tests)
 
   if(ARGC LESS 1)

build_files/cmake/Modules/GTestTesting.cmake

@@ -40,10 +40,12 @@ macro(BLENDER_SRC_GTEST_EX)
       set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest")
     endif()
 
+    add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
+    add_definitions(${GFLAGS_DEFINES})
+    add_definitions(${GLOG_DEFINES})
+
     add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST})
     setup_platform_linker_flags(${TARGET_NAME})
-    target_compile_definitions(${TARGET_NAME} PRIVATE ${GFLAGS_DEFINES})
-    target_compile_definitions(${TARGET_NAME} PRIVATE ${GLOG_DEFINES})
     target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}")
     target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}")
     target_link_libraries(${TARGET_NAME} ${ARG_EXTRA_LIBS} ${PLATFORM_LINKLIBS})
@@ -95,9 +97,6 @@ macro(BLENDER_SRC_GTEST_EX)
       set_tests_properties(${TARGET_NAME} PROPERTIES
         ENVIRONMENT LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
       )
-      if(WIN32)
-        set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
-      endif()
     endif()
     if(WIN32)
       set_target_properties(${TARGET_NAME} PROPERTIES VS_GLOBAL_VcpkgEnabled "false")

build_files/cmake/buildinfo.cmake

@@ -103,6 +103,10 @@ if(EXISTS ${SOURCE_DIR}/.git)
       endif()
     endif()
 
+    if(MY_WC_BRANCH MATCHES "^blender-v")
+      set(MY_WC_BRANCH "master")
+    endif()
+
     unset(_git_below_check)
   endif()
 
@@ -146,10 +150,10 @@ endif()
 # BUILD_PLATFORM is taken from CMake
 # but BUILD_DATE and BUILD_TIME are platform dependent
 if(NOT BUILD_DATE)
-  string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
+  STRING(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
 endif()
 if(NOT BUILD_TIME)
-  string(TIMESTAMP BUILD_TIME "%H:%M:%S" UTC)
+  STRING(TIMESTAMP BUILD_TIME "%H:%M:%S" UTC)
 endif()
 
 # Write a file with the BUILD_HASH define

build_files/cmake/cmake_static_check_cppcheck.py

@@ -10,77 +10,40 @@ import tempfile
 from typing import (
     Any,
     List,
-    Tuple,
 )
 
-USE_VERBOSE = (os.environ.get("VERBOSE", None) is not None)
-# Could make configurable.
-USE_VERBOSE_PROGRESS = True
 
-CHECKER_BIN = "cppcheck"
+USE_QUIET = (os.environ.get("QUIET", None) is not None)
 
 CHECKER_IGNORE_PREFIX = [
     "extern",
 ]
 
-CHECKER_EXCLUDE_SOURCE_FILES = set(os.path.join(*f.split("/")) for f in (
-    # These files hang (taking longer than 5min with v2.8.2 at time of writing).
-    # All other files process in under around 10seconds.
-    "source/blender/editors/space_text/text_format_pov.c",
-    "source/blender/editors/space_text/text_format_pov_ini.c",
-))
+CHECKER_BIN = "cppcheck"
 
 CHECKER_ARGS = [
-    # Speed up execution.
-    # As Blender has many defines, the total number of configurations is large making execution unreasonably slow.
-    # This could be increased but do so with care.
-    "--max-configs=1",
-
-    # Enable this when includes are missing.
-    #  "--check-config",
-
-    # Shows many pedantic issues, some are quite useful.
-    "--enable=all",
-
-    # Also shows useful messages, even if some are false-positives.
-    "--inconclusive",
+    # not sure why this is needed, but it is.
+    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
+    "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+    "--max-configs=1",  # speeds up execution
+    #  "--check-config", # when includes are missing
+    "--enable=all",  # if you want sixty hundred pedantic suggestions
 
     # Quiet output, otherwise all defines/includes are printed (overly verbose).
     # Only enable this for troubleshooting (if defines are not set as expected for example).
-    *(() if USE_VERBOSE else ("--quiet",))
+    "--quiet",
 
     # NOTE: `--cppcheck-build-dir=<dir>` is added later as a temporary directory.
 ]
 
-
-def source_info_filter(
-        source_info: List[Tuple[str, List[str], List[str]]],
-) -> List[Tuple[str, List[str], List[str]]]:
-    source_dir = project_source_info.SOURCE_DIR
-    if not source_dir.endswith(os.sep):
-        source_dir += os.sep
-    source_info_result = []
-    for i, item in enumerate(source_info):
-        c = item[0]
-        if c.startswith(source_dir):
-            c_relative = c[len(source_dir):]
-            if c_relative in CHECKER_EXCLUDE_SOURCE_FILES:
-                CHECKER_EXCLUDE_SOURCE_FILES.remove(c_relative)
-                continue
-        source_info_result.append(item)
-    if CHECKER_EXCLUDE_SOURCE_FILES:
-        sys.stderr.write("Error: exclude file(s) are missing: %r\n" % list(sorted(CHECKER_EXCLUDE_SOURCE_FILES)))
-        sys.exit(1)
-    return source_info_result
+if USE_QUIET:
+    CHECKER_ARGS.append("--quiet")
 
 
 def cppcheck() -> None:
     source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
     source_defines = project_source_info.build_defines_as_args()
 
-    # Apply exclusion.
-    source_info = source_info_filter(source_info)
-
     check_commands = []
     for c, inc_dirs, defs in source_info:
         cmd = (
@@ -97,7 +60,7 @@ def cppcheck() -> None:
     process_functions = []
 
     def my_process(i: int, c: str, cmd: List[str]) -> subprocess.Popen[Any]:
-        if USE_VERBOSE_PROGRESS:
+        if not USE_QUIET:
             percent = 100.0 * (i / len(check_commands))
             percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 

build_files/cmake/config/blender_developer.cmake

@@ -8,11 +8,7 @@
 
 set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
-# Sadly ASAN is more often broken than working with MSVC do not enable it in the
-# developer profile for now.
-if(NOT WIN32)
-  set(WITH_COMPILER_ASAN              ON  CACHE BOOL "" FORCE)
-endif()
+set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_full.cmake

@@ -13,11 +13,10 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_PATH_GUIDING ON  CACHE BOOL "" FORCE)
 set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
@@ -58,7 +57,6 @@ set(WITH_QUADRIFLOW          ON  CACHE BOOL "" FORCE)
 set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
 set(WITH_TBB                 ON  CACHE BOOL "" FORCE)
 set(WITH_USD                 ON  CACHE BOOL "" FORCE)
-set(WITH_MATERIALX           OFF CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 
@@ -67,11 +65,13 @@ set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 if(APPLE)
   set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
 endif()
+if(NOT WIN32)
+  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+endif()
 if(WIN32)
   set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
   set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -7,6 +7,8 @@
 #   cmake -C../blender/build_files/cmake/config/blender_lite.cmake  ../blender
 #
 
+set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)
+
 set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
 set(WITH_BLENDER_THUMBNAILER OFF CACHE BOOL "" FORCE)
@@ -16,7 +18,7 @@ set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      OFF CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
@@ -33,7 +35,6 @@ set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 set(WITH_IO_STL              OFF CACHE BOOL "" FORCE)
@@ -63,7 +64,6 @@ set(WITH_QUADRIFLOW          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_TBB                 OFF CACHE BOOL "" FORCE)
 set(WITH_USD                 OFF CACHE BOOL "" FORCE)
-set(WITH_MATERIALX           OFF CACHE BOOL "" FORCE)
 set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_XR_OPENXR           OFF CACHE BOOL "" FORCE)
 

build_files/cmake/config/blender_release.cmake

@@ -14,11 +14,10 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_PATH_GUIDING ON  CACHE BOOL "" FORCE)
 set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
@@ -59,7 +58,6 @@ set(WITH_QUADRIFLOW          ON  CACHE BOOL "" FORCE)
 set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
 set(WITH_TBB                 ON  CACHE BOOL "" FORCE)
 set(WITH_USD                 ON  CACHE BOOL "" FORCE)
-set(WITH_MATERIALX           OFF CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
 
@@ -68,11 +66,13 @@ if(APPLE)
   set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_DEVICE_METAL ON  CACHE BOOL "" FORCE)
 endif()
+if(NOT WIN32)
+  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+endif()
 if(WIN32)
   set(WITH_WASAPI               ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
   set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)

build_files/cmake/config/bpy_module.cmake

@@ -8,81 +8,41 @@
 
 set(WITH_PYTHON_MODULE       ON  CACHE BOOL "" FORCE)
 
+# install into the systems python dir
+set(WITH_INSTALL_PORTABLE    OFF CACHE BOOL "" FORCE)
 
-# -----------------------------------------------------------------------------
-# Installation Configuration.
-#
-# NOTE: `WITH_INSTALL_PORTABLE` always defaults to ON when building as a Python module and
-# isn't set here as it makes changing the setting impractical.
-# Python-developers could prefer either ON/OFF depending on their usage:
-#
-# - When using the system's Python, disabling will install into their `site-packages`,
-#   allowing them to run Python from any directory and `import bpy`.
-# - When using Blender's bundled Python in `./../lib/` it will install there
-#   which isn't especially useful as it requires running Python from this directory too.
-#
-# So default `WITH_INSTALL_PORTABLE` to ON, and developers who don't use Python from `./../lib/`
-# can disable it if they wish to install into their systems Python.
-
-# There is no point in copying python into Python.
+# no point int copying python into python
 set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
 
+# disable audio, its possible some devs may want this but for now disable
+# so the python module doesn't hold the audio device and loads quickly.
+set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
+set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
+set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
+set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
+set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
+
+# other features which are not especially useful as a python module
+set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
+set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
+set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
+set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
+set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
+set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
+set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
+
 # Depends on Python install, do this to quiet warning.
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
 
-if(WIN32)
-  set(WITH_WINDOWS_BUNDLE_CRT  OFF CACHE BOOL "" FORCE)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Library Compatibility.
-
-# JEMALLOC does not work with `dlopen()` of Python modules:
+# Jemalloc does not work with dlopen() of Python modules:
 # https://github.com/jemalloc/jemalloc/issues/1237
 set(WITH_MEM_JEMALLOC        OFF CACHE BOOL "" FORCE)
 
-
-# -----------------------------------------------------------------------------
-# Application Support.
-
-# Not useful to include with the Python module.
-# Although a way to extract this from Python could be handle,
-# this would be better exposed directly via the Python API.
-set(WITH_BLENDER_THUMBNAILER OFF CACHE BOOL "" FORCE)
-
-
-# -----------------------------------------------------------------------------
-# Audio Support.
-
-# Disable audio, its possible some developers may want this but for now disable
-# so the Python module doesn't hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
-if(UNIX AND NOT APPLE)
-  set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
-endif()
 if(WIN32)
-  set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
+  set(WITH_WINDOWS_BUNDLE_CRT  OFF CACHE BOOL "" FORCE)
 endif()
-if(APPLE)
-  set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Input Device Support.
-
-# Other features which are not especially useful as a python module.
-set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
-if(WIN32 OR APPLE)
-  set(WITH_INPUT_IME           OFF CACHE BOOL "" FORCE)
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Language Support.
-
-set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)

build_files/cmake/have_features.cmake

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
-
-# This file is used to test the system for headers & symbols.
-# Variables should use the `HAVE_` prefix.
-# Defines should use the same name as the CMAKE variable.
-
-include(CheckSymbolExists)
-
-# Used for: `intern/guardedalloc/intern/mallocn_intern.h`.
-# Function `malloc_stats` is only available on GLIBC,
-# so check that before defining `HAVE_MALLOC_STATS`.
-check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H)
-
-# Used for: `source/creator/creator_signals.c`.
-# The function `feenableexcept` is not present non-GLIBC systems,
-# hence we need to check if it's available in the `fenv.h` file.
-set(HAVE_FEENABLEEXCEPT OFF)
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-endif()
-
-# Used for: `source/blender/blenlib/intern/system.c`.
-# `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC),
-# so check the presence of the header before including it and  using the it for back-trace.
-set(HAVE_EXECINFO_H OFF)
-if(NOT MSVC)
-  include(CheckIncludeFiles)
-  check_include_files("execinfo.h" HAVE_EXECINFO_H)
-  if(HAVE_EXECINFO_H)
-    add_definitions(-DHAVE_EXECINFO_H)
-  endif()
-endif()

build_files/cmake/macros.cmake

@@ -57,25 +57,6 @@ macro(path_ensure_trailing_slash
   unset(_path_sep)
 endmacro()
 
-# Our own version of `cmake_path(IS_PREFIX ..)`.
-# This can be removed when 3.20 or greater is the minimum supported version.
-macro(path_is_prefix
-  path_prefix path result_var
-  )
-  # Remove when CMAKE version is bumped to "3.20" or greater.
-  # `cmake_path(IS_PREFIX ${path_prefix} ${path} NORMALIZE result_var)`
-  # Get the normalized paths (needed to remove `..`).
-  get_filename_component(_abs_prefix "${${path_prefix}}" ABSOLUTE)
-  get_filename_component(_abs_suffix "${${path}}" ABSOLUTE)
-  string(LENGTH "${_abs_prefix}" _len)
-  string(SUBSTRING "${_abs_suffix}" 0 "${_len}" _substr)
-  string(COMPARE EQUAL "${_abs_prefix}" "${_substr}" "${result_var}")
-  unset(_abs_prefix)
-  unset(_abs_suffix)
-  unset(_len)
-  unset(_substr)
-endmacro()
-
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
   file_name_new file_name file_suffix
@@ -153,11 +134,12 @@ endfunction()
 
 # Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
 # use it instead of include_directories()
-function(absolute_include_dirs
-  includes_absolute)
+function(blender_include_dirs
+  includes
+  )
 
   set(_ALL_INCS "")
-  foreach(_INC ${ARGN})
+  foreach(_INC ${ARGV})
     get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
     list(APPEND _ALL_INCS ${_ABS_INC})
     # for checking for invalid includes, disable for regular use
@@ -165,24 +147,22 @@ function(absolute_include_dirs
     #   message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
     # endif()
   endforeach()
-
-  set(${includes_absolute} ${_ALL_INCS} PARENT_SCOPE)
+  include_directories(${_ALL_INCS})
 endfunction()
 
-function(blender_target_include_dirs
-  name
+function(blender_include_dirs_sys
+  includes
   )
 
-  absolute_include_dirs(_ALL_INCS ${ARGN})
-  target_include_directories(${name} PRIVATE ${_ALL_INCS})
-endfunction()
-
-function(blender_target_include_dirs_sys
-  name
-  )
-
-  absolute_include_dirs(_ALL_INCS ${ARGN})
-  target_include_directories(${name} SYSTEM PRIVATE ${_ALL_INCS})
+  set(_ALL_INCS "")
+  foreach(_INC ${ARGV})
+    get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+    list(APPEND _ALL_INCS ${_ABS_INC})
+    # if(NOT EXISTS "${_ABS_INC}/")
+    #   message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+    # endif()
+  endforeach()
+  include_directories(SYSTEM ${_ALL_INCS})
 endfunction()
 
 # Set include paths for header files included with "*.h" syntax.
@@ -288,10 +268,12 @@ function(blender_add_lib__impl
 
   # message(STATUS "Configuring library ${name}")
 
-  add_library(${name} ${sources})
+  # include_directories(${includes})
+  # include_directories(SYSTEM ${includes_sys})
+  blender_include_dirs("${includes}")
+  blender_include_dirs_sys("${includes_sys}")
 
-  blender_target_include_dirs(${name} ${includes})
-  blender_target_include_dirs_sys(${name} ${includes_sys})
+  add_library(${name} ${sources})
 
   # On Windows certain libraries have two sets of binaries: one for debug builds and one for
   # release builds. The root of this requirement goes into ABI, I believe, but that's outside
@@ -400,7 +382,7 @@ function(blender_add_test_suite)
   cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
   # Figure out the release dir, as some tests need files from there.
-  get_blender_test_install_dir(TEST_INSTALL_DIR)
+  GET_BLENDER_TEST_INSTALL_DIR(TEST_INSTALL_DIR)
   if(APPLE)
     set(_test_release_dir ${TEST_INSTALL_DIR}/Blender.app/Contents/Resources/${BLENDER_VERSION})
   else()
@@ -422,9 +404,7 @@ function(blender_add_test_suite)
       --test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests"
       --test-release-dir "${_test_release_dir}"
   )
-  if(WIN32)
-    set_tests_properties(${ARGS_SUITE_NAME} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
-  endif()
+
   unset(_test_release_dir)
 endfunction()
 
@@ -445,21 +425,21 @@ function(blender_add_test_lib
 
   # This duplicates logic that's also in GTestTesting.cmake, macro BLENDER_SRC_GTEST_EX.
   # TODO(Sybren): deduplicate after the general approach in D7649 has been approved.
-  list(APPEND includes
+  LIST(APPEND includes
     ${CMAKE_SOURCE_DIR}/tests/gtests
   )
-  list(APPEND includes_sys
+  LIST(APPEND includes_sys
     ${GLOG_INCLUDE_DIRS}
     ${GFLAGS_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/extern/gtest/include
     ${CMAKE_SOURCE_DIR}/extern/gmock/include
   )
+  add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
+  add_definitions(${GFLAGS_DEFINES})
+  add_definitions(${GLOG_DEFINES})
 
   blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
 
-  target_compile_definitions(${name} PRIVATE ${GFLAGS_DEFINES})
-  target_compile_definitions(${name} PRIVATE ${GLOG_DEFINES})
-
   set_property(GLOBAL APPEND PROPERTY BLENDER_TEST_LIBS ${name})
 
   blender_add_test_suite(
@@ -489,16 +469,16 @@ function(blender_add_test_executable
   ## Otherwise external projects will produce warnings that we cannot fix.
   remove_strict_flags()
 
-  blender_src_gtest_ex(
+  include_directories(${includes})
+  include_directories(${includes_sys})
+
+  BLENDER_SRC_GTEST_EX(
     NAME ${name}
     SRC "${sources}"
     EXTRA_LIBS "${library_deps}"
     SKIP_ADD_TEST
   )
 
-  blender_target_include_dirs(${name}_test ${includes})
-  blender_target_include_dirs_sys(${name}_test ${includes_sys})
-
   blender_add_test_suite(
     TARGET ${name}_test
     SUITE_NAME ${name}
@@ -533,11 +513,6 @@ function(setup_platform_linker_flags
   set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " ${PLATFORM_LINKFLAGS}")
   set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " ${PLATFORM_LINKFLAGS_RELEASE}")
   set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG " ${PLATFORM_LINKFLAGS_DEBUG}")
-
-  get_target_property(target_type ${target} TYPE)
-  if (target_type STREQUAL "EXECUTABLE")
-    set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " ${PLATFORM_LINKFLAGS_EXECUTABLE}")
-  endif()
 endfunction()
 
 # Platform specific libraries for targets.
@@ -785,7 +760,7 @@ function(ADD_CHECK_C_COMPILER_FLAG
 
   include(CheckCCompilerFlag)
 
-  check_c_compiler_flag("${_FLAG}" "${_CACHE_VAR}")
+  CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
   if(${_CACHE_VAR})
     # message(STATUS "Using CFLAG: ${_FLAG}")
     set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}" PARENT_SCOPE)
@@ -802,7 +777,7 @@ function(ADD_CHECK_CXX_COMPILER_FLAG
 
   include(CheckCXXCompilerFlag)
 
-  check_cxx_compiler_flag("${_FLAG}" "${_CACHE_VAR}")
+  CHECK_CXX_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
   if(${_CACHE_VAR})
     # message(STATUS "Using CXXFLAG: ${_FLAG}")
     set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}" PARENT_SCOPE)
@@ -820,11 +795,9 @@ function(get_blender_version)
   # - BLENDER_VERSION_PATCH
   # - BLENDER_VERSION_CYCLE (alpha, beta, rc, release)
 
-  # So CMAKE depends on `BKE_blender.h`, beware of infinite-loops!
-  configure_file(
-    ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h
-    ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done
-  )
+  # So cmake depends on BKE_blender.h, beware of inf-loops!
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h
+                 ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done)
 
   file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h _contents REGEX "^#define[ \t]+BLENDER_.*$")
 
@@ -1016,8 +989,7 @@ function(data_to_c_simple_icons
   add_custom_command(
     OUTPUT  ${_file_from} ${_file_to}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-    # COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py
-    #         ${_path_from_abs} ${_file_from}
+    # COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py ${_path_from_abs} ${_file_from}
     COMMAND "$<TARGET_FILE:datatoc_icon>" ${_path_from_abs} ${_file_from}
     COMMAND "$<TARGET_FILE:datatoc>" ${_file_from} ${_file_to}
     DEPENDS
@@ -1095,27 +1067,23 @@ function(msgfmt_simple
 endfunction()
 
 function(find_python_package
-    package
-    relative_include_dir
+  package
+  relative_include_dir
   )
 
   string(TOUPPER ${package} _upper_package)
 
-  # Set but invalid.
+  # set but invalid
   if((NOT ${PYTHON_${_upper_package}_PATH} STREQUAL "") AND
      (NOT ${PYTHON_${_upper_package}_PATH} MATCHES NOTFOUND))
-    # if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}/${package}")
-    #   message(
-    #     WARNING
-    #     "PYTHON_${_upper_package}_PATH is invalid, ${package} not found in "
-    #     "'${PYTHON_${_upper_package}_PATH}' "
-    #     "WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing Python"
-    #   )
-    #   set(WITH_PYTHON_INSTALL${_upper_package} OFF)
-    # endif()
-    # Not set, so initialize.
+#       if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}/${package}")
+#           message(WARNING "PYTHON_${_upper_package}_PATH is invalid, ${package} not found in '${PYTHON_${_upper_package}_PATH}' "
+#                           "WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
+#           set(WITH_PYTHON_INSTALL${_upper_package} OFF)
+#       endif()
+  # not set, so initialize
   else()
-   string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
+    string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
     list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
 
     # re-cache
@@ -1216,6 +1184,8 @@ macro(openmp_delayload
     if(WITH_OPENMP)
       if(MSVC_CLANG)
         set(OPENMP_DLL_NAME "libomp")
+      elseif(MSVC_VERSION EQUAL 1800)
+        set(OPENMP_DLL_NAME "vcomp120")
       else()
         set(OPENMP_DLL_NAME "vcomp140")
       endif()
@@ -1231,116 +1201,23 @@ macro(set_and_warn_dependency
   _dependency _setting _val)
   # when $_dependency is disabled, forces $_setting = $_val
   if(NOT ${${_dependency}} AND ${${_setting}})
-    if(WITH_STRICT_BUILD_OPTIONS)
-      message(SEND_ERROR "${_dependency} disabled but required by ${_setting}")
-    else()
-      message(STATUS "${_dependency} is disabled, setting ${_setting}=${_val}")
-    endif()
+    message(STATUS "'${_dependency}' is disabled: forcing 'set(${_setting} ${_val})'")
     set(${_setting} ${_val})
   endif()
 endmacro()
 
-macro(set_and_warn_library_found
-  _library_name _library_found _setting)
-  if(((NOT ${_library_found}) OR (NOT ${${_library_found}})) AND ${${_setting}})
-    if(WITH_STRICT_BUILD_OPTIONS)
-      message(SEND_ERROR "${_library_name} required but not found")
-    else()
-      message(STATUS "${_library_name} not found, disabling ${_setting}")
-    endif()
-    set(${_setting} OFF)
-  endif()
-endmacro()
-
 macro(without_system_libs_begin)
   set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
+  if(APPLE)
+    # Avoid searching for headers in frameworks (like Mono), and libraries in LIBDIR.
+    set(CMAKE_FIND_FRAMEWORK NEVER)
+  endif()
 endmacro()
 
 macro(without_system_libs_end)
   unset(CMAKE_IGNORE_PATH)
-endmacro()
-
-# Utility to gather and install precompiled shared libraries.
-macro(add_bundled_libraries library_dir)
-  if(EXISTS ${LIBDIR})
-    set(_library_dir ${LIBDIR}/${library_dir})
-    if(WIN32)
-      file(GLOB _all_library_versions ${_library_dir}/*\.dll)
-    elseif(APPLE)
-      file(GLOB _all_library_versions ${_library_dir}/*\.dylib*)
-    else()
-      file(GLOB _all_library_versions ${_library_dir}/*\.so*)
-    endif()
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
-    unset(_all_library_versions)
-    unset(_library_dir)
- endif()
-endmacro()
-
-macro(windows_install_shared_manifest)
-  set(options OPTIONAL DEBUG RELEASE ALL)
-  set(oneValueArgs)
-  set(multiValueArgs FILES)
-  cmake_parse_arguments(WINDOWS_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-  # If none of the options are set assume ALL.
-  unset(WINDOWS_CONFIGURATIONS)
-  if(NOT WINDOWS_INSTALL_ALL AND
-     NOT WINDOWS_INSTALL_DEBUG AND
-     NOT WINDOWS_INSTALL_RELEASE)
-    set(WINDOWS_INSTALL_ALL TRUE)
+  if(APPLE)
+    # FIRST is the default.
+    set(CMAKE_FIND_FRAMEWORK FIRST)
   endif()
-  # If all is set, turn both DEBUG and RELEASE on.
-  if(WINDOWS_INSTALL_ALL)
-    set(WINDOWS_INSTALL_DEBUG TRUE)
-    set(WINDOWS_INSTALL_RELEASE TRUE)
-  endif()
-  if(WINDOWS_INSTALL_DEBUG)
-    set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Debug")
-    list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
-  endif()
-  if(WINDOWS_INSTALL_RELEASE)
-    list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
-    set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Release;RelWithDebInfo;MinSizeRel")
-  endif()
-  install(FILES ${WINDOWS_INSTALL_FILES}
-          CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
-          DESTINATION "./blender.shared"
-  )
-endmacro()
-
-macro(windows_generate_manifest)
-  set(options)
-  set(oneValueArgs OUTPUT NAME)
-  set(multiValueArgs FILES)
-  cmake_parse_arguments(WINDOWS_MANIFEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-  set(MANIFEST_LIBS "")
-  foreach(lib ${WINDOWS_MANIFEST_FILES})
-    get_filename_component(filename ${lib} NAME)
-    set(MANIFEST_LIBS "${MANIFEST_LIBS}    <file name=\"${filename}\"/>\n")
-  endforeach()
-  configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.manifest.in ${WINDOWS_MANIFEST_OUTPUT} @ONLY)
-endmacro()
-
-macro(windows_generate_shared_manifest)
-  windows_generate_manifest(
-    FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
-    OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
-    NAME "blender.shared"
-  )
-  windows_generate_manifest(
-    FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
-    OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
-    NAME "blender.shared"
-  )
-  install(
-      FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
-      DESTINATION "./blender.shared"
-      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-  )
-  install(
-      FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
-      DESTINATION "./blender.shared"
-      CONFIGURATIONS Debug
-  )
 endmacro()

build_files/cmake/packaging.cmake

@@ -17,9 +17,9 @@ set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR})
 set(CPACK_PACKAGE_CONTACT ${PROJECT_CONTACT})
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}")
-set(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
 
 
 # Get the build revision, note that this can get out-of-sync, so for packaging run cmake first.
@@ -106,8 +106,8 @@ if(WIN32)
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
 endif()
 
-set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
-set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
+set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender")
+set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender")
 
 include(CPack)
 

build_files/cmake/platform/platform_apple.cmake

@@ -31,18 +31,22 @@ find_package(BZip2 REQUIRED)
 list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
 
 if(WITH_OPENAL)
-  find_package(OpenAL REQUIRED)
+  find_package(OpenAL)
+  if(NOT OPENAL_FOUND)
+    message(WARNING "OpenAL not found, disabling WITH_OPENAL")
+    set(WITH_OPENAL OFF)
+  endif()
 endif()
 
 if(WITH_JACK)
   find_library(JACK_FRAMEWORK
     NAMES jackmp
   )
-
-  if(JACK_FRAMEWORK)
-    set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
+  if(NOT JACK_FRAMEWORK)
+    message(STATUS "JACK not found, disabling WITH_JACK")
+    set(WITH_JACK OFF)
   else()
-    set_and_warn_library_found("JACK" JACK_FRAMEWORK WITH_JACK)
+    set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
   endif()
 endif()
 
@@ -59,15 +63,6 @@ if(NOT EXISTS "${LIBDIR}/")
   message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
 endif()
 
-# Avoid searching for headers since this would otherwise override our lib
-# directory as well as PYTHON_ROOT_DIR.
-set(CMAKE_FIND_FRAMEWORK NEVER)
-
-# Optionally use system Python if PYTHON_ROOT_DIR is specified.
-if(WITH_PYTHON AND (WITH_PYTHON_MODULE AND PYTHON_ROOT_DIR))
-  find_package(PythonLibsUnix REQUIRED)
-endif()
-
 # Prefer lib directory paths
 file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
 set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
@@ -85,39 +80,15 @@ if(WITH_ALEMBIC)
 endif()
 
 if(WITH_USD)
-  find_package(USD REQUIRED)
-  add_bundled_libraries(usd/lib)
-endif()
-
-if(WITH_MATERIALX)
-  find_package(MaterialX)
-  set_and_warn_library_found("MaterialX" MaterialX_FOUND WITH_MATERIALX)
-  if(WITH_MATERIALX)
-    add_bundled_libraries(materialx/lib)
-  endif()
-endif()
-
-if(WITH_VULKAN_BACKEND)
-  find_package(MoltenVK REQUIRED)
-
-  if(EXISTS ${LIBDIR}/vulkan)
-    set(VULKAN_FOUND On)
-    set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan/macOS)
-    set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
-    set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.1.dylib)
-    set(SHADERC_LIBRARY ${VULKAN_ROOT_DIR}/lib/libshaderc_combined.a)
-
-    set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
-    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY} ${MOLTENVK_LIBRARIES})
-  else()
-    message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
-    set(WITH_VULKAN_BACKEND OFF)
+  find_package(USD)
+  if(NOT USD_FOUND)
+    message(STATUS "USD not found, disabling WITH_USD")
+    set(WITH_USD OFF)
   endif()
 endif()
 
 if(WITH_OPENSUBDIV)
   find_package(OpenSubdiv)
-  add_bundled_libraries(opensubdiv/lib)
 endif()
 
 if(WITH_CODEC_SNDFILE)
@@ -140,8 +111,34 @@ if(WITH_CODEC_SNDFILE)
   unset(_sndfile_VORBISENC_LIBRARY)
 endif()
 
-if(WITH_PYTHON AND NOT (WITH_PYTHON_MODULE AND PYTHON_ROOT_DIR))
-  find_package(PythonLibsUnix REQUIRED)
+if(WITH_PYTHON)
+  # Use precompiled libraries by default.
+  SET(PYTHON_VERSION 3.10 CACHE STRING "Python Version (major and minor only)")
+  if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
+    # Normally cached but not since we include them with blender.
+    set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
+    set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
+    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
+    set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+  else()
+    # Module must be compiled against Python framework.
+    set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
+    set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}")
+    set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}")
+    set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}")
+    unset(_py_framework)
+  endif()
+
+  # uncached vars
+  set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+  set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
+
+  # needed for Audaspace, numpy is installed into python site-packages
+  set(PYTHON_NUMPY_INCLUDE_DIRS "${PYTHON_LIBPATH}/site-packages/numpy/core/include")
+
+  if(NOT EXISTS "${PYTHON_EXECUTABLE}")
+    message(FATAL_ERROR "Python executable missing: ${PYTHON_EXECUTABLE}")
+  endif()
 endif()
 
 if(WITH_FFTW3)
@@ -156,8 +153,6 @@ list(APPEND FREETYPE_LIBRARIES
 
 if(WITH_IMAGE_OPENEXR)
   find_package(OpenEXR)
-  add_bundled_libraries(openexr/lib)
-  add_bundled_libraries(imath/lib)
 endif()
 
 if(WITH_CODEC_FFMPEG)
@@ -206,6 +201,11 @@ if(WITH_JACK)
   string(APPEND PLATFORM_LINKFLAGS " -F/Library/Frameworks -weak_framework jackmp")
 endif()
 
+if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
+  # force cmake to link right framework
+  string(APPEND PLATFORM_LINKFLAGS " /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
+endif()
+
 if(WITH_OPENCOLLADA)
   find_package(OpenCOLLADA)
   find_library(PCRE_LIBRARIES NAMES pcre HINTS ${LIBDIR}/opencollada/lib)
@@ -226,9 +226,6 @@ if(WITH_SDL)
   endif()
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-find_package(Epoxy REQUIRED)
-
 set(PNG_ROOT ${LIBDIR}/png)
 find_package(PNG REQUIRED)
 
@@ -237,12 +234,20 @@ find_package(JPEG REQUIRED)
 
 if(WITH_IMAGE_TIFF)
   set(TIFF_ROOT ${LIBDIR}/tiff)
-  find_package(TIFF REQUIRED)
+  find_package(TIFF)
+  if(NOT TIFF_FOUND)
+    message(WARNING "TIFF not found, disabling WITH_IMAGE_TIFF")
+    set(WITH_IMAGE_TIFF OFF)
+  endif()
 endif()
 
 if(WITH_IMAGE_WEBP)
   set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  find_package(WebP REQUIRED)
+  find_package(WebP)
+  if(NOT WEBP_FOUND)
+    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
+    set(WITH_IMAGE_WEBP OFF)
+  endif()
 endif()
 
 if(WITH_BOOST)
@@ -256,22 +261,12 @@ if(WITH_BOOST)
   if(WITH_OPENVDB)
     list(APPEND _boost_FIND_COMPONENTS iostreams)
   endif()
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    list(APPEND _boost_FIND_COMPONENTS python${PYTHON_VERSION_NO_DOTS})
-  endif()
   find_package(Boost COMPONENTS ${_boost_FIND_COMPONENTS})
 
-  # Boost Python is separate to avoid linking Python into tests that don't need it.
   set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY})
-    list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES})
-  endif()
   set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
   set(BOOST_DEFINITIONS)
 
-  add_bundled_libraries(boost/lib)
-
   mark_as_advanced(Boost_LIBRARIES)
   mark_as_advanced(Boost_INCLUDE_DIRS)
   unset(_boost_FIND_COMPONENTS)
@@ -282,7 +277,11 @@ if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_PUGIXML)
-  find_package(PugiXML REQUIRED)
+  find_package(PugiXML)
+  if(NOT PUGIXML_FOUND)
+    message(WARNING "PugiXML not found, disabling WITH_PUGIXML")
+    set(WITH_PUGIXML OFF)
+  endif()
 endif()
 
 if(WITH_OPENIMAGEIO)
@@ -297,24 +296,23 @@ if(WITH_OPENIMAGEIO)
   )
   set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
   set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
-  add_bundled_libraries(openimageio/lib)
 endif()
 
 if(WITH_OPENCOLORIO)
-  find_package(OpenColorIO 2.0.0 REQUIRED)
-  add_bundled_libraries(opencolorio/lib)
+  find_package(OpenColorIO 2.0.0)
+
+  if(NOT OPENCOLORIO_FOUND)
+    set(WITH_OPENCOLORIO OFF)
+    message(STATUS "OpenColorIO not found, disabling WITH_OPENCOLORIO")
+  endif()
 endif()
 
 if(WITH_OPENVDB)
   find_package(OpenVDB)
   find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/openvdb/lib)
-  if(BLOSC_LIBRARIES)
-    list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
-  else()
-    unset(BLOSC_LIBRARIES CACHE)
-  endif()
+  print_found_status("Blosc" "${BLOSC_LIBRARIES}")
+  list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
   set(OPENVDB_DEFINITIONS)
-  add_bundled_libraries(openvdb/lib)
 endif()
 
 if(WITH_NANOVDB)
@@ -333,18 +331,38 @@ if(WITH_LLVM)
   if(WITH_CLANG)
     find_package(Clang)
     if(NOT CLANG_FOUND)
-      message(FATAL_ERROR "Clang not found.")
+       message(FATAL_ERROR "Clang not found.")
     endif()
   endif()
 
 endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_OSL)
-  find_package(OSL REQUIRED)
+  set(CYCLES_OSL ${LIBDIR}/osl)
+
+  find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+  find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+  find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+  # WARNING! depends on correct order of OSL libs linking
+  list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+  find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+  find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+  find_path(OSL_SHADER_DIR NAMES stdosl.h PATHS ${CYCLES_OSL}/share/OSL/shaders)
+
+  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR)
+    set(OSL_FOUND TRUE)
+  else()
+    message(WARNING "OSL not found, disabling WITH_CYCLES_OSL")
+    set(WITH_CYCLES_OSL OFF)
+  endif()
 endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   find_package(Embree 3.8.0 REQUIRED)
+  # Increase stack size for Embree, only works for executables.
+  if(NOT WITH_PYTHON_MODULE)
+    string(APPEND PLATFORM_LINKFLAGS " -Wl,-stack_size,0x100000")
+  endif()
 
   # Embree static library linking can mix up SSE and AVX symbols, causing
   # crashes on macOS systems with older CPUs that don't have AVX. Using
@@ -358,16 +376,28 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
 endif()
 
 if(WITH_OPENIMAGEDENOISE)
-  find_package(OpenImageDenoise REQUIRED)
+  find_package(OpenImageDenoise)
+
+  if(NOT OPENIMAGEDENOISE_FOUND)
+    set(WITH_OPENIMAGEDENOISE OFF)
+    message(STATUS "OpenImageDenoise not found, disabling WITH_OPENIMAGEDENOISE")
+  endif()
 endif()
 
 if(WITH_TBB)
-  find_package(TBB REQUIRED)
-  add_bundled_libraries(tbb/lib)
+  find_package(TBB)
+  if(NOT TBB_FOUND)
+    message(WARNING "TBB not found, disabling WITH_TBB")
+    set(WITH_TBB OFF)
+  endif()
 endif()
 
 if(WITH_POTRACE)
-  find_package(Potrace REQUIRED)
+  find_package(Potrace)
+  if(NOT POTRACE_FOUND)
+    message(WARNING "potrace not found, disabling WITH_POTRACE")
+    set(WITH_POTRACE OFF)
+  endif()
 endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
@@ -382,31 +412,30 @@ if(WITH_OPENMP)
     set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
     set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
     set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
-    add_bundled_libraries(openmp/lib)
   endif()
 endif()
 
 if(WITH_XR_OPENXR)
-  find_package(XR_OpenXR_SDK REQUIRED)
+  find_package(XR_OpenXR_SDK)
+  if(NOT XR_OPENXR_SDK_FOUND)
+    message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR")
+    set(WITH_XR_OPENXR OFF)
+  endif()
 endif()
 
 if(WITH_GMP)
-  find_package(GMP REQUIRED)
+  find_package(GMP)
+  if(NOT GMP_FOUND)
+    message(WARNING "GMP not found, disabling WITH_GMP")
+    set(WITH_GMP OFF)
+  endif()
 endif()
 
 if(WITH_HARU)
-  find_package(Haru REQUIRED)
-endif()
-
-if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING)
-  find_package(openpgl QUIET)
-  if(openpgl_FOUND)
-    get_target_property(OPENPGL_LIBRARIES openpgl::openpgl LOCATION)
-    get_target_property(OPENPGL_INCLUDE_DIR openpgl::openpgl INTERFACE_INCLUDE_DIRECTORIES)
-    message(STATUS "Found OpenPGL: ${OPENPGL_LIBRARIES}")
-  else()
-    set(WITH_CYCLES_PATH_GUIDING OFF)
-    message(STATUS "OpenPGL not found, disabling WITH_CYCLES_PATH_GUIDING")
+  find_package(Haru)
+  if(NOT HARU_FOUND)
+    message(WARNING "Haru not found, disabling WITH_HARU")
+    set(WITH_HARU OFF)
   endif()
 endif()
 
@@ -417,9 +446,6 @@ if(EXISTS ${LIBDIR})
   without_system_libs_end()
 endif()
 
-# Restore to default.
-set(CMAKE_FIND_FRAMEWORK FIRST)
-
 # ---------------------------------------------------------------------
 # Set compiler and linker flags.
 
@@ -452,9 +478,6 @@ string(APPEND PLATFORM_LINKFLAGS
 string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
 string(APPEND PLATFORM_LINKFLAGS " -stdlib=libc++")
 
-# Make stack size more similar to Embree, required for Embree.
-string(APPEND PLATFORM_LINKFLAGS_EXECUTABLE " -Wl,-stack_size,0x100000")
-
 # Suppress ranlib "has no symbols" warnings (workaround for T48250)
 set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
 set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
@@ -478,33 +501,17 @@ if(WITH_COMPILER_CCACHE)
   endif()
 endif()
 
-if(WITH_COMPILER_ASAN)
-  list(APPEND PLATFORM_BUNDLED_LIBRARIES ${COMPILER_ASAN_LIBRARY})
-endif()
+# For binaries that are built but not installed (also not distributed) (datatoc,
+# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
+# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
+#
+# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
+# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
 
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the location where install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  if(WITH_PYTHON_MODULE)
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/lib")
-  else()
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/lib")
-  endif()
-
-  # For binaries that are built but not installed (like makesdan or tests), we add
-  # the original directory of all shared libraries to the rpath. This is needed because
-  # these can be in different folders, and because the build and install folder may be
-  # different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH ${PLATFORM_BUNDLED_LIBRARY_DIRS})
-
-  # Environment variables to run precompiled executables that needed libraries.
-  list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
-  set(PLATFORM_ENV_BUILD "DYLD_LIBRARY_PATH=\"${_library_paths};${DYLD_LIBRARY_PATH}\"")
-  set(PLATFORM_ENV_INSTALL "DYLD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/Blender.app/Contents/Resources/lib/;$DYLD_LIBRARY_PATH")
-  unset(_library_paths)
-endif()
+set(CMAKE_SKIP_INSTALL_RPATH FALSE)
+list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")
 
 # Same as `CFBundleIdentifier` in Info.plist.
 set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.blenderfoundation.blender")

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -44,22 +44,3 @@ if(UNIX AND DEFINED NANOVDB_INCLUDE_DIR)
     unset_cache_variables("^NANOVDB")
   endif()
 endif()
-
-# Detect update to 3.5 libs with shared libraries.
-if(UNIX AND
-  DEFINED TBB_LIBRARY AND
-  TBB_LIBRARY MATCHES "libtbb.a$" AND
-  EXISTS ${LIBDIR}/usd/include/pxr/base/tf/pyModule.h)
-  message(STATUS "Auto updating CMake configuration for Blender 3.5 libraries")
-  unset_cache_variables("^BLOSC")
-  unset_cache_variables("^BOOST")
-  unset_cache_variables("^Boost")
-  unset_cache_variables("^IMATH")
-  unset_cache_variables("^OPENCOLORIO")
-  unset_cache_variables("^OPENEXR")
-  unset_cache_variables("^OPENIMAGEIO")
-  unset_cache_variables("^OPENSUBDIV")
-  unset_cache_variables("^OPENVDB")
-  unset_cache_variables("^TBB")
-  unset_cache_variables("^USD")
-endif()

build_files/cmake/platform/platform_unix.cmake

@@ -26,6 +26,11 @@ if(NOT DEFINED LIBDIR)
     else()
       set(WITH_LIBC_MALLOC_HOOK_WORKAROUND True)
     endif()
+
+    if(CMAKE_COMPILER_IS_GNUCC AND
+       CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
+      message(FATAL_ERROR "GCC version must be at least 9.3 for precompiled libraries, found ${CMAKE_C_COMPILER_VERSION}")
+    endif()
   endif()
 
   # Avoid namespace pollustion.
@@ -68,7 +73,10 @@ if(EXISTS ${LIBDIR})
   set(Boost_NO_SYSTEM_PATHS ON)
   set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
   set(CLANG_ROOT_DIR ${LIBDIR}/llvm)
-  set(MaterialX_DIR ${LIBDIR}/materialx/lib/cmake/MaterialX)
+endif()
+
+if(WITH_STATIC_LIBS)
+  string(APPEND CMAKE_EXE_LINKER_FLAGS " -static-libstdc++")
 endif()
 
 # Wrapper to prefer static libraries
@@ -94,23 +102,6 @@ find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
-find_package_wrapper(Epoxy REQUIRED)
-
-if(WITH_VULKAN_BACKEND)
-  find_package_wrapper(Vulkan REQUIRED)
-endif()
-
-function(check_freetype_for_brotli)
-  include(CheckSymbolExists)
-  set(CMAKE_REQUIRED_INCLUDES ${FREETYPE_INCLUDE_DIRS})
-  check_symbol_exists(FT_CONFIG_OPTION_USE_BROTLI "freetype/config/ftconfig.h" HAVE_BROTLI)
-  unset(CMAKE_REQUIRED_INCLUDES)
-  if(NOT HAVE_BROTLI)
-    unset(HAVE_BROTLI CACHE)
-    message(FATAL_ERROR "Freetype needs to be compiled with brotli support!")
-  endif()
-  unset(HAVE_BROTLI CACHE)
-endfunction()
 
 if(NOT WITH_SYSTEM_FREETYPE)
   # FreeType compiled with Brotli compression for woff2.
@@ -126,68 +117,47 @@ if(NOT WITH_SYSTEM_FREETYPE)
     #   ${BROTLI_LIBRARIES}
     # )
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_PYTHON)
-  # This could be used, see: D14954 for details.
-  # `find_package(PythonLibs)`
+  # No way to set py35, remove for now.
+  # find_package(PythonLibs)
 
-  # Use our own instead, since without Python is such a rare case,
-  # require this package.
-  # XXX: Linking errors with Debian static Python (sigh).
-  # find_package_wrapper(PythonLibsUnix REQUIRED)
+  # Use our own instead, since without py is such a rare case,
+  # require this package
+  # XXX Linking errors with debian static python :/
+#       find_package_wrapper(PythonLibsUnix REQUIRED)
   find_package(PythonLibsUnix REQUIRED)
-
-  if(WITH_PYTHON_MODULE AND NOT WITH_INSTALL_PORTABLE)
-    # Installing into `site-packages`, warn when installing into `./../lib/`
-    # which script authors almost certainly don't want.
-    if(EXISTS ${LIBDIR})
-      path_is_prefix(LIBDIR PYTHON_SITE_PACKAGES _is_prefix)
-      if(_is_prefix)
-        message(WARNING "
-Building Blender with the following configuration:
-  - WITH_PYTHON_MODULE=ON
-  - WITH_INSTALL_PORTABLE=OFF
-  - LIBDIR=\"${LIBDIR}\"
-  - PYTHON_SITE_PACKAGES=\"${PYTHON_SITE_PACKAGES}\"
-In this case you may want to either:
-  - Use the system Python's site-packages, see:
-    python -c \"import site; print(site.getsitepackages()[0])\"
-  - Set WITH_INSTALL_PORTABLE=ON to create a stand-alone \"bpy\" module
-    which you will need to ensure is in Python's module search path.
-Proceeding with PYTHON_SITE_PACKAGES install target, you have been warned!"
-        )
-      endif()
-      unset(_is_prefix)
-    endif()
-  endif()
 endif()
 
 if(WITH_IMAGE_OPENEXR)
   find_package_wrapper(OpenEXR)  # our own module
-  set_and_warn_library_found("OpenEXR" OPENEXR_FOUND WITH_IMAGE_OPENEXR)
-  if(WITH_IMAGE_OPENEXR)
-    add_bundled_libraries(openexr/lib)
-    add_bundled_libraries(imath/lib)
+  if(NOT OPENEXR_FOUND)
+    set(WITH_IMAGE_OPENEXR OFF)
   endif()
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
   find_package_wrapper(OpenJPEG)
-  set_and_warn_library_found("OpenJPEG" OPENJPEG_FOUND WITH_IMAGE_OPENJPEG)
+  if(NOT OPENJPEG_FOUND)
+    set(WITH_IMAGE_OPENJPEG OFF)
+  endif()
 endif()
 
 if(WITH_IMAGE_TIFF)
   # XXX Linking errors with debian static tiff :/
 #       find_package_wrapper(TIFF)
   find_package(TIFF)
-  set_and_warn_library_found("TIFF" TIFF_FOUND WITH_IMAGE_TIFF)
+  if(NOT TIFF_FOUND)
+    set(WITH_IMAGE_TIFF OFF)
+  endif()
 endif()
 
 if(WITH_OPENAL)
   find_package_wrapper(OpenAL)
-  set_and_warn_library_found("OpenAL" OPENAL_FOUND WITH_OPENAL)
+  if(NOT OPENAL_FOUND)
+    set(WITH_OPENAL OFF)
+  endif()
 endif()
 
 if(WITH_SDL)
@@ -209,14 +179,18 @@ if(WITH_SDL)
       SDL_LIBRARY
     )
     # unset(SDLMAIN_LIBRARY CACHE)
-    set_and_warn_library_found("SDL" SDL_FOUND WITH_SDL)
+    if(NOT SDL_FOUND)
+      set(WITH_SDL OFF)
+    endif()
   endif()
 endif()
 
 # Codecs
 if(WITH_CODEC_SNDFILE)
   find_package_wrapper(SndFile)
-  set_and_warn_library_found("libsndfile" SNDFILE_FOUND WITH_CODEC_SNDFILE)
+  if(NOT SNDFILE_FOUND)
+    set(WITH_CODEC_SNDFILE OFF)
+  endif()
 endif()
 
 if(WITH_CODEC_FFMPEG)
@@ -244,12 +218,17 @@ if(WITH_CODEC_FFMPEG)
   endif()
   find_package(FFmpeg)
 
-  set_and_warn_library_found("FFmpeg" FFMPEG_FOUND WITH_CODEC_FFMPEG)
+  if(NOT FFMPEG_FOUND)
+    set(WITH_CODEC_FFMPEG OFF)
+    message(STATUS "FFmpeg not found, disabling it")
+  endif()
 endif()
 
 if(WITH_FFTW3)
   find_package_wrapper(Fftw3)
-  set_and_warn_library_found("fftw3" FFTW3_FOUND WITH_FFTW3)
+  if(NOT FFTW3_FOUND)
+    set(WITH_FFTW3 OFF)
+  endif()
 endif()
 
 if(WITH_OPENCOLLADA)
@@ -264,23 +243,25 @@ if(WITH_OPENCOLLADA)
     endif()
     find_package_wrapper(XML2)
   else()
-    set_and_warn_library_found("OpenCollada" OPENCOLLADA_FOUND WITH_OPENCOLLADA)
+    set(WITH_OPENCOLLADA OFF)
   endif()
 endif()
 
 if(WITH_MEM_JEMALLOC)
   find_package_wrapper(JeMalloc)
-  set_and_warn_library_found("JeMalloc" JEMALLOC_FOUND WITH_MEM_JEMALLOC)
+  if(NOT JEMALLOC_FOUND)
+    set(WITH_MEM_JEMALLOC OFF)
+  endif()
 endif()
 
 if(WITH_INPUT_NDOF)
   find_package_wrapper(Spacenav)
-  set_and_warn_library_found("SpaceNav" SPACENAV_FOUND WITH_INPUT_NDOF)
-
   if(SPACENAV_FOUND)
     # use generic names within blenders buildsystem.
     set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
     set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
+  else()
+    set(WITH_INPUT_NDOF OFF)
   endif()
 endif()
 
@@ -290,8 +271,6 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
     set(OSL_ROOT ${CYCLES_OSL})
   endif()
   find_package_wrapper(OSL)
-  set_and_warn_library_found("OSL" OSL_FOUND WITH_CYCLES_OSL)
-
   if(OSL_FOUND)
     if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")
       # Note: --whole-archive is needed to force loading of all symbols in liboslexec,
@@ -302,44 +281,45 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
         -Wl,--no-whole-archive ${OSL_OSLQUERY_LIBRARY}
       )
     endif()
+  else()
+    message(STATUS "OSL not found, disabling it from Cycles")
+    set(WITH_CYCLES_OSL OFF)
   endif()
 endif()
 
-if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
+if(WITH_CYCLES_DEVICE_ONEAPI)
   set(CYCLES_LEVEL_ZERO ${LIBDIR}/level-zero CACHE PATH "Path to Level Zero installation")
   if(EXISTS ${CYCLES_LEVEL_ZERO} AND NOT LEVEL_ZERO_ROOT_DIR)
     set(LEVEL_ZERO_ROOT_DIR ${CYCLES_LEVEL_ZERO})
   endif()
 
-  set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
+  set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to DPC++ and SYCL installation")
   if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
     set(SYCL_ROOT_DIR ${CYCLES_SYCL})
   endif()
-  file(GLOB _sycl_runtime_libraries
-    ${SYCL_ROOT_DIR}/lib/libsycl.so
-    ${SYCL_ROOT_DIR}/lib/libsycl.so.*
-    ${SYCL_ROOT_DIR}/lib/libpi_*.so
-  )
-  list(FILTER _sycl_runtime_libraries EXCLUDE REGEX ".*\.py")
-  list(REMOVE_ITEM _sycl_runtime_libraries "${SYCL_ROOT_DIR}/lib/libpi_opencl.so")
-  list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
-  unset(_sycl_runtime_libraries)
 endif()
 
 if(WITH_OPENVDB)
-  find_package(OpenVDB)
-  set_and_warn_library_found("OpenVDB" OPENVDB_FOUND WITH_OPENVDB)
-
-  if(OPENVDB_FOUND)
-  add_bundled_libraries(openvdb/lib)
+  find_package_wrapper(OpenVDB)
   find_package_wrapper(Blosc)
-    set_and_warn_library_found("Blosc" BLOSC_FOUND WITH_OPENVDB_BLOSC)
+
+  if(NOT OPENVDB_FOUND)
+    set(WITH_OPENVDB OFF)
+    set(WITH_OPENVDB_BLOSC OFF)
+    message(STATUS "OpenVDB not found, disabling it")
+  elseif(NOT BLOSC_FOUND)
+    set(WITH_OPENVDB_BLOSC OFF)
+    message(STATUS "Blosc not found, disabling it for OpenVBD")
   endif()
 endif()
 
 if(WITH_NANOVDB)
   find_package_wrapper(NanoVDB)
-  set_and_warn_library_found("NanoVDB" NANOVDB_FOUND WITH_NANOVDB)
+
+  if(NOT NANOVDB_FOUND)
+    set(WITH_NANOVDB OFF)
+    message(STATUS "NanoVDB not found, disabling it")
+  endif()
 endif()
 
 if(WITH_CPU_SIMD AND SUPPORT_NEON_BUILD)
@@ -348,22 +328,17 @@ endif()
 
 if(WITH_ALEMBIC)
   find_package_wrapper(Alembic)
-  set_and_warn_library_found("Alembic" ALEMBIC_FOUND WITH_ALEMBIC)
+
+  if(NOT ALEMBIC_FOUND)
+    set(WITH_ALEMBIC OFF)
+  endif()
 endif()
 
 if(WITH_USD)
   find_package_wrapper(USD)
-  set_and_warn_library_found("USD" USD_FOUND WITH_USD)
- if(WITH_USD)
-    add_bundled_libraries(usd/lib)
- endif()
-endif()
 
-if(WITH_MATERIALX)
-  find_package_wrapper(MaterialX)
-  set_and_warn_library_found("MaterialX" MaterialX_FOUND WITH_MATERIALX)
-  if(WITH_MATERIALX)
-    add_bundled_libraries(materialx/lib)
+  if(NOT USD_FOUND)
+    set(WITH_USD OFF)
   endif()
 endif()
 
@@ -371,7 +346,7 @@ if(WITH_BOOST)
   # uses in build instructions to override include and library variables
   if(NOT BOOST_CUSTOM)
     if(WITH_STATIC_LIBS)
-      set(Boost_USE_STATIC_LIBS OFF)
+      set(Boost_USE_STATIC_LIBS ON)
     endif()
     set(Boost_USE_MULTITHREADED ON)
     set(__boost_packages filesystem regex thread date_time)
@@ -387,9 +362,6 @@ if(WITH_BOOST)
     if(WITH_OPENVDB)
       list(APPEND __boost_packages iostreams)
     endif()
-    if(WITH_USD AND USD_PYTHON_SUPPORT)
-      list(APPEND __boost_packages python${PYTHON_VERSION_NO_DOTS})
-    endif()
     list(APPEND __boost_packages system)
     find_package(Boost 1.48 COMPONENTS ${__boost_packages})
     if(NOT Boost_FOUND)
@@ -407,13 +379,8 @@ if(WITH_BOOST)
     mark_as_advanced(Boost_INCLUDE_DIR)  # why doesn't boost do this?
   endif()
 
-  # Boost Python is separate to avoid linking Python into tests that don't need it.
-  set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY})
-    list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES})
-  endif()
   set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
+  set(BOOST_LIBRARIES ${Boost_LIBRARIES})
   set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
   set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 
@@ -421,19 +388,24 @@ if(WITH_BOOST)
     find_package(IcuLinux)
     list(APPEND BOOST_LIBRARIES ${ICU_LIBRARIES})
   endif()
-
-  add_bundled_libraries(boost/lib)
 endif()
 
 if(WITH_PUGIXML)
   find_package_wrapper(PugiXML)
-  set_and_warn_library_found("PugiXML" PUGIXML_FOUND WITH_PUGIXML)
+
+  if(NOT PUGIXML_FOUND)
+    set(WITH_PUGIXML OFF)
+    message(STATUS "PugiXML not found, disabling WITH_PUGIXML")
+  endif()
 endif()
 
 if(WITH_IMAGE_WEBP)
   set(WEBP_ROOT_DIR ${LIBDIR}/webp)
   find_package_wrapper(WebP)
-  set_and_warn_library_found("WebP" WEBP_FOUND WITH_IMAGE_WEBP)
+  if(NOT WEBP_FOUND)
+    set(WITH_IMAGE_WEBP OFF)
+    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
+  endif()
 endif()
 
 if(WITH_OPENIMAGEIO)
@@ -445,6 +417,7 @@ if(WITH_OPENIMAGEIO)
     ${ZLIB_LIBRARIES}
     ${BOOST_LIBRARIES}
   )
+  set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
   set(OPENIMAGEIO_DEFINITIONS "")
 
   if(WITH_IMAGE_TIFF)
@@ -457,20 +430,22 @@ if(WITH_OPENIMAGEIO)
     list(APPEND OPENIMAGEIO_LIBRARIES "${WEBP_LIBRARIES}")
   endif()
 
-  set_and_warn_library_found("OPENIMAGEIO" OPENIMAGEIO_FOUND WITH_OPENIMAGEIO)
-  if(WITH_OPENIMAGEIO)
-    add_bundled_libraries(openimageio/lib)
+  if(NOT OPENIMAGEIO_FOUND)
+    set(WITH_OPENIMAGEIO OFF)
+    message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
   endif()
 endif()
 
 if(WITH_OPENCOLORIO)
   find_package_wrapper(OpenColorIO 2.0.0)
 
+  set(OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBRARIES})
+  set(OPENCOLORIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
   set(OPENCOLORIO_DEFINITIONS)
-  set_and_warn_library_found("OpenColorIO" OPENCOLORIO_FOUND WITH_OPENCOLORIO)
 
-  if(WITH_OPENCOLORIO)
-    add_bundled_libraries(opencolorio/lib)
+  if(NOT OPENCOLORIO_FOUND)
+    set(WITH_OPENCOLORIO OFF)
+    message(STATUS "OpenColorIO not found")
   endif()
 endif()
 
@@ -480,7 +455,11 @@ endif()
 
 if(WITH_OPENIMAGEDENOISE)
   find_package_wrapper(OpenImageDenoise)
-  set_and_warn_library_found("OpenImageDenoise" OPENIMAGEDENOISE_FOUND WITH_OPENIMAGEDENOISE)
+
+  if(NOT OPENIMAGEDENOISE_FOUND)
+    set(WITH_OPENIMAGEDENOISE OFF)
+    message(STATUS "OpenImageDenoise not found")
+  endif()
 endif()
 
 if(WITH_LLVM)
@@ -489,72 +468,77 @@ if(WITH_LLVM)
   endif()
 
   find_package_wrapper(LLVM)
-  set_and_warn_library_found("LLVM" LLVM_FOUND WITH_LLVM)
-
-  if(LLVM_FOUND)
-    if(WITH_CLANG)
-      find_package_wrapper(Clang)
-      set_and_warn_library_found("Clang" CLANG_FOUND WITH_CLANG)
+  if(WITH_CLANG)
+    find_package_wrapper(Clang)
+  endif()
+  # Symbol conflicts with same UTF library used by OpenCollada
+  if(EXISTS ${LIBDIR})
+    if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0"))
+      list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY})
     endif()
+  endif()
 
-    # Symbol conflicts with same UTF library used by OpenCollada
-    if(EXISTS ${LIBDIR})
-      if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0"))
-        list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY})
-      endif()
+  if(NOT LLVM_FOUND)
+    set(WITH_LLVM OFF)
+    set(WITH_CLANG OFF)
+    message(STATUS "LLVM not found")
+  else()
+    if(NOT CLANG_FOUND)
+      set(WITH_CLANG OFF)
+      message(STATUS "Clang not found")
     endif()
   endif()
 endif()
 
 if(WITH_OPENSUBDIV)
-  find_package(OpenSubdiv)
+  find_package_wrapper(OpenSubdiv)
 
   set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
   set(OPENSUBDIV_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 
-  set_and_warn_library_found("OpenSubdiv" OPENSUBDIV_FOUND WITH_OPENSUBDIV)
-  if(WITH_OPENSUBDIV)
-    add_bundled_libraries(opensubdiv/lib)
+  if(NOT OPENSUBDIV_FOUND)
+    set(WITH_OPENSUBDIV OFF)
+    message(STATUS "OpenSubdiv not found")
   endif()
 endif()
 
 if(WITH_TBB)
   find_package_wrapper(TBB)
-  set_and_warn_library_found("TBB" TBB_FOUND WITH_TBB)
-  if(WITH_TBB)
-    add_bundled_libraries(tbb/lib)
+  if(NOT TBB_FOUND)
+    message(WARNING "TBB not found, disabling WITH_TBB")
+    set(WITH_TBB OFF)
   endif()
 endif()
 
 if(WITH_XR_OPENXR)
   find_package(XR_OpenXR_SDK)
-  set_and_warn_library_found("OpenXR-SDK" XR_OPENXR_SDK_FOUND WITH_XR_OPENXR)
+  if(NOT XR_OPENXR_SDK_FOUND)
+    message(WARNING "OpenXR-SDK not found, disabling WITH_XR_OPENXR")
+    set(WITH_XR_OPENXR OFF)
+  endif()
 endif()
 
 if(WITH_GMP)
   find_package_wrapper(GMP)
-  set_and_warn_library_found("GMP" GMP_FOUND WITH_GMP)
+  if(NOT GMP_FOUND)
+    message(WARNING "GMP not found, disabling WITH_GMP")
+    set(WITH_GMP OFF)
+  endif()
 endif()
 
 if(WITH_POTRACE)
   find_package_wrapper(Potrace)
-  set_and_warn_library_found("Potrace" POTRACE_FOUND WITH_POTRACE)
+  if(NOT POTRACE_FOUND)
+    message(WARNING "potrace not found, disabling WITH_POTRACE")
+    set(WITH_POTRACE OFF)
+  endif()
 endif()
 
 if(WITH_HARU)
   find_package_wrapper(Haru)
-  set_and_warn_library_found("Haru" HARU_FOUND WITH_HARU)
-endif()
-
-if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING)
-  find_package_wrapper(openpgl)
-  if(openpgl_FOUND)
-    get_target_property(OPENPGL_LIBRARIES openpgl::openpgl LOCATION)
-    get_target_property(OPENPGL_INCLUDE_DIR openpgl::openpgl INTERFACE_INCLUDE_DIRECTORIES)
-    message(STATUS "Found OpenPGL: ${OPENPGL_LIBRARIES}")
-  else()
-    set(WITH_CYCLES_PATH_GUIDING OFF)
-    message(STATUS "OpenPGL not found, disabling WITH_CYCLES_PATH_GUIDING")
+  if(NOT HARU_FOUND)
+    message(WARNING "Haru not found, disabling WITH_HARU")
+    set(WITH_HARU OFF)
   endif()
 endif()
 
@@ -610,7 +594,6 @@ if(WITH_SYSTEM_FREETYPE)
   if(NOT FREETYPE_FOUND)
     message(FATAL_ERROR "Failed finding system FreeType version!")
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_LZO AND WITH_SYSTEM_LZO)
@@ -630,136 +613,70 @@ endif()
 # Jack is intended to use the system library.
 if(WITH_JACK)
   find_package_wrapper(Jack)
-  set_and_warn_library_found("JACK" JACK_FOUND WITH_JACK)
+  if(NOT JACK_FOUND)
+    set(WITH_JACK OFF)
+  endif()
 endif()
 
 # Pulse is intended to use the system library.
 if(WITH_PULSEAUDIO)
   find_package_wrapper(Pulse)
-  set_and_warn_library_found("PulseAudio" PULSE_FOUND WITH_PULSEAUDIO)
+  if(NOT PULSE_FOUND)
+    set(WITH_PULSEAUDIO OFF)
+  endif()
 endif()
 
 # Audio IO
 if(WITH_SYSTEM_AUDASPACE)
   find_package_wrapper(Audaspace)
-  set(AUDASPACE_FOUND ${AUDASPACE_FOUND} AND ${AUDASPACE_C_FOUND})
-  set_and_warn_library_found("External Audaspace" AUDASPACE_FOUND WITH_SYSTEM_AUDASPACE)
+  if(NOT AUDASPACE_FOUND OR NOT AUDASPACE_C_FOUND)
+    message(FATAL_ERROR "Audaspace external library not found!")
+  endif()
 endif()
 
 if(WITH_GHOST_WAYLAND)
   find_package(PkgConfig)
-  pkg_check_modules(xkbcommon xkbcommon)
+  pkg_check_modules(wayland-client REQUIRED wayland-client>=1.12)
+  pkg_check_modules(wayland-egl REQUIRED wayland-egl)
+  pkg_check_modules(wayland-scanner REQUIRED wayland-scanner)
+  pkg_check_modules(xkbcommon REQUIRED xkbcommon)
+  pkg_check_modules(wayland-cursor REQUIRED wayland-cursor)
 
-  # When dynamically linked WAYLAND is used and `${LIBDIR}/wayland` is present,
-  # there is no need to search for the libraries as they are not needed for building.
-  # Only the headers are needed which can reference the known paths.
-  if(EXISTS "${LIBDIR}/wayland" AND WITH_GHOST_WAYLAND_DYNLOAD)
-    set(_use_system_wayland OFF)
-  else()
-    set(_use_system_wayland ON)
+  if(WITH_GHOST_WAYLAND_DBUS)
+    pkg_check_modules(dbus REQUIRED dbus-1)
   endif()
 
-  if(_use_system_wayland)
-    pkg_check_modules(wayland-client wayland-client>=1.12)
-    pkg_check_modules(wayland-egl wayland-egl)
-    pkg_check_modules(wayland-scanner wayland-scanner)
-    pkg_check_modules(wayland-cursor wayland-cursor)
-    pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
-    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-  else()
-    # CentOS 7 packages have too old a version, a newer version exist in the
-    # precompiled libraries.
-    find_path(WAYLAND_PROTOCOLS_DIR
-      NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-      PATH_SUFFIXES share/wayland-protocols
-      PATHS ${LIBDIR}/wayland-protocols
+  if(WITH_GHOST_WAYLAND_LIBDECOR)
+    pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1)
+  endif()
+
+  list(APPEND PLATFORM_LINKLIBS
+    ${xkbcommon_LINK_LIBRARIES}
+  )
+
+  if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
+    list(APPEND PLATFORM_LINKLIBS
+      ${wayland-client_LINK_LIBRARIES}
+      ${wayland-egl_LINK_LIBRARIES}
+      ${wayland-cursor_LINK_LIBRARIES}
     )
-
-    if(EXISTS ${WAYLAND_PROTOCOLS_DIR})
-      set(wayland-protocols_FOUND ON)
-    endif()
-
-    set(wayland-client_INCLUDE_DIRS "${LIBDIR}/wayland/include")
-    set(wayland-egl_INCLUDE_DIRS "${LIBDIR}/wayland/include")
-    set(wayland-cursor_INCLUDE_DIRS "${LIBDIR}/wayland/include")
-
-    set(wayland-client_FOUND ON)
-    set(wayland-egl_FOUND ON)
-    set(wayland-scanner_FOUND ON)
-    set(wayland-cursor_FOUND ON)
   endif()
-  mark_as_advanced(WAYLAND_PROTOCOLS_DIR)
 
-  set_and_warn_library_found("wayland-client" wayland-client_FOUND WITH_GHOST_WAYLAND)
-  set_and_warn_library_found("wayland-egl" wayland-egl_FOUND WITH_GHOST_WAYLAND)
-  set_and_warn_library_found("wayland-scanner" wayland-scanner_FOUND WITH_GHOST_WAYLAND)
-  set_and_warn_library_found("wayland-cursor" wayland-cursor_FOUND WITH_GHOST_WAYLAND)
-  set_and_warn_library_found("wayland-protocols" wayland-protocols_FOUND WITH_GHOST_WAYLAND)
-  set_and_warn_library_found("xkbcommon" xkbcommon_FOUND WITH_GHOST_WAYLAND)
+  if(WITH_GHOST_WAYLAND_DBUS)
+    list(APPEND PLATFORM_LINKLIBS
+      ${dbus_LINK_LIBRARIES}
+    )
+    add_definitions(-DWITH_GHOST_WAYLAND_DBUS)
+  endif()
 
-  if(WITH_GHOST_WAYLAND)
-    if(WITH_GHOST_WAYLAND_DBUS)
-      pkg_check_modules(dbus REQUIRED dbus-1)
-    endif()
-
-    if(WITH_GHOST_WAYLAND_LIBDECOR)
-      if(_use_system_wayland)
-        pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1)
-      else()
-        set(libdecor_INCLUDE_DIRS "${LIBDIR}/wayland_libdecor/include/libdecor-0")
-      endif()
-    endif()
-
-    if(WITH_GHOST_WAYLAND_DBUS)
-      add_definitions(-DWITH_GHOST_WAYLAND_DBUS)
-    endif()
-
-    if(WITH_GHOST_WAYLAND_LIBDECOR)
-      add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR)
-    endif()
-
-    if(EXISTS "${LIBDIR}/wayland/bin/wayland-scanner")
-      set(WAYLAND_SCANNER "${LIBDIR}/wayland/bin/wayland-scanner")
-    else()
-      pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-    endif()
-    mark_as_advanced(WAYLAND_SCANNER)
-
-    # When using dynamic loading, headers generated
-    # from older versions of `wayland-scanner` aren't compatible.
-    if(WITH_GHOST_WAYLAND_DYNLOAD)
-      execute_process(
-        COMMAND ${WAYLAND_SCANNER} --version
-        # The version is written to the `stderr`.
-        ERROR_VARIABLE _wayland_scanner_out
-        ERROR_STRIP_TRAILING_WHITESPACE
+  if(WITH_GHOST_WAYLAND_LIBDECOR)
+    if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
+      list(APPEND PLATFORM_LINKLIBS
+        ${libdecor_LIBRARIES}
       )
-      if(NOT "${_wayland_scanner_out}" STREQUAL "")
-        string(
-          REGEX REPLACE
-          "^wayland-scanner[ \t]+([0-9]+)\.([0-9]+).*"
-          "\\1.\\2"
-          _wayland_scanner_ver
-          "${_wayland_scanner_out}"
-        )
-        if("${_wayland_scanner_ver}" VERSION_LESS "1.20")
-          message(
-            FATAL_ERROR
-            "Found ${WAYLAND_SCANNER} version \"${_wayland_scanner_ver}\", "
-            "the minimum version is 1.20!"
-          )
-        endif()
-        unset(_wayland_scanner_ver)
-      else()
-        message(WARNING "Unable to access the version from ${WAYLAND_SCANNER}, continuing.")
-      endif()
-      unset(_wayland_scanner_out)
     endif()
-    # End wayland-scanner version check.
-
+    add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR)
   endif()
-
-  unset(_use_system_wayland)
 endif()
 
 if(WITH_GHOST_X11)
@@ -768,8 +685,12 @@ if(WITH_GHOST_X11)
   find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
   mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
 
+  list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
+
   if(WITH_X11_XINPUT)
-    if(NOT X11_Xinput_LIB)
+    if(X11_Xinput_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+    else()
       message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you
       want to build without tablet support")
     endif()
@@ -779,14 +700,18 @@ if(WITH_GHOST_X11)
     # XXX, why doesn't cmake make this available?
     find_library(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
     mark_as_advanced(X11_Xxf86vmode_LIB)
-    if(NOT X11_Xxf86vmode_LIB)
+    if(X11_Xxf86vmode_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
+    else()
       message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you
       want to build without")
     endif()
   endif()
 
   if(WITH_X11_XFIXES)
-    if(NOT X11_Xfixes_LIB)
+    if(X11_Xfixes_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
+    else()
       message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you
       want to build without")
     endif()
@@ -795,7 +720,9 @@ if(WITH_GHOST_X11)
   if(WITH_X11_ALPHA)
     find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
     mark_as_advanced(X11_Xrender_LIB)
-    if(NOT X11_Xrender_LIB)
+    if(X11_Xrender_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
+    else()
       message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you
       want to build without")
     endif()
@@ -869,8 +796,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
           "The mold linker could not find the directory containing the linker command "
           "(typically "
           "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
-          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker."
-        )
+          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
         set(WITH_LINKER_MOLD OFF)
       endif()
       unset(MOLD_PREFIX)
@@ -993,45 +919,44 @@ if(WITH_COMPILER_CCACHE)
   endif()
 endif()
 
-# Always link with libatomic if available, as it is required for data types
-# which don't have intrinsics.
-function(configure_atomic_lib_if_needed)
+# On some platforms certain atomic operations are not possible with assembly and/or intrinsics and
+# they are emulated in software with locks. For example, on armel there is no intrinsics to grant
+# 64 bit atomic operations and STL library uses libatomic to offload software emulation of atomics
+# to.
+# This function will check whether libatomic is required and if so will configure linker flags.
+# If atomic operations are possible without libatomic then linker flags are left as-is.
+function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
+  # Source which is used to enforce situation when software emulation of atomics is required.
+  # Assume that using 64bit integer gives a definitive answer (as in, if 64bit atomic operations
+  # are possible using assembly/intrinsics 8, 16, and 32 bit operations will also be possible.
   set(_source
       "#include <atomic>
       #include <cstdint>
       int main(int argc, char **argv) {
         std::atomic<uint64_t> uint64; uint64++;
         return 0;
-      }"
-  )
+      }")
 
   include(CheckCXXSourceCompiles)
-  set(CMAKE_REQUIRED_LIBRARIES atomic)
-  check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC)
-  unset(CMAKE_REQUIRED_LIBRARIES)
+  check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITHOUT_LIBATOMIC)
 
-  if(ATOMIC_OPS_WITH_LIBATOMIC)
-    set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE)
+  if(NOT ATOMIC_OPS_WITHOUT_LIBATOMIC)
+    # Compilation of the test program has failed.
+    # Try it again with -latomic to see if this is what is needed, or whether something else is
+    # going on.
+
+    set(CMAKE_REQUIRED_LIBRARIES atomic)
+    check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC)
+
+    if(ATOMIC_OPS_WITH_LIBATOMIC)
+      set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE)
+    else()
+      # Atomic operations are required part of Blender and it is not possible to process forward.
+      # We expect that either standard library or libatomic will make atomics to work. If both
+      # cases has failed something fishy o na bigger scope is going on.
+      message(FATAL_ERROR "Failed to detect required configuration for atomic operations")
+    endif()
   endif()
 endfunction()
 
-configure_atomic_lib_if_needed()
-
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the relative path where the install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  list(APPEND CMAKE_INSTALL_RPATH $ORIGIN/lib)
-
-  # For executables that are built but not installed (mainly tests) we set an absolute
-  # rpath to the lib folder. This is needed because these can be in different folders,
-  # and because the build and install folder may be different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH $ORIGIN/lib ${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib)
-
-  # Environment variables to run precompiled executables that needed libraries.
-  list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
-  set(PLATFORM_ENV_BUILD "LD_LIBRARY_PATH=\"${_library_paths};${LD_LIBRARY_PATH}\"")
-  set(PLATFORM_ENV_INSTALL "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib/;$LD_LIBRARY_PATH")
-  unset(_library_paths)
-endif()
+CONFIGURE_ATOMIC_LIB_IF_NEEDED()

build_files/cmake/platform/platform_win32.cmake

@@ -26,7 +26,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(OPENMP_FOUND ON)
     set(OpenMP_C_FLAGS "/clang:-fopenmp")
     set(OpenMP_CXX_FLAGS "/clang:-fopenmp")
-    get_filename_component(LLVMROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM;]" ABSOLUTE CACHE)
+    GET_FILENAME_COMPONENT(LLVMROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM;]" ABSOLUTE CACHE)
     set(CLANG_OPENMP_DLL "${LLVMROOT}/bin/libomp.dll")
     set(CLANG_OPENMP_LIB "${LLVMROOT}/lib/libomp.lib")
     if(NOT EXISTS "${CLANG_OPENMP_DLL}")
@@ -74,6 +74,27 @@ add_definitions(-DWIN32)
 add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 
+# Minimum MSVC Version
+if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+  if(MSVC_VERSION EQUAL 1800)
+    set(_min_ver "18.0.31101")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+      message(FATAL_ERROR
+        "Visual Studio 2013 (Update 4, ${_min_ver}) required, "
+        "found (${CMAKE_CXX_COMPILER_VERSION})")
+    endif()
+  endif()
+  if(MSVC_VERSION EQUAL 1900)
+    set(_min_ver "19.0.24210")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+      message(FATAL_ERROR
+        "Visual Studio 2015 (Update 3, ${_min_ver}) required, "
+        "found (${CMAKE_CXX_COMPILER_VERSION})")
+    endif()
+  endif()
+endif()
+unset(_min_ver)
+
 # needed for some MSVC installations
 # 4099 : PDB 'filename' was not found with 'object/library'
 string(APPEND CMAKE_EXE_LINKER_FLAGS " /SAFESEH:NO /ignore:4099")
@@ -83,7 +104,7 @@ string(APPEND CMAKE_MODULE_LINKER_FLAGS " /SAFESEH:NO /ignore:4099")
 list(APPEND PLATFORM_LINKLIBS
   ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 Comctl32 version
   advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp Shlwapi
-  pathcch Shcore Dwmapi Crypt32
+  pathcch Shcore Dwmapi
 )
 
 if(WITH_INPUT_IME)
@@ -110,41 +131,7 @@ remove_cc_flag("/GR")
 
 # Make the Windows 8.1 API available for use.
 add_definitions(-D_WIN32_WINNT=0x603)
-
-# First generate the manifest for tests since it will not need the dependency on the CRT.
-configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
-
-if(WITH_WINDOWS_BUNDLE_CRT)
-  set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-  set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-  set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
-  include(InstallRequiredSystemLibraries)
-
-  # ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
-  # redirects for this dll, for details see T88813.
-  foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
-    string(FIND ${lib} "ucrtbase" pos)
-    if(NOT pos EQUAL -1)
-      list(REMOVE_ITEM CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
-      install(FILES ${lib} DESTINATION . COMPONENT Libraries)
-    endif()
-  endforeach()
-  # Install the CRT to the blender.crt Sub folder.
-  install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ./blender.crt COMPONENT Libraries)
-
-  windows_generate_manifest(
-    FILES "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}"
-    OUTPUT "${CMAKE_BINARY_DIR}/blender.crt.manifest"
-    NAME "blender.crt"
-  )
-
-  install(FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest DESTINATION ./blender.crt)
-  set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-  set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-endif()
-configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)
-
-
+include(build_files/cmake/platform/platform_win32_bundle_crt.cmake)
 remove_cc_flag("/MDd" "/MD" "/Zi")
 
 if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
@@ -159,7 +146,7 @@ endif()
 if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
   if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
     #set a flag so we don't have to do this comparison all the time
-    set(MSVC_ASAN ON)
+    SET(MSVC_ASAN ON)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
     set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /fsanitize=address")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
@@ -171,7 +158,7 @@ endif()
 
 
 # C++ standards conformace (/permissive-) is available on msvc 15.5 (1912) and up
-if(NOT MSVC_CLANG)
+if(MSVC_VERSION GREATER 1911 AND NOT MSVC_CLANG)
   string(APPEND CMAKE_CXX_FLAGS " /permissive-")
   # Two-phase name lookup does not place nicely with OpenMP yet, so disable for now
   string(APPEND CMAKE_CXX_FLAGS " /Zc:twoPhase-")
@@ -184,11 +171,10 @@ endif()
 
 # Debug Symbol format
 # sccache # MSVC_ASAN # format # why
-# ON      # ON        # Z7     # sccache will only play nice with Z7.
-# ON      # OFF       # Z7     # sccache will only play nice with Z7.
-# OFF     # ON        # Zi     # Asan will not play nice with Edit and Continue.
-# OFF     # OFF       # ZI     # Neither ASAN nor sscache is enabled Edit and
-#                                Continue is available.
+# ON      # ON        # Z7     # sccache will only play nice with Z7
+# ON      # OFF       # Z7     # sccache will only play nice with Z7
+# OFF     # ON        # Zi     # Asan will not play nice with Edit and Continue
+# OFF     # OFF       # ZI     # Neither asan nor sscache is enabled Edit and Continue is available
 
 # Release Symbol format
 # sccache # MSVC_ASAN # format # why
@@ -199,20 +185,20 @@ endif()
 
 
 if(WITH_WINDOWS_SCCACHE)
-  set(CMAKE_C_COMPILER_LAUNCHER sccache)
-  set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
-  set(SYMBOL_FORMAT /Z7)
-  set(SYMBOL_FORMAT_RELEASE /Z7)
-else()
-  unset(CMAKE_C_COMPILER_LAUNCHER)
-  unset(CMAKE_CXX_COMPILER_LAUNCHER)
-  if(MSVC_ASAN)
+    set(CMAKE_C_COMPILER_LAUNCHER sccache)
+    set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
     set(SYMBOL_FORMAT /Z7)
     set(SYMBOL_FORMAT_RELEASE /Z7)
-  else()
-    set(SYMBOL_FORMAT /ZI)
-    set(SYMBOL_FORMAT_RELEASE /Zi)
-  endif()
+else()
+    unset(CMAKE_C_COMPILER_LAUNCHER)
+    unset(CMAKE_CXX_COMPILER_LAUNCHER)
+    if(MSVC_ASAN)
+      set(SYMBOL_FORMAT /Z7)
+      set(SYMBOL_FORMAT_RELEASE /Z7)
+    else()
+      set(SYMBOL_FORMAT /ZI)
+      set(SYMBOL_FORMAT_RELEASE /Zi)
+    endif()
 endif()
 
 if(WITH_WINDOWS_PDB)
@@ -232,7 +218,7 @@ unset(SYMBOL_FORMAT)
 unset(SYMBOL_FORMAT_RELEASE)
 
 # JMC is available on msvc 15.8 (1915) and up
-if(NOT MSVC_CLANG)
+if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
   string(APPEND CMAKE_CXX_FLAGS_DEBUG " /JMC")
 endif()
 
@@ -265,6 +251,9 @@ if(NOT DEFINED LIBDIR)
   elseif(MSVC_VERSION GREATER 1919)
     message(STATUS "Visual Studio 2019 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
+  elseif(MSVC_VERSION GREATER 1909)
+    message(STATUS "Visual Studio 2017 detected.")
+    set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   endif()
 else()
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
@@ -275,8 +264,10 @@ endif()
 
 include(platform_old_libs_update)
 
-# Only supported in the VS IDE & Clang Tidy needs to be on.
-if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND WITH_CLANG_TIDY)
+if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND # Only supported in the VS IDE
+   MSVC_VERSION GREATER_EQUAL 1924            AND # Supported for 16.4+
+   WITH_CLANG_TIDY                                # And Clang Tidy needs to be on
+  )
   set(CMAKE_VS_GLOBALS
     "RunCodeAnalysis=false"
     "EnableMicrosoftCodeAnalysis=false"
@@ -285,14 +276,10 @@ if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND WITH_CLANG_TIDY)
   set(VS_CLANG_TIDY ON)
 endif()
 
-# To support building against both 3.4 and 3.5 lib folders, disable materialX if it is not found
-set(MATERIALX_LIB_FOLDER_EXISTS EXISTS ${LIBDIR}/materialx)
-set_and_warn_library_found("MaterialX" MATERIALX_LIB_FOLDER_EXISTS WITH_MATERIALX)
-unset(MATERIALX_LIB_FOLDER_EXISTS)
-
 # Mark libdir as system headers with a lower warn level, to resolve some warnings
 # that we have very little control over
-if(NOT MSVC_CLANG                  AND # Available with MSVC 15.7+ but not for CLANG.
+if(MSVC_VERSION GREATER_EQUAL 1914 AND # Available with 15.7+
+   NOT MSVC_CLANG                  AND # But not for clang
    NOT WITH_WINDOWS_SCCACHE        AND # And not when sccache is enabled
    NOT VS_CLANG_TIDY)                  # Clang-tidy does not like these options
   add_compile_options(/experimental:external /external:templates- /external:I "${LIBDIR}" /external:W0)
@@ -336,13 +323,6 @@ if(NOT JPEG_FOUND)
   set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-windows_find_package(Epoxy REQUIRED)
-if(NOT EPOXY_FOUND)
-  set(Epoxy_INCLUDE_DIRS ${LIBDIR}/epoxy/include)
-  set(Epoxy_LIBRARIES ${LIBDIR}/epoxy/lib/epoxy.lib)
-endif()
-
 set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
 set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib)
 
@@ -366,10 +346,18 @@ if(WITH_FFTW3)
 endif()
 
 if(WITH_IMAGE_WEBP)
-  set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
-  set(WEBP_FOUND ON)
+  windows_find_package(WebP)
+  if(NOT WEBP_FOUND)
+    if(EXISTS ${LIBDIR}/webp)
+      set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
+      set(WEBP_ROOT_DIR ${LIBDIR}/webp)
+      set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
+      set(WEBP_FOUND ON)
+    else()
+      message(STATUS "WITH_IMAGE_WEBP is ON but WEBP libraries are not found, setting WITH_IMAGE_WEBP=OFF")
+      set(WITH_IMAGE_WEBP OFF)
+    endif()
+  endif()
 endif()
 
 if(WITH_OPENCOLLADA)
@@ -431,7 +419,7 @@ if(WITH_CODEC_FFMPEG)
       ${LIBDIR}/ffmpeg/lib/avdevice.lib
       ${LIBDIR}/ffmpeg/lib/avutil.lib
       ${LIBDIR}/ffmpeg/lib/swscale.lib
-    )
+      )
   endif()
 endif()
 
@@ -446,12 +434,9 @@ if(WITH_IMAGE_OPENEXR)
     set(IMATH_INCLUDE_DIR ${IMATH}/include)
     set(IMATH_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH}/include/Imath)
     set(IMATH_LIBPATH ${IMATH}/lib)
-    if(EXISTS ${IMATH_LIBPATH}/Imath_s.lib)
-      set(IMATH_POSTFIX _s)
-    endif()
     set(IMATH_LIBRARIES
-      optimized ${IMATH_LIBPATH}/Imath${IMATH_POSTFIX}.lib
-      debug ${IMATH_LIBPATH}/Imath${IMATH_POSTFIX}_d.lib
+      optimized ${IMATH_LIBPATH}/Imath_s.lib
+      debug ${IMATH_LIBPATH}/Imath_s_d.lib
     )
   endif()
   set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
@@ -461,26 +446,38 @@ if(WITH_IMAGE_OPENEXR)
     warn_hardcoded_paths(OpenEXR)
     set(OPENEXR ${LIBDIR}/openexr)
     set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR}/include/OpenEXR)
     set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-    # Check if the blender 3.3 lib static library eixts
-    # if not assume this is a 3.4+ dynamic version.
+    # Check if the 3.x library name exists
+    # if not assume this is a 2.x library folder
     if(EXISTS "${OPENEXR_LIBPATH}/OpenEXR_s.lib")
-      set(OPENEXR_POSTFIX _s)
+      set(OPENEXR_LIBRARIES
+        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXR_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXRCore_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXRUtil_s.lib
+        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXR_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXRCore_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXRUtil_s_d.lib
+        ${IMATH_LIBRARIES}
+      )
+    else()
+      set(OPENEXR_LIBRARIES
+        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+        optimized ${OPENEXR_LIBPATH}/Half_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
+        optimized ${OPENEXR_LIBPATH}/Imath_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+        debug ${OPENEXR_LIBPATH}/Half_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
+        debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+      )
     endif()
-    set(OPENEXR_LIBRARIES
-      optimized ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}.lib
-      debug ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}_d.lib
-      ${IMATH_LIBRARIES}
-    )
   endif()
 endif()
 
@@ -503,16 +500,12 @@ if(WITH_JACK)
 endif()
 
 if(WITH_PYTHON)
-  # Cache version for make_bpy_wheel.py to detect.
-  unset(PYTHON_VERSION CACHE)
-  set(PYTHON_VERSION "3.10" CACHE STRING "Python version")
+  SET(PYTHON_VERSION 3.10 CACHE STRING "Python Version (major and minor only)")
 
   string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
   set(PYTHON_LIBRARY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.lib)
   set(PYTHON_LIBRARY_DEBUG ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.lib)
 
-  set(PYTHON_EXECUTABLE ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python$<$<CONFIG:Debug>:_d>.exe)
-
   set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include)
   set(PYTHON_NUMPY_INCLUDE_DIRS ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include)
   set(NUMPY_FOUND ON)
@@ -550,48 +543,37 @@ if(WITH_BOOST)
     if(NOT BOOST_VERSION)
       message(FATAL_ERROR "Unable to determine Boost version")
     endif()
-    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}")
-    set(BOOST_DEBUG_POSTFIX "vc142-mt-gyd-x64-${BOOST_VERSION}")
-    set(BOOST_PREFIX "")
-    # This is file new in 3.4 if it does not exist, assume we are building against 3.3 libs
-    set(BOOST_34_TRIGGER_FILE ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib)
-    if (NOT EXISTS ${BOOST_34_TRIGGER_FILE})
-      set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}")
-      set(BOOST_PREFIX "lib")
+    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib")
+    set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib")
+    if(NOT EXISTS ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX})
+      # If the new library names do not exist fall back to the old ones
+      # to ease the transition period between the libs.
+      set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
+      set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
     endif()
     set(BOOST_LIBRARIES
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_date_time-${BOOST_POSTFIX}.lib
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_filesystem-${BOOST_POSTFIX}.lib
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_regex-${BOOST_POSTFIX}.lib
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_system-${BOOST_POSTFIX}.lib
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_thread-${BOOST_POSTFIX}.lib
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_chrono-${BOOST_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_date_time-${BOOST_DEBUG_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_filesystem-${BOOST_DEBUG_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_regex-${BOOST_DEBUG_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_system-${BOOST_DEBUG_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_thread-${BOOST_DEBUG_POSTFIX}.lib
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_chrono-${BOOST_DEBUG_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
+      optimized ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_POSTFIX}
+      optimized ${BOOST_LIBPATH}/libboost_regex-${BOOST_POSTFIX}
+      optimized ${BOOST_LIBPATH}/libboost_system-${BOOST_POSTFIX}
+      optimized ${BOOST_LIBPATH}/libboost_thread-${BOOST_POSTFIX}
+      optimized ${BOOST_LIBPATH}/libboost_chrono-${BOOST_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_date_time-${BOOST_DEBUG_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_regex-${BOOST_DEBUG_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_system-${BOOST_DEBUG_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_thread-${BOOST_DEBUG_POSTFIX}
+      debug ${BOOST_LIBPATH}/libboost_chrono-${BOOST_DEBUG_POSTFIX}
     )
-    if (EXISTS ${BOOST_34_TRIGGER_FILE})
-      if(WITH_USD)
-        set(BOOST_PYTHON_LIBRARIES
-          debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib
-          optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_POSTFIX}.lib
-        )
-      endif()
-    endif()
     if(WITH_CYCLES AND WITH_CYCLES_OSL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-        optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_wave-${BOOST_POSTFIX}.lib
-        debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_wave-${BOOST_DEBUG_POSTFIX}.lib
-      )
+        optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
+        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX})
     endif()
     if(WITH_INTERNATIONAL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-        optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_locale-${BOOST_POSTFIX}.lib
-        debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_locale-${BOOST_DEBUG_POSTFIX}.lib
-      )
+        optimized ${BOOST_LIBPATH}/libboost_locale-${BOOST_POSTFIX}
+        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX})
     endif()
   else() # we found boost using find_package
     set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -607,18 +589,14 @@ if(WITH_OPENIMAGEIO)
   if(NOT OpenImageIO_FOUND)
     set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
     set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-    set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
-    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
     set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
     set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
     set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
   endif()
   set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
-  # If the .dll does not exist, assume it is a static OIIO
-  if(NOT EXISTS ${OPENIMAGEIO}/bin/OpenImageIO.dll)
-    add_definitions(-DOIIO_STATIC_DEFINE)
-  endif()
+  add_definitions(-DOIIO_STATIC_DEFINE)
   add_definitions(-DOIIO_NO_SSE=1)
 endif()
 
@@ -654,25 +632,18 @@ if(WITH_OPENCOLORIO)
     set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
     set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
     set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-    if(EXISTS ${OPENCOLORIO_LIBPATH}/libexpatMD.lib) # 3.4
-      set(OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-        optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
-        optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
-        optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-        debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
-        debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-        debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
-      )
-      set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
-    else()
-      set(OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-      )
-    endif()
+    set(OPENCOLORIO_LIBRARIES
+      optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+      optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
+      optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
+      optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
+      debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+      debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
+      debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
+      debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
+    )
   endif()
+  set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
 if(WITH_OPENVDB)
@@ -709,8 +680,7 @@ if(WITH_OPENIMAGEDENOISE)
     optimized ${OPENIMAGEDENOISE_LIBPATH}/dnnl.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/common_d.lib
-    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib
-  )
+    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib)
   set(OPENIMAGEDENOISE_DEFINITIONS)
 endif()
 
@@ -780,7 +750,7 @@ if(WITH_TBB)
 endif()
 
 # used in many places so include globally, like OpenGL
-include_directories(SYSTEM "${PTHREADS_INCLUDE_DIRS}")
+blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
 
 set(WINTAB_INC ${LIBDIR}/wintab/include)
 
@@ -813,11 +783,9 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
   find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
   find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
   find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
-  find_library(OSL_LIB_NOISE NAMES oslnoise PATHS ${CYCLES_OSL}/lib)
   find_library(OSL_LIB_EXEC_DEBUG NAMES oslexec_d PATHS ${CYCLES_OSL}/lib)
   find_library(OSL_LIB_COMP_DEBUG NAMES oslcomp_d PATHS ${CYCLES_OSL}/lib)
   find_library(OSL_LIB_QUERY_DEBUG NAMES oslquery_d PATHS ${CYCLES_OSL}/lib)
-  find_library(OSL_LIB_NOISE_DEBUG NAMES oslnoise_d PATHS ${CYCLES_OSL}/lib)
   list(APPEND OSL_LIBRARIES
     optimized ${OSL_LIB_COMP}
     optimized ${OSL_LIB_EXEC}
@@ -827,22 +795,15 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
     debug ${OSL_LIB_QUERY_DEBUG}
     ${PUGIXML_LIBRARIES}
   )
-  if(OSL_LIB_NOISE)
-    list(APPEND OSL_LIBRARIES optimized ${OSL_LIB_NOISE})
-  endif()
-  if(OSL_LIB_NOISE_DEBUG)
-    list(APPEND OSL_LIBRARIES debug ${OSL_LIB_NOISE_DEBUG})
-  endif()
   find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
   find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
-  file(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR
-       REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+[0-9]+.*$")
-  file(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR
-       REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+[0-9]+.*$")
-  string(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*"
-         "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR})
-  string(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*"
-         "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR})
+
+  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
+    set(OSL_FOUND TRUE)
+  else()
+    message(STATUS "OSL not found")
+    set(WITH_CYCLES_OSL OFF)
+  endif()
 endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
@@ -868,29 +829,23 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
       debug ${LIBDIR}/embree/lib/math_d.lib
       debug ${LIBDIR}/embree/lib/simd_d.lib
       debug ${LIBDIR}/embree/lib/sys_d.lib
-      debug ${LIBDIR}/embree/lib/tasking_d.lib
-    )
+      debug ${LIBDIR}/embree/lib/tasking_d.lib)
   endif()
 endif()
 
 if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
-    # 3.5 22.03 libs
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
-    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_ms.lib)
-    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_ms_d.lib)
+    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
+    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
     set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
-    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.5 22.11 libs
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_ms.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_ms_d.lib)
-    endif()
     # Older USD had different filenames, if the new ones are
     # not found see if the older ones exist, to ease the
     # transition period while landing libs.
-    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.3 static libs
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
+    if(NOT EXISTS "${USD_RELEASE_LIB}")
+      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
+      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
     endif()
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
@@ -901,8 +856,8 @@ endif()
 
 if(WINDOWS_PYTHON_DEBUG)
   # Include the system scripts in the blender_python_system_scripts project.
-  file(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" )
-  add_custom_target(blender_python_system_scripts SOURCES ${inFiles})
+  FILE(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" )
+  ADD_CUSTOM_TARGET(blender_python_system_scripts SOURCES ${inFiles})
   foreach(_source IN ITEMS ${inFiles})
     get_filename_component(_source_path "${_source}" PATH)
     string(REPLACE "${CMAKE_SOURCE_DIR}/release/scripts/" "" _source_path "${_source_path}")
@@ -922,8 +877,8 @@ if(WINDOWS_PYTHON_DEBUG)
   endif()
 
   file(TO_CMAKE_PATH ${USER_SCRIPTS_ROOT} USER_SCRIPTS_ROOT)
-  file(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" )
-  add_custom_target(blender_python_user_scripts SOURCES ${inFiles})
+  FILE(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" )
+  ADD_CUSTOM_TARGET(blender_python_user_scripts SOURCES ${inFiles})
   foreach(_source IN ITEMS ${inFiles})
     get_filename_component(_source_path "${_source}" PATH)
     string(REPLACE "${USER_SCRIPTS_ROOT}" "" _source_path "${_source_path}")
@@ -947,16 +902,21 @@ if(WINDOWS_PYTHON_DEBUG)
 endif()
 
 if(WITH_XR_OPENXR)
-  set(XR_OPENXR_SDK ${LIBDIR}/xr_openxr_sdk)
-  set(XR_OPENXR_SDK_LIBPATH ${LIBDIR}/xr_openxr_sdk/lib)
-  set(XR_OPENXR_SDK_INCLUDE_DIR ${XR_OPENXR_SDK}/include)
-  # This is the old name of this library, it is checked to
-  # support the transition between the old and new lib versions
-  # this can be removed after the next lib update.
-  if(EXISTS ${XR_OPENXR_SDK_LIBPATH}/openxr_loader_d.lib)
-    set(XR_OPENXR_SDK_LIBRARIES optimized ${XR_OPENXR_SDK_LIBPATH}/openxr_loader.lib debug ${XR_OPENXR_SDK_LIBPATH}/openxr_loader_d.lib)
+  if(EXISTS ${LIBDIR}/xr_openxr_sdk)
+    set(XR_OPENXR_SDK ${LIBDIR}/xr_openxr_sdk)
+    set(XR_OPENXR_SDK_LIBPATH ${LIBDIR}/xr_openxr_sdk/lib)
+    set(XR_OPENXR_SDK_INCLUDE_DIR ${XR_OPENXR_SDK}/include)
+    # This is the old name of this library, it is checked to
+    # support the transition between the old and new lib versions
+    # this can be removed after the next lib update.
+    if(EXISTS ${XR_OPENXR_SDK_LIBPATH}/openxr_loader_d.lib)
+      set(XR_OPENXR_SDK_LIBRARIES optimized ${XR_OPENXR_SDK_LIBPATH}/openxr_loader.lib debug ${XR_OPENXR_SDK_LIBPATH}/openxr_loader_d.lib)
+    else()
+      set(XR_OPENXR_SDK_LIBRARIES optimized ${XR_OPENXR_SDK_LIBPATH}/openxr_loader.lib debug ${XR_OPENXR_SDK_LIBPATH}/openxr_loaderd.lib)
+    endif()
   else()
-    set(XR_OPENXR_SDK_LIBRARIES optimized ${XR_OPENXR_SDK_LIBPATH}/openxr_loader.lib debug ${XR_OPENXR_SDK_LIBPATH}/openxr_loaderd.lib)
+    message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR")
+    set(WITH_XR_OPENXR OFF)
   endif()
 endif()
 
@@ -974,74 +934,19 @@ if(WITH_POTRACE)
 endif()
 
 if(WITH_HARU)
-  set(HARU_FOUND ON)
-  set(HARU_ROOT_DIR ${LIBDIR}/haru)
-  set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)
-  set(HARU_LIBRARIES ${HARU_ROOT_DIR}/lib/libhpdfs.lib)
-endif()
-
-if(WITH_VULKAN_BACKEND)
-  if(EXISTS ${LIBDIR}/vulkan)
-    set(VULKAN_FOUND On)
-    set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan)
-    set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
-    set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
-    set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/vulkan-1.lib)
-    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY})
+  if(EXISTS ${LIBDIR}/haru)
+    set(HARU_FOUND ON)
+    set(HARU_ROOT_DIR ${LIBDIR}/haru)
+    set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)
+    set(HARU_LIBRARIES ${HARU_ROOT_DIR}/lib/libhpdfs.lib)
   else()
-    message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
-    set(WITH_VULKAN_BACKEND OFF)
-  endif()
-endif()
-
-if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING)
-  find_package(openpgl QUIET)
-  if(openpgl_FOUND)
-    get_target_property(OPENPGL_LIBRARIES_RELEASE openpgl::openpgl LOCATION_RELEASE)
-    get_target_property(OPENPGL_LIBRARIES_DEBUG openpgl::openpgl LOCATION_DEBUG)
-    set(OPENPGL_LIBRARIES optimized ${OPENPGL_LIBRARIES_RELEASE} debug ${OPENPGL_LIBRARIES_DEBUG})
-    get_target_property(OPENPGL_INCLUDE_DIR openpgl::openpgl INTERFACE_INCLUDE_DIRECTORIES)
-  else()
-    set(WITH_CYCLES_PATH_GUIDING OFF)
-    message(STATUS "OpenPGL not found, disabling WITH_CYCLES_PATH_GUIDING")
+    message(WARNING "Haru was not found, disabling WITH_HARU")
+    set(WITH_HARU OFF)
   endif()
 endif()
 
 set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
 set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
 
-if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
-  set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
-  set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
-  if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
-    set(SYCL_ROOT_DIR ${CYCLES_SYCL})
-  endif()
-  file(GLOB _sycl_runtime_libraries_glob
-    ${SYCL_ROOT_DIR}/bin/sycl.dll
-    ${SYCL_ROOT_DIR}/bin/sycl[0-9].dll
-  )
-  foreach(sycl_runtime_library IN LISTS _sycl_runtime_libraries_glob)
-    string(REPLACE ".dll" "$<$<CONFIG:Debug>:d>.dll" sycl_runtime_library ${sycl_runtime_library})
-    list(APPEND _sycl_runtime_libraries ${sycl_runtime_library})
-  endforeach()
-  unset(_sycl_runtime_libraries_glob)
-
-  file(GLOB _sycl_pi_runtime_libraries_glob
-    ${SYCL_ROOT_DIR}/bin/pi_*.dll
-  )
-  list(REMOVE_ITEM _sycl_pi_runtime_libraries_glob "${SYCL_ROOT_DIR}/bin/pi_opencl.dll")
-  list (APPEND _sycl_runtime_libraries ${_sycl_pi_runtime_libraries_glob})
-  unset(_sycl_pi_runtime_libraries_glob)
-
-  list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
-  unset(_sycl_runtime_libraries)
-endif()
-
-
-# Environment variables to run precompiled executables that needed libraries.
-list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths)
-set(PLATFORM_ENV_BUILD_DIRS "${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}")
-set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}")
-# Install needs the additional folders from PLATFORM_ENV_BUILD_DIRS as well, as tools like idiff and abcls use the release mode dlls
-set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/\;${PLATFORM_ENV_BUILD_DIRS}\;$ENV{PATH}")
-unset(_library_paths)
+set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
+set(SYCL_ROOT_DIR ${LIBDIR}/dpcpp)