EEVEE: Rewrite: Implement nodetree support with every geometry types

2022-04-22 23:12:05 +02:00
3673 changed files with 82867 additions and 157579 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -265,7 +265,6 @@ ForEachMacros:
  - SET_SLOT_PROBING_BEGIN
  - MAP_SLOT_PROBING_BEGIN
  - VECTOR_SET_SLOT_PROBING_BEGIN
-  - WL_ARRAY_FOR_EACH

 StatementMacros:
  - PyObject_HEAD
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,8 +1,6 @@
 # The warnings below are disabled because they are too pedantic and not worth fixing.
 # Some of them will be enabled as part of the Clang-Tidy task, see T78535.

-# NOTE: No comments in the list below is allowed. Clang-tidy will ignore items after comments in the lists flag list.
-# This is because the comment is not a valid list item and it will stop parsing flags if a list item is a comment.
 Checks:  >
  -*,
  readability-*,
@@ -16,9 +14,10 @@ Checks:  >
  -readability-make-member-function-const,
  -readability-suspicious-call-argument,
  -readability-redundant-member-init,
+
  -readability-misleading-indentation,
+
  -readability-use-anyofallof,
-  -readability-identifier-length,

  -readability-function-cognitive-complexity,

@@ -36,8 +35,6 @@ Checks:  >

  -bugprone-redundant-branch-condition,

-  -bugprone-suspicious-include,
-
  modernize-*,
  -modernize-use-auto,
  -modernize-use-trailing-return-type,
@@ -45,6 +42,8 @@ Checks:  >
  -modernize-use-nodiscard,
  -modernize-loop-convert,
  -modernize-pass-by-value,
+  # Cannot be enabled yet, because using raw string literals in tests breaks
+  # the windows compiler currently.
  -modernize-raw-string-literal,
  -modernize-return-braced-init-list

--- a/.editorconfig
+++ b/.editorconfig
@@ -34,15 +34,6 @@ indent_style = space
 indent_size = 2
 max_line_length = 99

-# Tom's Obvious Minimal Language
-[*.toml]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-max_line_length = 120
-
 # reStructuredText
 [*.rst]
 charset = utf-8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,17 +222,6 @@ if(UNIX AND NOT (APPLE OR HAIKU))

  option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing (under development)" OFF)
  mark_as_advanced(WITH_GHOST_WAYLAND)
-
-  if (WITH_GHOST_WAYLAND)
-    option(WITH_GHOST_WAYLAND_LIBDECOR "Optionally build with LibDecor window decorations" OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_LIBDECOR)
-
-    option(WITH_GHOST_WAYLAND_DBUS "Optionally build with DBUS support (used for Cursor themes). May hang on startup systems where DBUS is not used." OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_DBUS)
-
-    option(WITH_GHOST_WAYLAND_DYNLOAD  "Enable runtime dynamic WAYLAND libraries loading" OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_DYNLOAD)
-  endif()
 endif()

 if(WITH_GHOST_X11)
@@ -266,11 +255,19 @@ if(WITH_GHOST_X11)
 endif()

 if(UNIX AND NOT APPLE)
+  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
+  option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system"           ON)
  option(WITH_SYSTEM_FREETYPE "Use the freetype library provided by the operating system" OFF)
-  option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
 else()
+  # not an option for other OS's
+  set(WITH_SYSTEM_GLEW OFF)
+  set(WITH_SYSTEM_GLES OFF)
  set(WITH_SYSTEM_FREETYPE OFF)
-  set(WITH_SYSTEM_EIGEN3 OFF)
+endif()
+
+
+if(UNIX AND NOT APPLE)
+  option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
 endif()


@@ -303,9 +300,6 @@ option(WITH_USD                 "Enable Universal Scene Description (USD) Suppor
 # 3D format support
 # Disable opencollada when we don't have precompiled libs
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ON)
-option(WITH_IO_WAVEFRONT_OBJ  "Enable Wavefront-OBJ 3D file format support (*.obj)" ON)
-option(WITH_IO_STL            "Enable STL 3D file format support (*.stl)" ON)
-option(WITH_IO_GPENCIL        "Enable grease-pencil file format IO (*.svg, *.pdf)" ON)

 # Sound output
 option(WITH_SDL           "Enable SDL for sound" ON)
@@ -445,9 +439,14 @@ endif()

 # AMD HIP
 if(NOT APPLE)
-  option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
+  if(WIN32)
+    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
+  else()
+    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
+  endif()
+
  option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx900 gfx906 gfx90c gfx902 gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 CACHE STRING "AMD HIP architectures to build binaries for")
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
  mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
  mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
@@ -457,21 +456,6 @@ if(APPLE)
  option(WITH_CYCLES_DEVICE_METAL       "Enable Cycles Apple Metal compute support" ON)
 endif()

-# oneAPI
-if(NOT APPLE)
-  option(WITH_CYCLES_DEVICE_ONEAPI "Enable Cycles oneAPI compute support" OFF)
-  option(WITH_CYCLES_ONEAPI_BINARIES "Enable Ahead-Of-Time compilation for Cycles oneAPI device" OFF)
-  option(WITH_CYCLES_ONEAPI_SYCL_HOST_ENABLED "Enable use of SYCL host (CPU) device execution by oneAPI implementation. This option is for debugging purposes and impacts GPU execution." OFF)
-
-  # https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compilation/ahead-of-time-compilation.html
-  SET (CYCLES_ONEAPI_SPIR64_GEN_DEVICES "dg2" CACHE STRING "oneAPI Intel GPU architectures to build binaries for")
-  SET (CYCLES_ONEAPI_SYCL_TARGETS spir64 spir64_gen CACHE STRING "oneAPI targets to build AOT binaries for")
-
-  mark_as_advanced(WITH_CYCLES_ONEAPI_SYCL_HOST_ENABLED)
-  mark_as_advanced(CYCLES_ONEAPI_SPIR64_GEN_DEVICES)
-  mark_as_advanced(CYCLES_ONEAPI_SYCL_TARGETS)
-endif()
-
 # Draw Manager
 option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
 mark_as_advanced(WITH_DRAW_DEBUG)
@@ -507,7 +491,7 @@ if((UNIX AND NOT APPLE) OR (CMAKE_GENERATOR MATCHES "^Visual Studio.+"))
 endif()

 option(WITH_BOOST "Enable features depending on boost" ON)
-option(WITH_TBB   "Enable multithreading. TBB is also required for features such as Cycles, OpenVDB and USD" ON)
+option(WITH_TBB   "Enable features depending on TBB (OpenVDB, OpenImageDenoise, sculpt multithreading)" ON)

 # TBB malloc is only supported on for windows currently
 if(WIN32)
@@ -536,48 +520,20 @@ endif()

 # OpenGL

-# Experimental EGL option.
-option(WITH_GL_EGL "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, GLX or WGL)" OFF)
-mark_as_advanced(WITH_GL_EGL)
-
-if(WITH_GHOST_WAYLAND)
-  # Wayland can only use EGL to create OpenGL contexts, not GLX.
-  set(WITH_GL_EGL ON)
-endif()
-
-if(UNIX AND NOT APPLE)
-  if(WITH_GL_EGL)
-    # GLEW can only be built with either GLX or EGL support. Most binary distributions are
-    # built with GLX support and we have no automated way to detect this. So always build
-    # GLEW from source to be sure it has EGL support.
-    set(WITH_SYSTEM_GLEW OFF)
-  else()
-    option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
-  endif()
-
-  option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system" ON)
-else()
-  # System GLEW and GLES not an option on other platforms.
-  set(WITH_SYSTEM_GLEW OFF)
-  set(WITH_SYSTEM_GLES OFF)
-endif()
-
 option(WITH_OPENGL              "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
+option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
 option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               OFF)
-option(WITH_GPU_BUILDTIME_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)
+option(WITH_GPU_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)

 mark_as_advanced(
  WITH_OPENGL
  WITH_GLEW_ES
+  WITH_GL_EGL
  WITH_GL_PROFILE_ES20
-  WITH_GPU_BUILDTIME_SHADER_BUILDER
+  WITH_GPU_SHADER_BUILDER
 )

-if(WITH_HEADLESS)
-  set(WITH_OPENGL OFF)
-endif()
-
 # Metal

 if (APPLE)
@@ -814,7 +770,6 @@ endif()

 set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
 set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
-set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)

 if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
  message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
@@ -831,9 +786,7 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO    OFF)
 set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW     OFF)
 set_and_warn_dependency(WITH_BOOST WITH_USD            OFF)
 set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC        OFF)
-if(WITH_CYCLES)
-  set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL   OFF)
-endif()
+set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL   OFF)
 set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO  OFF)

 if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
@@ -858,9 +811,6 @@ set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENCOLORIO  OFF)
 # Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF.
 set_and_warn_dependency(WITH_IMAGE_TIFF WITH_HARU       OFF)

-# USD needs OpenSubDiv, since that is used by the Cycles Hydra render delegate.
-set_and_warn_dependency(WITH_OPENSUBDIV WITH_USD        OFF)
-
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
  set(WITH_OPENIMAGEIO ON)
@@ -987,10 +937,7 @@ set(PLATFORM_CFLAGS)
 set(C_WARNINGS)
 set(CXX_WARNINGS)

-# NOTE: These flags are intended for situations where where it's impractical to
-# suppress warnings by modifying the code or for code which is maintained externally.
-# For GCC this typically means adding `-Wno-*` arguments to negate warnings
-# that are useful in the general case.
+# for gcc -Wno-blah-blah
 set(C_REMOVE_STRICT_FLAGS)
 set(CXX_REMOVE_STRICT_FLAGS)

@@ -1510,6 +1457,14 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
  endif()
 endif()

+#-----------------------------------------------------------------------------
+# Configure Ceres
+
+if(WITH_LIBMV)
+  # We always have C++11 which includes unordered_map.
+  set(CERES_DEFINES "-DCERES_STD_UNORDERED_MAP;-DCERES_USE_CXX_THREADS")
+endif()
+
 #-----------------------------------------------------------------------------
 # Extra limits to number of jobs running in parallel for some kind os tasks.
 # Only supported by Ninja build system currently.
@@ -1586,6 +1541,7 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCC)

  ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+  ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align)
  ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
  ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE  -Werror=return-type)
  ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_VLA -Werror=vla)
@@ -1670,18 +1626,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
    ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5)
  endif()

-
-  #----------------------
-  # Suppress Strict Flags
-  #
-  # Exclude the following warnings from this list:
-  # - `-Wno-address`:
-  #   This can give useful hints that point to bugs/misleading logic.
-  # - `-Wno-strict-prototypes`:
-  #   No need to support older C-style prototypes.
-  #
-  # If code in `./extern/` needs to suppress these flags that can be done on a case-by-case basis.
-
  # flags to undo strict flags
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
@@ -1737,9 +1681,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
  # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
  # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)

-  #----------------------
-  # Suppress Strict Flags
-
  # flags to undo strict flags
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE  -Wno-unused-variable)
@@ -1805,7 +1746,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
    "/wd4828"  # The file contains a character that is illegal
    "/wd4996"  # identifier was declared deprecated
    "/wd4661"  # no suitable definition provided for explicit template instantiation request
-    "/wd4848"  # 'no_unique_address' is a vendor extension in C++17
    # errors:
    "/we4013"  # 'function' undefined; assuming extern returning int
    "/we4133"  # incompatible pointer types
--- a/28
+++ b/28
@@ -120,7 +120,7 @@ Utilities
     Updates git and all submodules but not svn.

   * format:
-     Format source code using clang-format & autopep8 (uses PATHS if passed in). For example::
+     Format source code using clang (uses PATHS if passed in). For example::

        make format PATHS="source/blender/blenlib source/blender/blenkernel"

@@ -130,7 +130,6 @@ Environment Variables
   * BUILD_DIR:             Override default build path.
   * PYTHON:                Use this for the Python command (used for checking tools).
   * NPROCS:                Number of processes to use building (auto-detect when omitted).
-   * AUTOPEP8:              Command used for Python code-formatting (used for the format target).

 Documentation Targets
   Not associated with building Blender.
@@ -207,27 +206,6 @@ ifeq ($(OS_NCASE),darwin)
 	endif
 endif

-# Set the LIBDIR, an empty string when not found.
-LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU})
-ifeq (, $(LIBDIR))
-	LIBDIR:=$(wildcard ../lib/${OS_NCASE}_centos7_${CPU})
-endif
-ifeq (, $(LIBDIR))
-	LIBDIR:=$(wildcard ../lib/${OS_NCASE})
-endif
-
-# Use the autopep8 module in ../lib/ (which can be executed via Python directly).
-# Otherwise the "autopep8" command can be used.
-ifndef AUTOPEP8
-	ifneq (, $(LIBDIR))
-		AUTOPEP8:=$(wildcard $(LIBDIR)/python/lib/python3.10/site-packages/autopep8.py)
-	endif
-	ifeq (, $(AUTOPEP8))
-		AUTOPEP8:=autopep8
-	endif
-endif
-
-
 # -----------------------------------------------------------------------------
 # additional targets for the build configuration

@@ -549,8 +527,8 @@ update_code: .FORCE
 	@$(PYTHON) ./build_files/utils/make_update.py --no-libraries

 format: .FORCE
-	@PATH="${LIBDIR}/llvm/bin/:$(PATH)" $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
-	@$(PYTHON) source/tools/utils_maintenance/autopep8_format_paths.py --autopep8-command="$(AUTOPEP8)" $(PATHS)
+	@PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
+	    $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)


 # -----------------------------------------------------------------------------
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -29,12 +29,10 @@ cmake_minimum_required(VERSION 3.5)

 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.
 include(cmake/versions.cmake)
+include(cmake/options.cmake)
 include(cmake/boost_build_options.cmake)
 include(cmake/download.cmake)
-include(cmake/macros.cmake)

 if(ENABLE_MINGW64)
  include(cmake/setup_mingw64.cmake)
@@ -56,9 +54,13 @@ include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
 include(cmake/glew.cmake)
 include(cmake/alembic.cmake)
+include(cmake/glfw.cmake)
+include(cmake/clew.cmake)
+include(cmake/cuew.cmake)
 include(cmake/opensubdiv.cmake)
 include(cmake/sdl.cmake)
 include(cmake/opencollada.cmake)
+include(cmake/llvm.cmake)
 if(APPLE)
  include(cmake/openmp.cmake)
 endif()
@@ -76,7 +78,6 @@ include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
-include(cmake/llvm.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)
@@ -98,15 +99,6 @@ include(cmake/fmt.cmake)
 include(cmake/robinmap.cmake)
 if(NOT APPLE)
  include(cmake/xr_openxr.cmake)
-  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
-    include(cmake/dpcpp.cmake)
-    include(cmake/dpcpp_deps.cmake)
-  endif()
-  if(NOT WIN32)
-    include(cmake/igc.cmake)
-    include(cmake/gmmlib.cmake)
-    include(cmake/ocloc.cmake)
-  endif()
 endif()

 # OpenColorIO and dependencies.
@@ -139,7 +131,6 @@ if(NOT WIN32 OR ENABLE_MINGW64)
    include(cmake/vpx.cmake)
    include(cmake/x264.cmake)
    include(cmake/xvidcore.cmake)
-    include(cmake/aom.cmake)
    include(cmake/ffmpeg.cmake)
    include(cmake/fftw.cmake)
    include(cmake/sndfile.cmake)
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@ -42,5 +42,4 @@ endif()
 add_dependencies(
  external_alembic
  external_openexr
-  external_imath
 )
--- a/build_files/build_environment/cmake/aom.cmake
+++ b/build_files/build_environment/cmake/aom.cmake
@@ -1,45 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  # The default generator on windows is msbuild, which we do not
-  # want to use for this dep, as needs to build with mingw
-  set(AOM_GENERATOR "Ninja")
-  # The default flags are full of MSVC options given this will be
-  # building with mingw, it'll have an unhappy time with that and
-  # we need to clear them out.
-  set(AOM_CMAKE_FLAGS )
-  # CMake will correctly identify phreads being available, however
-  # we do not want to use them, as that gains a dependency on
-  # libpthreadswin.dll which we do not want. when pthreads is not
-  # available oam will use a pthreads emulation layer using win32 threads
-  set(AOM_EXTRA_ARGS_WIN32 -DCMAKE_HAVE_PTHREAD_H=OFF)
-else()
-  set(AOM_GENERATOR "Unix Makefiles")
-  set(AOM_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
-endif()
-
-set(AOM_EXTRA_ARGS
-  -DENABLE_TESTDATA=OFF
-  -DENABLE_TESTS=OFF
-  -DENABLE_TOOLS=OFF
-  -DENABLE_EXAMPLES=OFF
-  ${AOM_EXTRA_ARGS_WIN32}
-)
-
-# This is slightly different from all other deps in the way that
-# aom uses cmake as a build system, but still needs the environment setup
-# to include perl so we manually setup the environment and call
-# cmake directly for the configure, build and install commands.
-
-ExternalProject_Add(external_aom
-  URL file://${PACKAGE_DIR}/${AOM_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${AOM_HASH_TYPE}=${AOM_HASH}
-  PREFIX ${BUILD_DIR}/aom
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/aom/src/external_aom-build/ &&
-    ${CMAKE_COMMAND} -G "${AOM_GENERATOR}" -DCMAKE_INSTALL_PREFIX=${LIBDIR}/aom ${AOM_CMAKE_FLAGS} ${AOM_EXTRA_ARGS} ${BUILD_DIR}/aom/src/external_aom/
-  BUILD_COMMAND ${CMAKE_COMMAND} --build .
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
-  INSTALL_DIR ${LIBDIR}/aom
-)
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -56,7 +56,10 @@ if(UNIX)
      "On Debian and Ubuntu:\n"
      "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
      "\n"
-      "On macOS (with homebrew):\n"
+      "On macOS Intel (with homebrew):\n"
+      "  brew install autoconf automake bison libtool pkg-config yasm\n"
+      "\n"
+      "On macOS ARM (with homebrew):\n"
      "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
      "\n"
      "Other platforms:\n"
--- a/build_files/build_environment/cmake/clew.cmake
+++ b/build_files/build_environment/cmake/clew.cmake
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(CLEW_EXTRA_ARGS)
+
+ExternalProject_Add(external_clew
+  URL file://${PACKAGE_DIR}/${CLEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${CLEW_HASH_TYPE}=${CLEW_HASH}
+  PREFIX ${BUILD_DIR}/clew
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/clew
+)
--- a/build_files/build_environment/cmake/cuew.cmake
+++ b/build_files/build_environment/cmake/cuew.cmake
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(CUEW_EXTRA_ARGS)
+
+ExternalProject_Add(external_cuew
+  URL file://${PACKAGE_DIR}/${CUEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${CUEW_HASH_TYPE}=${CUEW_HASH}
+  PREFIX ${BUILD_DIR}/cuew
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/cuew
+)
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -39,6 +39,10 @@ download_source(FREETYPE)
 download_source(GLEW)
 download_source(FREEGLUT)
 download_source(ALEMBIC)
+download_source(GLFW)
+download_source(CLEW)
+download_source(GLFW)
+download_source(CUEW)
 download_source(OPENSUBDIV)
 download_source(SDL)
 download_source(OPENCOLLADA)
@@ -101,19 +105,3 @@ download_source(ROBINMAP)
 download_source(IMATH)
 download_source(PYSTRING)
 download_source(LEVEL_ZERO)
-download_source(DPCPP)
-download_source(VCINTRINSICS)
-download_source(OPENCLHEADERS)
-download_source(ICDLOADER)
-download_source(MP11)
-download_source(SPIRV_HEADERS)
-download_source(IGC)
-download_source(IGC_LLVM)
-download_source(IGC_OPENCL_CLANG)
-download_source(IGC_VCINTRINSICS)
-download_source(IGC_SPIRV_HEADERS)
-download_source(IGC_SPIRV_TOOLS)
-download_source(IGC_SPIRV_TRANSLATOR)
-download_source(GMMLIB)
-download_source(OCLOC)
-download_source(AOM)
--- a/build_files/build_environment/cmake/dpcpp.cmake
+++ b/build_files/build_environment/cmake/dpcpp.cmake
@@ -1,109 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-
-if(WIN32)
-  set(LLVM_GENERATOR "Ninja")
-else()
-  set(LLVM_GENERATOR "Unix Makefiles")
-endif()
-
-set(DPCPP_CONFIGURE_ARGS
-  # When external deps dpcpp needs are not found it will automatically
-  # download the during the configure stage using FetchContent. Given
-  # we need to keep an archive of all source used during build for compliance
-  # reasons it CANNOT download anything we do not know about. By setting
-  # this property to ON, all downloads are disabled, and we will have to
-  # provide the missing deps some other way, a build error beats a compliance
-  # violation
-  --cmake-opt FETCHCONTENT_FULLY_DISCONNECTED=ON
-)
-set(DPCPP_SOURCE_ROOT ${BUILD_DIR}/dpcpp/src/external_dpcpp/)
-set(DPCPP_EXTRA_ARGS
-  # When external deps dpcpp needs are not found it will automatically
-  # download the during the configure stage using FetchContent. Given
-  # we need to keep an archive of all source used during build for compliance
-  # reasons it CANNOT download anything we do not know about. By setting
-  # this property to ON, all downloads are disabled, and we will have to
-  # provide the missing deps some other way, a build or configure error
-  # beats a compliance violation
-  -DFETCHCONTENT_FULLY_DISCONNECTED=ON
-  -DLLVMGenXIntrinsics_SOURCE_DIR=${BUILD_DIR}/vcintrinsics/src/external_vcintrinsics/
-  -DOpenCL_HEADERS=file://${PACKAGE_DIR}/${OPENCLHEADERS_FILE}
-  -DOpenCL_LIBRARY_SRC=file://${PACKAGE_DIR}/${ICDLOADER_FILE}
-  -DBOOST_MP11_SOURCE_DIR=${BUILD_DIR}/mp11/src/external_mp11/
-  -DLEVEL_ZERO_LIBRARY=${LIBDIR}/level-zero/lib/${LIBPREFIX}ze_loader${SHAREDLIBEXT}
-  -DLEVEL_ZERO_INCLUDE_DIR=${LIBDIR}/level-zero/include
-  -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${BUILD_DIR}/spirvheaders/src/external_spirvheaders/
-  # Below here is copied from an invocation of buildbot/config.py
-  -DLLVM_ENABLE_ASSERTIONS=ON
-  -DLLVM_TARGETS_TO_BUILD=X86
-  -DLLVM_EXTERNAL_PROJECTS=sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
-  -DLLVM_EXTERNAL_SYCL_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/sycl
-  -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/llvm-spirv
-  -DLLVM_EXTERNAL_XPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
-  -DXPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
-  -DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xptifw
-  -DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/libdevice
-  -DLLVM_ENABLE_PROJECTS=clang^^sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
-  -DLIBCLC_TARGETS_TO_BUILD=
-  -DLIBCLC_GENERATE_REMANGLED_VARIANTS=OFF
-  -DSYCL_BUILD_PI_HIP_PLATFORM=AMD
-  -DLLVM_BUILD_TOOLS=ON
-  -DSYCL_ENABLE_WERROR=OFF
-  -DSYCL_INCLUDE_TESTS=ON
-  -DLLVM_ENABLE_DOXYGEN=OFF
-  -DLLVM_ENABLE_SPHINX=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DSYCL_ENABLE_XPTI_TRACING=ON
-  -DLLVM_ENABLE_LLD=OFF
-  -DXPTI_ENABLE_WERROR=OFF
-  -DSYCL_CLANG_EXTRA_FLAGS=
-  -DSYCL_ENABLE_PLUGINS=level_zero
-  -DCMAKE_INSTALL_RPATH=\$ORIGIN
-  -DPython3_ROOT_DIR=${LIBDIR}/python/
-  -DPython3_EXECUTABLE=${PYTHON_BINARY}
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DLLDB_ENABLE_CURSES=OFF
-  -DLLVM_ENABLE_TERMINFO=OFF
-)
-
-if(WIN32)
-   list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
-endif()
-
-ExternalProject_Add(external_dpcpp
-  URL file://${PACKAGE_DIR}/${DPCPP_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${DPCPP_HASH_TYPE}=${DPCPP_HASH}
-  PREFIX ${BUILD_DIR}/dpcpp
-  CMAKE_GENERATOR ${LLVM_GENERATOR}
-  SOURCE_SUBDIR llvm
-  LIST_SEPARATOR ^^
-  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
-)
-
-add_dependencies(
-  external_dpcpp
-  external_python
-  external_python_site_packages
-  external_vcintrinsics
-  external_openclheaders
-  external_icdloader
-  external_mp11
-  external_level-zero
-  external_spirvheaders
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_dpcpp after_install
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cl.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cpp.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang.exe
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/dpcpp ${HARVEST_TARGET}/dpcpp
-  )
-endif()
--- a/build_files/build_environment/cmake/dpcpp_deps.cmake
+++ b/build_files/build_environment/cmake/dpcpp_deps.cmake
@@ -1,61 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# These are build time requirements for dpcpp
-# We only have to unpack these dpcpp will build
-# them.
-
-ExternalProject_Add(external_vcintrinsics
-  URL file://${PACKAGE_DIR}/${VCINTRINSICS_FILE}
-  URL_HASH ${VCINTRINSICS_HASH_TYPE}=${VCINTRINSICS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/vcintrinsics
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-# opencl headers do not have to be unpacked, dpcpp will do it
-# but it wouldn't hurt to do it anyway as an opertunity to validate
-# the hash is correct.
-ExternalProject_Add(external_openclheaders
-  URL file://${PACKAGE_DIR}/${OPENCLHEADERS_FILE}
-  URL_HASH ${OPENCLHEADERS_HASH_TYPE}=${OPENCLHEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/openclheaders
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-# icdloader does not have to be unpacked, dpcpp will do it
-# but it wouldn't hurt to do it anyway as an opertunity to validate
-# the hash is correct.
-ExternalProject_Add(external_icdloader
-  URL file://${PACKAGE_DIR}/${ICDLOADER_FILE}
-  URL_HASH ${ICDLOADER_HASH_TYPE}=${ICDLOADER_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/icdloader
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_mp11
-  URL file://${PACKAGE_DIR}/${MP11_FILE}
-  URL_HASH ${MP11_HASH_TYPE}=${MP11_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/mp11
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_spirvheaders
-  URL file://${PACKAGE_DIR}/${SPIRV_HEADERS_FILE}
-  URL_HASH ${SPIRV_HEADERS_HASH_TYPE}=${SPIRV_HEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/spirvheaders
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -10,12 +10,18 @@ set(EMBREE_EXTRA_ARGS
  -DEMBREE_RAY_MASK=ON
  -DEMBREE_FILTER_FUNCTION=ON
  -DEMBREE_BACKFACE_CULLING=OFF
+  -DEMBREE_MAX_ISA=AVX2
  -DEMBREE_TASKING_SYSTEM=TBB
  -DEMBREE_TBB_ROOT=${LIBDIR}/tbb
  -DTBB_ROOT=${LIBDIR}/tbb
+  -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
 )

-if (NOT BLENDER_PLATFORM_ARM)
+if(BLENDER_PLATFORM_ARM)
+  set(EMBREE_EXTRA_ARGS
+    ${EMBREE_EXTRA_ARGS}
+    -DEMBREE_MAX_ISA=NEON)
+else()
  set(EMBREE_EXTRA_ARGS
    ${EMBREE_EXTRA_ARGS}
    -DEMBREE_MAX_ISA=AVX2)
@@ -24,10 +30,23 @@ endif()
 if(TBB_STATIC_LIBRARY)
  set(EMBREE_EXTRA_ARGS
    ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_TBB_COMPONENT=tbb_static
+    -DEMBREE_TBB_LIBRARY_NAME=tbb_static
+    -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_static
  )
 endif()

+if(WIN32)
+  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
+  if(BUILD_MODE STREQUAL Debug)
+    list(APPEND EMBREE_EXTRA_ARGS
+     -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_debug
+     -DEMBREE_TBB_LIBRARY_NAME=tbb_debug
+    )
+  endif()
+else()
+  set(EMBREE_BUILD_DIR)
+endif()
+
 ExternalProject_Add(external_embree
  URL file://${PACKAGE_DIR}/${EMBREE_FILE}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include -I${mingw_LIBDIR}/aom/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib -L${mingw_LIBDIR}/aom/lib")
+set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
+set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
 set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR}/aom/lib/pkgconfig:)
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:)

 if(WIN32)
  set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
@@ -79,7 +79,6 @@ ExternalProject_Add(external_ffmpeg
    --disable-librtmp
    --enable-libx264
    --enable-libxvid
-    --enable-libaom
    --disable-libopencore-amrnb
    --disable-libopencore-amrwb
    --disable-libdc1394
@@ -126,7 +125,6 @@ add_dependencies(
  external_vorbis
  external_ogg
  external_lame
-  external_aom
 )
 if(WIN32)
  add_dependencies(
--- a/build_files/build_environment/cmake/glfw.cmake
+++ b/build_files/build_environment/cmake/glfw.cmake
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(GLFW_EXTRA_ARGS)
+
+ExternalProject_Add(external_glfw
+  URL file://${PACKAGE_DIR}/${GLFW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${GLFW_HASH_TYPE}=${GLFW_HASH}
+  PREFIX ${BUILD_DIR}/glfw
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glfw
+)
--- a/build_files/build_environment/cmake/gmmlib.cmake
+++ b/build_files/build_environment/cmake/gmmlib.cmake
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(GMMLIB_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_gmmlib
-  URL file://${PACKAGE_DIR}/${GMMLIB_FILE}
-  URL_HASH ${GMMLIB_HASH_TYPE}=${GMMLIB_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/gmmlib
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib ${DEFAULT_CMAKE_FLAGS} ${GMMLIB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/gmmlib
-)
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -25,6 +25,9 @@ if(BUILD_MODE STREQUAL Release)
        # 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/ &&
+        # tiff
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
    DEPENDS
  )
 endif()
@@ -84,7 +87,7 @@ 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*")
+  harvest(level-zero/lib level-zero/lib "*.a")
 endif()
 harvest(llvm/bin llvm/bin "clang-format")
 if(BUILD_CLANG_TOOLS)
@@ -143,8 +146,8 @@ 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(nanovdb/nanovdb nanovdb/include/nanovdb "*.h")
 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")
@@ -174,7 +177,6 @@ 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")
@@ -190,10 +192,6 @@ harvest(zstd/lib zstd/lib "*.a")
 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()
+endif()

 endif()
--- a/build_files/build_environment/cmake/igc.cmake
+++ b/build_files/build_environment/cmake/igc.cmake
@@ -1,126 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-unpack_only(igc_vcintrinsics)
-unpack_only(igc_spirv_headers)
-unpack_only(igc_spirv_tools)
-
-#
-# igc_opencl_clang contains patches that need to be applied
-# to external_igc_llvm and igc_spirv_translator, we unpack
-# igc_opencl_clang first, then have the patch stages of
-# external_igc_llvm and igc_spirv_translator apply them.
-#
-
-ExternalProject_Add(external_igc_opencl_clang
-  URL file://${PACKAGE_DIR}/${IGC_OPENCL_CLANG_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_OPENCL_CLANG_HASH_TYPE}=${IGC_OPENCL_CLANG_HASH}
-  PREFIX ${BUILD_DIR}/igc_opencl_clang
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ < ${PATCH_DIR}/igc_opencl_clang.diff
-)
-
-set(IGC_OPENCL_CLANG_PATCH_DIR ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/patches)
-set(IGC_LLVM_SOURCE_DIR ${BUILD_DIR}/igc_llvm/src/external_igc_llvm)
-set(IGC_SPIRV_TRANSLATOR_SOURCE_DIR ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator)
-
-ExternalProject_Add(external_igc_llvm
-  URL file://${PACKAGE_DIR}/${IGC_LLVM_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_LLVM_HASH_TYPE}=${IGC_LLVM_HASH}
-  PREFIX ${BUILD_DIR}/igc_llvm
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0001-OpenCL-3.0-support.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0002-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0003-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0004-OpenCL-support-cl_ext_float_atomics.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0005-OpenCL-Add-cl_khr_integer_dot_product.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0001-Memory-leak-fix-for-Managed-Static-Mutex.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0002-Remove-repo-name-in-LLVM-IR.patch
-)
-add_dependencies(
-  external_igc_llvm
-  external_igc_opencl_clang
-)
-
-ExternalProject_Add(external_igc_spirv_translator
-  URL file://${PACKAGE_DIR}/${IGC_SPIRV_TRANSLATOR_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_SPIRV_TRANSLATOR_HASH_TYPE}=${IGC_SPIRV_TRANSLATOR_HASH}
-  PREFIX ${BUILD_DIR}/igc_spirv_translator
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0001-update-SPIR-V-headers-for-SPV_INTEL_split_barrier.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0002-Add-support-for-split-barriers-extension-SPV_INTEL_s.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0003-Support-cl_bf16_conversions.patch
-)
-add_dependencies(
-  external_igc_spirv_translator
-  external_igc_opencl_clang
-)
-
-if(WIN32)
-  set(IGC_GENERATOR "Ninja")
-  set(IGC_TARGET Windows64)
-else()
-  set(IGC_GENERATOR "Unix Makefiles")
-  set(IGC_TARGET Linux64)
-endif()
-
-set(IGC_EXTRA_ARGS
-  -DIGC_OPTION__ARCHITECTURE_TARGET=${IGC_TARGET}
-  -DIGC_OPTION__ARCHITECTURE_HOST=${IGC_TARGET}
-)
-
-if(UNIX AND NOT APPLE)
-  list(APPEND IGC_EXTRA_ARGS
-       -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
-       -DFLEX_INCLUDE_DIR=${LIBDIR}/flex/include
-  )
-endif()
-
-ExternalProject_Add(external_igc
-  URL file://${PACKAGE_DIR}/${IGC_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_HASH_TYPE}=${IGC_HASH}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc ${DEFAULT_CMAKE_FLAGS} ${IGC_EXTRA_ARGS}
-
-  # IGC is pretty set in its way where sub projects ought to live, for some it offers
-  # hooks to supply alternatives folders, other are just hardocded with no way to configure
-  # we symlink everything here, since it's less work than trying to convince the cmake
-  # scripts to accept alternative locations.
-  #
-  PATCH_COMMAND ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_llvm/src/external_igc_llvm/ ${BUILD_DIR}/igc/src/llvm-project &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/opencl-clang &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/llvm-spirv &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_tools/src/external_igc_spirv_tools/ ${BUILD_DIR}/igc/src/SPIRV-Tools &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_headers/src/external_igc_spirv_headers/ ${BUILD_DIR}/igc/src/SPIRV-Headers &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_vcintrinsics/src/external_igc_vcintrinsics/ ${BUILD_DIR}/igc/src/vc-intrinsics
-  PREFIX ${BUILD_DIR}/igc
-  INSTALL_DIR ${LIBDIR}/igc
-  INSTALL_COMMAND ${CMAKE_COMMAND} --install . --strip
-  CMAKE_GENERATOR ${IGC_GENERATOR}
-)
-
-add_dependencies(
-  external_igc
-  external_igc_vcintrinsics
-  external_igc_llvm
-  external_igc_opencl_clang
-  external_igc_vcintrinsics
-  external_igc_spirv_headers
-  external_igc_spirv_tools
-  external_igc_spirv_translator
-)
-
-if(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_igc
-    external_flex
-  )
-endif()
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -6,7 +6,6 @@ if(WIN32)
    -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe
    -DM4_EXECUTABLE=${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe
    -DARM_ENABLED=Off
-    -DPython3_FIND_REGISTRY=NEVER
  )
 elseif(APPLE)
  # Use bison and flex installed via Homebrew.
@@ -28,7 +27,7 @@ elseif(UNIX)
  set(ISPC_EXTRA_ARGS_UNIX
    -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
    -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-    -DARM_ENABLED=${BLENDER_PLATFORM_ARM}
+    -DARM_ENABLED=Off
    -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
  )
 endif()
@@ -44,8 +43,6 @@ set(ISPC_EXTRA_ARGS
    -DISPC_INCLUDE_TESTS=Off
    -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
    -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
-    -DPython3_ROOT_DIR=${LIBDIR}/python/
-    -DPython3_EXECUTABLE=${PYTHON_BINARY}
    ${ISPC_EXTRA_ARGS_WIN}
    ${ISPC_EXTRA_ARGS_APPLE}
    ${ISPC_EXTRA_ARGS_UNIX}
@@ -64,7 +61,6 @@ ExternalProject_Add(external_ispc
 add_dependencies(
  external_ispc
  ll
-  external_python
 )

 if(WIN32)
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -25,14 +25,11 @@ set(LLVM_EXTRA_ARGS
  -DLLVM_BUILD_LLVM_C_DYLIB=OFF
  -DLLVM_ENABLE_UNWIND_TABLES=OFF
  -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
-  -DPython3_ROOT_DIR=${LIBDIR}/python/
-  -DPython3_EXECUTABLE=${PYTHON_BINARY}
  ${LLVM_XML2_ARGS}
 )

 if(WIN32)
  set(LLVM_GENERATOR "Ninja")
-  list(APPEND LLVM_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
 else()
  set(LLVM_GENERATOR "Unix Makefiles")
 endif()
@@ -77,8 +74,3 @@ if(APPLE)
    external_xml2
  )
 endif()
-
-add_dependencies(
-  ll
-  external_python
-)
--- a/build_files/build_environment/cmake/macros.cmake
+++ b/build_files/build_environment/cmake/macros.cmake
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# shorthand to only unpack a certain dependency
-macro(unpack_only name)
-  string(TOUPPER ${name} UPPER_NAME)
-  set(TARGET_FILE ${${UPPER_NAME}_FILE})
-  set(TARGET_HASH_TYPE ${${UPPER_NAME}_HASH_TYPE})
-  set(TARGET_HASH ${${UPPER_NAME}_HASH})
-  ExternalProject_Add(external_${name}
-    URL file://${PACKAGE_DIR}/${TARGET_FILE}
-    URL_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    PREFIX ${BUILD_DIR}/${name}
-    CONFIGURE_COMMAND echo .
-    BUILD_COMMAND echo .
-    INSTALL_COMMAND echo .
-  )
-endmacro()
--- a/build_files/build_environment/cmake/ocloc.cmake
+++ b/build_files/build_environment/cmake/ocloc.cmake
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(OCLOC_EXTRA_ARGS
-  -DNEO_SKIP_UNIT_TESTS=1
-  -DNEO_BUILD_WITH_OCL=0
-  -DBUILD_WITH_L0=0
-  -DIGC_DIR=${LIBDIR}/igc
-  -DGMM_DIR=${LIBDIR}/gmmlib
-)
-
-ExternalProject_Add(external_ocloc
-  URL file://${PACKAGE_DIR}/${OCLOC_FILE}
-  URL_HASH ${OCLOC_HASH_TYPE}=${OCLOC_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/ocloc
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc ${DEFAULT_CMAKE_FLAGS} ${OCLOC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/ocloc
-)
-
-add_dependencies(
-  external_ocloc
-  external_igc
-  external_gmmlib
-)
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -53,8 +53,7 @@ add_dependencies(
  external_opencolorio
  external_yamlcpp
  external_expat
-  external_imath
-  external_pystring
+  external_openexr
 )

 if(WIN32)
--- a/build_files/build_environment/cmake/openimagedenoise.cmake
+++ b/build_files/build_environment/cmake/openimagedenoise.cmake
@@ -9,7 +9,6 @@ set(OIDN_EXTRA_ARGS
  -DOIDN_STATIC_RUNTIME=OFF
  -DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
  -DOIDN_FILTER_RTLIGHTMAP=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
 )

 if(WIN32)
@@ -39,7 +38,6 @@ add_dependencies(
  external_openimagedenoise
  external_tbb
  external_ispc
-  external_python
 )

 if(WIN32)
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -18,15 +18,9 @@ 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)
-  else()
-    set(TIFF_POSTFIX)
-  endif()
 else()
  set(PNG_LIBNAME libpng${LIBEXT})
  set(OIIO_SIMD_FLAGS)
-  set(TIFF_POSTFIX)
 endif()

 if(MSVC)
@@ -71,7 +65,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
  -DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
  -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
-  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${TIFF_POSTFIX}${LIBEXT}
+  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
  -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
  -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -10,16 +10,20 @@ set(OPENSUBDIV_EXTRA_ARGS
  -DNO_OMP=ON
  -DNO_TBB=OFF
  -DNO_CUDA=ON
-  -DNO_OPENCL=ON
-  -DNO_CLEW=ON
+  -DNO_OPENCL=OFF
+  -DNO_CLEW=OFF
  -DNO_OPENGL=OFF
  -DNO_METAL=OFF
  -DNO_DX=ON
  -DNO_TESTS=ON
  -DNO_GLTESTS=ON
-  -DNO_GLEW=ON
-  -DNO_GLFW=ON
+  -DNO_GLEW=OFF
+  -DNO_GLFW=OFF
  -DNO_GLFW_X11=ON
+  -DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
+  -DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
+  -DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
+  -DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
 )

 if(WIN32)
@@ -27,12 +31,19 @@ if(WIN32)
    ${OPENSUBDIV_EXTRA_ARGS}
    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
    -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb.lib
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
  )
 else()
  set(OPENSUBDIV_EXTRA_ARGS
    ${OPENSUBDIV_EXTRA_ARGS}
    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
  )
 endif()

@@ -64,5 +75,9 @@ endif()

 add_dependencies(
  external_opensubdiv
+  external_glew
+  external_glfw
+  external_clew
+  external_cuew
  external_tbb
 )
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -38,7 +38,6 @@ message("BUILD_DIR = ${BUILD_DIR}")
 if(WIN32)
  set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
  set(LIBEXT ".lib")
-  set(SHAREDLIBEXT ".lib")
  set(LIBPREFIX "")

  # For OIIO and OSL
@@ -97,7 +96,6 @@ if(WIN32)
 else()
  set(PATCH_CMD patch)
  set(LIBEXT ".a")
-  set(SHAREDLIBEXT ".so")
  set(LIBPREFIX "lib")

  if(APPLE)
--- a/build_files/build_environment/cmake/python_site_packages.cmake
+++ b/build_files/build_environment/cmake/python_site_packages.cmake
@@ -15,7 +15,7 @@ ExternalProject_Add(external_python_site_packages
  CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
  BUILD_COMMAND ""
  PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} 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:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} --no-binary :all:
 )

 if(USE_PIP_NUMPY)
--- a/build_files/build_environment/cmake/robinmap.cmake
+++ b/build_files/build_environment/cmake/robinmap.cmake
@@ -11,3 +11,12 @@ ExternalProject_Add(external_robinmap
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/robinmap ${DEFAULT_CMAKE_FLAGS} ${ROBINMAP_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/robinmap
 )
+
+if(WIN32)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_robinmap after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
+      DEPENDEES install
+    )
+  endif()
+endif()
--- a/build_files/build_environment/cmake/tiff.cmake
+++ b/build_files/build_environment/cmake/tiff.cmake
@@ -3,8 +3,6 @@
 set(TIFF_EXTRA_ARGS
  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-  -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
-  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
  -DPNG_STATIC=ON
  -DBUILD_SHARED_LIBS=OFF
  -Dlzma=OFF
@@ -26,12 +24,10 @@ add_dependencies(
  external_tiff
  external_zlib
 )
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_tiff after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-              ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
-      DEPENDEES install
-    )
-  endif()
+
+if(WIN32 AND BUILD_MODE STREQUAL Debug)
+  ExternalProject_Add_Step(external_tiff after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
+    DEPENDEES install
+  )
 endif()
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -25,6 +25,7 @@ set(USD_EXTRA_ARGS
  -DOpenImageIO_ROOT=${LIBDIR}/openimageio
  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
+  -DOSL_ROOT=${LIBDIR}/osl
  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
  -DPXR_BUILD_IMAGING=ON
  -DPXR_BUILD_TESTS=OFF
@@ -35,22 +36,8 @@ set(USD_EXTRA_ARGS
  -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
-  # module was included for its support for converting primitive shapes (sphere,
-  # 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
-  # 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
+  -DPXR_ENABLE_OSL_SUPPORT=ON
+  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
  # USD 22.03 does not support OCIO 2.x
  # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
  -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF
@@ -83,7 +70,9 @@ add_dependencies(
  external_usd
  external_tbb
  external_boost
+  external_openimageio
  external_opensubdiv
+  external_osl
 )

 # Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -45,15 +45,15 @@ set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 set(PTHREADS_HASH_TYPE MD5)
 set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)

-set(OPENEXR_VERSION 3.1.5)
+set(OPENEXR_VERSION 3.1.4)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH a92f38eedd43e56c0af56d4852506886)
+set(OPENEXR_HASH e990be1ff765797bc2d93a8060e1c1f2)
 set(OPENEXR_HASH_TYPE MD5)
 set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)

-set(IMATH_VERSION 3.1.5)
+set(IMATH_VERSION 3.1.4)
 set(IMATH_URI https://github.com/AcademySoftwareFoundation/Imath/archive/v${OPENEXR_VERSION}.tar.gz)
-set(IMATH_HASH dd375574276c54872b7b3d54053baff0)
+set(IMATH_HASH fddf14ec73e12c34e74c3c175e311a3f)
 set(IMATH_HASH_TYPE MD5)
 set(IMATH_FILE imath-${IMATH_VERSION}.tar.gz)

@@ -98,6 +98,27 @@ set(ALEMBIC_HASH 2cd8d6e5a3ac4a014e24a4b04f4fadf9)
 set(ALEMBIC_HASH_TYPE MD5)
 set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)

+# hash is for 3.1.2
+set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
+set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
+set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
+set(GLFW_HASH_TYPE MD5)
+set(GLFW_FILE glfw-${GLFW_GIT_UID}.zip)
+
+# latest uid in git as of 2016-04-01
+set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
+set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
+set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
+set(CLEW_HASH_TYPE MD5)
+set(CLEW_FILE clew-${CLEW_GIT_UID}.zip)
+
+# latest uid in git as of 2016-04-01
+set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
+set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
+set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
+set(CUEW_HASH_TYPE MD5)
+set(CUEW_FILE cuew-${CUEW_GIT_UID}.zip)
+
 set(OPENSUBDIV_VERSION v3_4_4)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
 set(OPENSUBDIV_HASH 39ecc5caf0abebc943d1ce131855e76e)
@@ -147,7 +168,7 @@ set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)

-# 8.0.0 is currently oiio's preferred version although never versions may be available.
+# 8.0.0 is currently oiio's preferred vesion although never versions may be available.
 # the preferred version can be found in oiio's externalpackages.cmake
 set(FMT_VERSION 8.0.0)
 set(FMT_URI https://github.com/fmtlib/fmt/archive/refs/tags/${FMT_VERSION}.tar.gz)
@@ -155,7 +176,7 @@ set(FMT_HASH 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83)
 set(FMT_HASH_TYPE SHA256)
 set(FMT_FILE fmt-${FMT_VERSION}.tar.gz)

-# 0.6.2 is currently oiio's preferred version although never versions may be available.
+# 0.6.2 is currently oiio's preferred vesion although never versions may be available.
 # the preferred version can be found in oiio's externalpackages.cmake
 set(ROBINMAP_VERSION v0.6.2)
 set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz)
@@ -163,9 +184,9 @@ 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.3.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 376f17f189e9d02280dfe709b2b2bbea)
+set(TIFF_HASH 0a2e4744d1426a8fc8211c0cdbc3a1b3)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)

@@ -204,9 +225,6 @@ 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(NUMPY_VERSION 1.22.0)
 set(NUMPY_SHORT_VERSION 1.22)
@@ -410,9 +428,9 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-src-3240000.zip)

-set(EMBREE_VERSION 3.13.4)
+set(EMBREE_VERSION 3.13.3)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
+set(EMBREE_HASH f62766ba54e48a2f327c3a22596e7133)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)

@@ -502,140 +520,3 @@ set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${
 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 20220620)
-set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH a5f41abd5229d28afa92cbd8a5d8d786ee698bf239f722929fd686276bad692c)
-set(DPCPP_HASH_TYPE SHA256)
-set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
-
-########################
-### DPCPP DEPS BEGIN ###
-########################
-# The following deps are build time requirements for dpcpp, when possible
-# the source in the dpcpp source tree for the version chosen is documented
-# by each dep, these will only have to be downloaded and unpacked, dpcpp
-# will take care of building them, unpack is being done in dpcpp_deps.cmake
-
-# Source llvm/lib/SYCLLowerIR/CMakeLists.txt
-set(VCINTRINSICS_VERSION 984bb27baacce6ee5c716c2e64845f2a1928025b)
-set(VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
-set(VCINTRINSICS_HASH abea415a15a0dd11fdc94dee8fb462910f2548311b787e02f42509789e1b0d7b)
-set(VCINTRINSICS_HASH_TYPE SHA256)
-set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
-
-# Source opencl/CMakeLists.txt
-set(OPENCLHEADERS_VERSION dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
-set(OPENCLHEADERS_URI https://github.com/KhronosGroup/OpenCL-Headers/archive/${OPENCLHEADERS_VERSION}.tar.gz)
-set(OPENCLHEADERS_HASH ca8090359654e94f2c41e946b7e9d826253d795ae809ce7c83a7d3c859624693)
-set(OPENCLHEADERS_HASH_TYPE SHA256)
-set(OPENCLHEADERS_FILE opencl_headers-${OPENCLHEADERS_VERSION}.tar.gz)
-
-# Source opencl/CMakeLists.txt
-set(ICDLOADER_VERSION aec3952654832211636fc4af613710f80e203b0a)
-set(ICDLOADER_URI https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${ICDLOADER_VERSION}.tar.gz)
-set(ICDLOADER_HASH e1880551d67bd8dc31d13de63b94bbfd6b1f315b6145dad1ffcd159b89bda93c)
-set(ICDLOADER_HASH_TYPE SHA256)
-set(ICDLOADER_FILE icdloader-${ICDLOADER_VERSION}.tar.gz)
-
-# Source sycl/cmake/modules/AddBoostMp11Headers.cmake
-# Using external MP11 here, getting AddBoostMp11Headers.cmake to recognize
-# our copy in boost directly was more trouble than it was worth.
-set(MP11_VERSION 7bc4e1ae9b36ec8ee635c3629b59ec525bbe82b9)
-set(MP11_URI https://github.com/boostorg/mp11/archive/${MP11_VERSION}.tar.gz)
-set(MP11_HASH 071ee2bd3952ec89882edb3af25dd1816f6b61723f66e42eea32f4d02ceef426)
-set(MP11_HASH_TYPE SHA256)
-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 36c0c1596225e728bd49abb7ef56a3953e7ed468)
-set(SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_VERSION}.tar.gz)
-set(SPIRV_HEADERS_HASH 7a5c89633f8740456fe8adee052033e134476d267411d1336c0cb1e587a9229a)
-set(SPIRV_HEADERS_HASH_TYPE SHA256)
-set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
-
-######################
-### DPCPP DEPS END ###
-######################
-
-##########################################
-### Intel Graphics Compiler DEPS BEGIN ###
-##########################################
-# The following deps are build time requirements for the intel graphics
-# compiler, the versions used are taken from the following location
-# https://github.com/intel/intel-graphics-compiler/releases
-
-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 d92f0608dcbb52690855685f9447282e5c09c0ba98ae35fabf114fcf8b1e9fcf)
-set(IGC_HASH_TYPE SHA256)
-set(IGC_FILE igc-${IGC_VERSION}.tar.gz)
-
-set(IGC_LLVM_VERSION llvmorg-11.1.0)
-set(IGC_LLVM_URI https://github.com/llvm/llvm-project/archive/refs/tags/${IGC_LLVM_VERSION}.tar.gz)
-set(IGC_LLVM_HASH 53a0719f3f4b0388013cfffd7b10c7d5682eece1929a9553c722348d1f866e79)
-set(IGC_LLVM_HASH_TYPE SHA256)
-set(IGC_LLVM_FILE ${IGC_LLVM_VERSION}.tar.gz)
-
-# WARNING WARNING WARNING
-#
-# IGC_OPENCL_CLANG contains patches for some of its dependencies.
-#
-# Whenever IGC_OPENCL_CLANG_VERSION changes, one *MUST* inspect
-# IGC_OPENCL_CLANG's patches folder and update igc.cmake to account for
-# any added or removed patches.
-#
-# WARNING WARNING WARNING
-
-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 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.4.0)
-set(IGC_VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/refs/tags/${IGC_VCINTRINSICS_VERSION}.tar.gz)
-set(IGC_VCINTRINSICS_HASH c8b92682ad5031cf9d5b82a40e7d5c0e763cd9278660adbcaa69aab988e4b589)
-set(IGC_VCINTRINSICS_HASH_TYPE SHA256)
-set(IGC_VCINTRINSICS_FILE vc-intrinsics-${IGC_VCINTRINSICS_VERSION}.tar.gz)
-
-set(IGC_SPIRV_HEADERS_VERSION sdk-1.3.204.1)
-set(IGC_SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
-set(IGC_SPIRV_HEADERS_HASH 262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c)
-set(IGC_SPIRV_HEADERS_HASH_TYPE SHA256)
-set(IGC_SPIRV_HEADERS_FILE SPIR-V-Headers-${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
-
-set(IGC_SPIRV_TOOLS_VERSION sdk-1.3.204.1)
-set(IGC_SPIRV_TOOLS_URI https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
-set(IGC_SPIRV_TOOLS_HASH 6e19900e948944243024aedd0a201baf3854b377b9cc7a386553bc103b087335)
-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 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 77dfb4ddb6bfb993535562c02ddea23f0a0d1c5a0258c1afe7e27c894ff783a8)
-set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256)
-set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
-
-########################################
-### Intel Graphics Compiler DEPS END ###
-########################################
-
-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 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334)
-set(GMMLIB_HASH_TYPE SHA256)
-set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz)
-
-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 ab22b8bf2560a57fdd3def0e35a62ca75991406f959c0263abb00cd6cd9ae998)
-set(OCLOC_HASH_TYPE SHA256)
-set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz)
-
-set(AOM_VERSION 3.4.0)
-set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.tar.gz)
-set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
-set(AOM_HASH_TYPE SHA256)
-set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -1,13 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 if(WIN32)
-  # VPX is determined to use pthreads which it will tell ffmpeg to dynamically
-  # link, which is not something we're super into distribution wise. However
-  # if it cannot find pthread.h it'll happily provide a pthread emulation
-  # layer using win32 threads. So all this patch does is make it not find
-  # pthead.h
-  set(VPX_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/vpx/src/external_vpx < ${PATCH_DIR}/vpx_windows.diff)
-  set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
+  else()
+    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+  endif()
 else()
  if(APPLE)
    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
@@ -20,16 +18,6 @@ else()
  endif()
 endif()

-if(NOT BLENDER_PLATFORM_ARM)
-  list(APPEND VPX_EXTRA_FLAGS
-    --enable-sse4_1
-    --enable-sse3
-    --enable-ssse3
-    --enable-avx
-    --enable-avx2
-  )
-endif()
-
 ExternalProject_Add(external_vpx
  URL file://${PACKAGE_DIR}/${VPX_FILE}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -42,6 +30,11 @@ ExternalProject_Add(external_vpx
      --enable-static
      --disable-install-bins
      --disable-install-srcs
+      --disable-sse4_1
+      --disable-sse3
+      --disable-ssse3
+      --disable-avx
+      --disable-avx2
      --disable-unit-tests
      --disable-examples
      --enable-vp8
@@ -49,7 +42,6 @@ ExternalProject_Add(external_vpx
      ${VPX_EXTRA_FLAGS}
  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-  PATCH_COMMAND ${VPX_PATCH}
  INSTALL_DIR ${LIBDIR}/vpx
 )

--- a/build_files/build_environment/dependencies.dot
+++ b/build_files/build_environment/dependencies.dot
@@ -37,6 +37,10 @@ graph[autosize = false, size = "25.7,8.3!", resolution = 300, overlap = false, s
 	external_openimageio -- external_webp;
 	external_openimageio -- external_opencolorio_extra;
 	external_openmp -- external_clang;
+	external_opensubdiv -- external_glew;
+	external_opensubdiv -- external_glfw;
+	external_opensubdiv -- external_clew;
+	external_opensubdiv -- external_cuew;
 	external_opensubdiv -- external_tbb;
 	openvdb -- external_tbb;
 	openvdb -- external_boost;
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -36,19 +36,19 @@ getopt \
 -o s:i:t:h \
 --long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
 with-all,with-opencollada,with-jack,with-pulseaudio,with-embree,with-oidn,with-nanovdb,\
-ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-xr-openxr:,ver-level-zero:\
+ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-xr-openxr:,\
 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-xr-openxr,\
 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-xr-openxr,\
 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-xr-openxr \
 -- "$@" \
 )

@@ -165,9 +165,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --ver-xr-openxr=<ver>
        Force version of OpenXR-SDK.

-    --ver-level-zero=<ver>
-        Force version of OneAPI Level Zero library.
-
    Note about the --ver-foo options:
        It may not always work as expected (some libs are actually checked out from a git rev...), yet it might help
        to fix some build issues (like LLVM mismatch with the version used by your graphic system).
@@ -229,9 +226,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --build-xr-openxr
        Force the build of OpenXR-SDK.

-    --build-level-zero=<ver>
-        Force the build of OneAPI Level Zero 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
@@ -299,9 +293,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --force-xr-openxr
        Force the rebuild of OpenXR-SDK.

-    --force-level-zero=<ver>
-        Force the rebuild of OneAPI Level Zero 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)!
@@ -360,10 +351,7 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
        Unconditionally skip Universal Scene Description installation/building.

    --skip-xr-openxr
-        Unconditionally skip OpenXR-SDK installation/building.
-
-    --skip-level-zero=<ver>
-        Unconditionally skip OneAPI Level Zero installation/building.\""
+        Unconditionally skip OpenXR-SDK installation/building.\""

 # ----------------------------------------------------------------------------
 # Main Vars
@@ -465,7 +453,7 @@ TBB_VERSION="2020"
 TBB_VERSION_SHORT="2020"
 TBB_VERSION_UPDATE="_U3"  # Used for source packages...
 TBB_VERSION_MIN="2018"
-TBB_VERSION_MEX="2021"  # 2021 introduces 'oneTBB', which has lots of compatibility breakage with previous versions
+TBB_VERSION_MEX="2022"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false
@@ -478,7 +466,7 @@ OCIO_FORCE_BUILD=false
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false

-IMATH_VERSION="3.1.5"
+IMATH_VERSION="3.1.4"
 IMATH_VERSION_SHORT="3.1"
 IMATH_VERSION_MIN="3.0"
 IMATH_VERSION_MEX="4.0"
@@ -487,7 +475,7 @@ IMATH_FORCE_REBUILD=false
 IMATH_SKIP=false
 _with_built_imath=false

-OPENEXR_VERSION="3.1.5"
+OPENEXR_VERSION="3.1.4"
 OPENEXR_VERSION_SHORT="3.1"
 OPENEXR_VERSION_MIN="3.0"
 OPENEXR_VERSION_MEX="4.0"
@@ -551,10 +539,10 @@ ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false

-USD_VERSION="22.03"
-USD_VERSION_SHORT="22.03"
+USD_VERSION="21.02"
+USD_VERSION_SHORT="21.02"
 USD_VERSION_MIN="20.05"
-USD_VERSION_MEX="23.00"
+USD_VERSION_MEX="22.00"
 USD_FORCE_BUILD=false
 USD_FORCE_REBUILD=false
 USD_SKIP=false
@@ -567,7 +555,7 @@ OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false

-EMBREE_VERSION="3.13.4"
+EMBREE_VERSION="3.13.3"
 EMBREE_VERSION_SHORT="3.13"
 EMBREE_VERSION_MIN="3.13"
 EMBREE_VERSION_MEX="4.0"
@@ -585,13 +573,14 @@ OIDN_SKIP=false

 ISPC_VERSION="1.17.0"

-LEVEL_ZERO_VERSION="1.7.15"
-LEVEL_ZERO_VERSION_SHORT="1.7"
-LEVEL_ZERO_VERSION_MIN="1.7"
-LEVEL_ZERO_VERSION_MEX="2.0"
-LEVEL_ZERO_FORCE_BUILD=false
-LEVEL_ZERO_FORCE_REBUILD=false
-LEVEL_ZERO_SKIP=false
+FFMPEG_VERSION="4.4"
+FFMPEG_VERSION_SHORT="4.4"
+FFMPEG_VERSION_MIN="3.0"
+FFMPEG_VERSION_MEX="5.0"
+FFMPEG_FORCE_BUILD=false
+FFMPEG_FORCE_REBUILD=false
+FFMPEG_SKIP=false
+_ffmpeg_list_sep=";"

 XR_OPENXR_VERSION="1.0.22"
 XR_OPENXR_VERSION_SHORT="1.0"
@@ -601,15 +590,6 @@ XR_OPENXR_FORCE_BUILD=false
 XR_OPENXR_FORCE_REBUILD=false
 XR_OPENXR_SKIP=false

-FFMPEG_VERSION="5.0"
-FFMPEG_VERSION_SHORT="5.0"
-FFMPEG_VERSION_MIN="4.0"
-FFMPEG_VERSION_MEX="6.0"
-FFMPEG_FORCE_BUILD=false
-FFMPEG_FORCE_REBUILD=false
-FFMPEG_SKIP=false
-_ffmpeg_list_sep=";"
-
 # FFMPEG optional libs.
 VORBIS_USE=false
 VORBIS_DEV=""
@@ -627,9 +607,6 @@ WEBP_DEV=""
 VPX_USE=false
 VPX_VERSION_MIN=0.9.7
 VPX_DEV=""
-AOM_USE=false
-AOM_VERSION_MIN=3.3.0
-AOM_DEV=""
 OPUS_USE=false
 OPUS_VERSION_MIN=1.1.1
 OPUS_DEV=""
@@ -638,6 +615,9 @@ MP3LAME_DEV=""
 OPENJPEG_USE=false
 OPENJPEG_DEV=""

+# Whether to use system GLEW or not (OpenSubDiv needs recent glew to work).
+NO_SYSTEM_GLEW=false
+
 # Switch to english language, else some things (like check_package_DEB()) won't work!
 LANG_BACK=$LANG
 LANG=""
@@ -801,12 +781,6 @@ while true; do
      XR_OPENXR_VERSION_SHORT=$XR_OPENXR_VERSION
      shift; shift; continue
    ;;
-    --ver-level-zero)
-      LEVEL_ZERO_VERSION="$2"
-      LEVEL_ZERO_VERSION_MIN=$LEVEL_ZERO_VERSION
-      LEVEL_ZERO_VERSION_SHORT=$LEVEL_ZERO_VERSION
-      shift; shift; continue
-    ;;
    --build-all)
      PYTHON_FORCE_BUILD=true
      BOOST_FORCE_BUILD=true
@@ -826,7 +800,6 @@ while true; do
      ALEMBIC_FORCE_BUILD=true
      USD_FORCE_BUILD=true
      XR_OPENXR_FORCE_BUILD=true
-      LEVEL_ZERO_FORCE_BUILD=true
      shift; continue
    ;;
    --build-python)
@@ -884,9 +857,6 @@ while true; do
    --build-xr-openxr)
      XR_OPENXR_FORCE_BUILD=true; shift; continue
    ;;
-    --build-level-zero)
-      LEVEL_ZERO_FORCE_BUILD=true; shift; continue
-    ;;
    --force-all)
      PYTHON_FORCE_REBUILD=true
      BOOST_FORCE_REBUILD=true
@@ -906,7 +876,6 @@ while true; do
      ALEMBIC_FORCE_REBUILD=true
      USD_FORCE_REBUILD=true
      XR_OPENXR_FORCE_REBUILD=true
-      LEVEL_ZERO_FORCE_REBUILD=true
      shift; continue
    ;;
    --force-python)
@@ -964,9 +933,6 @@ while true; do
    --force-xr-openxr)
      XR_OPENXR_FORCE_REBUILD=true; shift; continue
    ;;
-    --force-level-zero)
-      LEVEL_ZERO_FORCE_REBUILD=true; shift; continue
-    ;;
    --skip-python)
      PYTHON_SKIP=true; shift; continue
    ;;
@@ -1021,9 +987,6 @@ while true; do
    --skip-xr-openxr)
      XR_OPENXR_SKIP=true; shift; continue
    ;;
-    --skip-level-zero)
-      LEVEL_ZERO_SKIP=true; shift; continue
-    ;;
    --)
      # no more arguments to parse
      break
@@ -1165,16 +1128,14 @@ OIDN_SOURCE=( "https://github.com/OpenImageDenoise/oidn/releases/download/v${OID

 ISPC_BINARY=( "https://github.com/ispc/ispc/releases/download/v${ISPC_VERSION}/ispc-v${ISPC_VERSION}-linux.tar.gz" )

+FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
+
 XR_OPENXR_USE_REPO=false
 XR_OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_VERSION}.tar.gz")
 XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
 XR_OPENXR_REPO_UID="458984d7f59d1ae6dc1b597d94b02e4f7132eaba"
 XR_OPENXR_REPO_BRANCH="master"

-LEVEL_ZERO_SOURCE=("https://github.com/oneapi-src/level-zero/archive/refs/tags/v${LEVEL_ZERO_VERSION}.tar.gz")
-
-FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
-
 # C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS -std=c++11"
@@ -1193,7 +1154,7 @@ Those libraries should be available as packages in all recent distributions (opt
    * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
    * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
    * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
-    * libsdl2, libglew, libpugixml, libpotrace, [libgmp], fontconfig, [libharu/libhpdf].\""
+    * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""

 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:

@@ -1212,7 +1173,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
    ** [NumPy $PYTHON_NUMPY_VERSION] (use pip).
    * Boost $BOOST_VERSION (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
    * TBB $TBB_VERSION (from $TBB_SOURCE).
-    * [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libaom, libwebp, ...)] (from $FFMPEG_SOURCE).
+    * [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libwebp, ...)] (from $FFMPEG_SOURCE).
    * [OpenColorIO $OCIO_VERSION] (from $OCIO_SOURCE).
    * Imath $IMATH_VERSION (from $IMATH_SOURCE).
    * OpenEXR $OPENEXR_VERSION (from $OPENEXR_SOURCE).
@@ -1226,8 +1187,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
    * [OpenImageDenoise $OIDN_VERSION] (from $OIDN_SOURCE).
    * [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).\""
+    * [OpenXR-SDK $XR_OPENXR_VERSION] (from $XR_OPENXR_SOURCE).\""

 if [ "$DO_SHOW_DEPS" = true ]; then
  PRINT ""
@@ -1687,7 +1647,7 @@ compile_TBB() {
  fi

  # To be changed each time we make edits that would modify the compiled result!
-  tbb_magic=1
+  tbb_magic=0
  _init_tbb

  # Force having own builds for the dependencies.
@@ -2696,13 +2656,14 @@ compile_OSD() {
    mkdir build
    cd build

-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
    if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_LOCATION=$INST/tbb"
+      cmake_d="$cmake_d $cmake_d -D TBB_LOCATION=$INST/tbb"
    fi
+    cmake_d="-D CMAKE_BUILD_TYPE=Release"
    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+    # ptex is only needed when nicholas bishop is ready
    cmake_d="$cmake_d -D NO_PTEX=1"
-    cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1 -D NO_GLEW=1"
+    cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1"
    # maya plugin, docs, tutorials, regression tests and examples are not needed
    cmake_d="$cmake_d -D NO_MAYA=1 -D NO_DOC=1 -D NO_TUTORIALS=1 -D NO_REGRESSION=1 -DNO_EXAMPLES=1"

@@ -3003,7 +2964,7 @@ compile_ALEMBIC() {
  fi

  # To be changed each time we make edits that would modify the compiled result!
-  alembic_magic=3
+  alembic_magic=2
  _init_alembic

  # Force having own builds for the dependencies.
@@ -3051,7 +3012,7 @@ compile_ALEMBIC() {
    fi
    if [ "$_with_built_openexr" = true ]; then
      cmake_d="$cmake_d -D USE_ARNOLD=OFF"
-      cmake_d="$cmake_d -D USE_BINARIES=ON"  # Tests use some Alembic binaries...
+      cmake_d="$cmake_d -D USE_BINARIES=OFF"
      cmake_d="$cmake_d -D USE_EXAMPLES=OFF"
      cmake_d="$cmake_d -D USE_HDF5=OFF"
      cmake_d="$cmake_d -D USE_MAYA=OFF"
@@ -3325,7 +3286,7 @@ compile_Embree() {
  fi

  # To be changed each time we make edits that would modify the compiled results!
-  embree_magic=11
+  embree_magic=10
  _init_embree

  # Force having own builds for the dependencies.
@@ -3385,7 +3346,7 @@ compile_Embree() {

    cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=TBB"
    if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D EMBREE_TBB_ROOT=$INST/tbb"
+      make_d="$make_d EMBREE_TBB_ROOT=$INST/tbb"
    fi

    cmake $cmake_d ../
@@ -3524,7 +3485,7 @@ compile_OIDN() {
  install_ISPC

  # To be changed each time we make edits that would modify the compiled results!
-  oidn_magic=10
+  oidn_magic=9
  _init_oidn

  # Force having own builds for the dependencies.
@@ -3580,7 +3541,7 @@ compile_OIDN() {
    cmake_d="$cmake_d -D ISPC_DIR_HINT=$_ispc_path_bin"

    if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_ROOT=$INST/tbb"
+      make_d="$make_d TBB_ROOT=$INST/tbb"
    fi

    cmake $cmake_d ../
@@ -3637,7 +3598,7 @@ compile_FFmpeg() {
  fi

  # To be changed each time we make edits that would modify the compiled result!
-  ffmpeg_magic=6
+  ffmpeg_magic=5
  _init_ffmpeg

  # Force having own builds for the dependencies.
@@ -3690,10 +3651,6 @@ compile_FFmpeg() {
      extra="$extra --enable-libvpx"
    fi

-    if [ "$AOM_USE" = true ]; then
-      extra="$extra --enable-libaom"
-    fi
-
    if [ "$WEBP_USE" = true ]; then
      extra="$extra --enable-libwebp"
    fi
@@ -3865,103 +3822,6 @@ compile_XR_OpenXR_SDK() {
 }


-# ----------------------------------------------------------------------------
-# Build OneAPI Level Zero library.
-
-_init_level_zero() {
-  _src=$SRC/level-zero-$LEVEL_ZERO_VERSION
-  _git=false
-  _inst=$INST/level-zero-$LEVEL_ZERO_VERSION_SHORT
-  _inst_shortcut=$INST/level-zero
-}
-
-_update_deps_level_zero() {
-  :
-}
-
-clean_Level_Zero() {
-  _init_level_zero
-  if [ -d $_inst ]; then
-    # Force rebuilding the dependencies if needed.
-    _update_deps_level_zero false true
-  fi
-  _clean
-}
-
-compile_Level_Zero() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Level Zero will not be compiled!"
-    return
-  fi
-
-  # To be changed each time we make edits that would modify the compiled result!
-  level_zero_magic=1
-  _init_level_zero
-
-  # Force having own builds for the dependencies.
-  _update_deps_level_zero true false
-
-  # Clean install if needed!
-  magic_compile_check level-zero-$LEVEL_ZERO_VERSION $level_zero_magic
-  if [ $? -eq 1 -o "$LEVEL_ZERO_FORCE_REBUILD" = true ]; then
-    clean_Level_Zero
-  fi
-
-  if [ ! -d $_inst ]; then
-    INFO "Building Level-Zero-$LEVEL_ZERO_VERSION"
-
-    # Force rebuilding the dependencies.
-    _update_deps_level_zero true true
-
-    prepare_inst
-
-    if [ ! -d $_src ]; then
-      mkdir -p $SRC
-
-      download LEVEL_ZERO_SOURCE[@] "$_src.tar.gz"
-      INFO "Unpacking Level-Zero-$LEVEL_ZERO_VERSION"
-      tar -C $SRC -xf $_src.tar.gz
-    fi
-
-    cd $_src
-
-    # Always refresh the whole build!
-    if [ -d build ]; then
-      rm -rf build
-    fi
-    mkdir build
-    cd build
-
-    # Keep flags in sync with LEVEL_ZERO_EXTRA_ARGS in level-zero.cmake!
-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
-    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
-
-    cmake $cmake_d ..
-
-    make -j$THREADS && make install
-    make clean
-
-    if [ ! -d $_inst ]; then
-      ERROR "Level-Zero-$LEVEL_ZERO_VERSION failed to compile, exiting"
-      exit 1
-    fi
-
-    magic_compile_set level-zero-$LEVEL_ZERO_VERSION $level_zero_magic
-
-    cd $CWD
-    INFO "Done compiling Level-Zero-$LEVEL_ZERO_VERSION!"
-  else
-    INFO "Own Level-Zero-$LEVEL_ZERO_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, use the --force-level-zero option."
-  fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
-  run_ldconfig "level-zero"
-}
-
-
 # ----------------------------------------------------------------------------
 # Install on DEB-like

@@ -4065,6 +3925,7 @@ install_DEB() {
             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"
+             # libglewmx-dev  (broken in deb testing currently...)

  VORBIS_USE=true
  OGG_USE=true
@@ -4147,37 +4008,33 @@ install_DEB() {
    WEBP_USE=true
  fi

-  XVID_DEV="libxvidcore-dev"
-  check_package_DEB $XVID_DEV
-  if [ $? -eq 0 ]; then
-    XVID_USE=true
+  if [ "$WITH_ALL" = true ]; then
+    XVID_DEV="libxvidcore-dev"
+    check_package_DEB $XVID_DEV
+    if [ $? -eq 0 ]; then
+      XVID_USE=true
+    fi
+
+    MP3LAME_DEV="libmp3lame-dev"
+    check_package_DEB $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      MP3LAME_USE=true
+    fi
+
+    VPX_DEV="libvpx-dev"
+    check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi
+
+    OPUS_DEV="libopus-dev"
+    check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
  fi

-  MP3LAME_DEV="libmp3lame-dev"
-  check_package_DEB $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    MP3LAME_USE=true
-  fi
-
-  VPX_DEV="libvpx-dev"
-  check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
-
-  AOM_DEV="libaom-dev"
-  check_package_version_ge_DEB $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="libopus-dev"
-  check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
-  fi
-
-  # Check cmake version and disable features for older distros.
+  # Check cmake/glew versions and disable features for older distros.
  # This is so Blender can at least compile.
  PRINT ""
  _cmake=`get_package_version_DEB cmake`
@@ -4194,6 +4051,28 @@ install_DEB() {
    fi
  fi

+  PRINT ""
+  _glew=`get_package_version_DEB libglew-dev`
+  if [ -z $_glew ]; then
+    # Stupid virtual package in Ubuntu 12.04 doesn't show version number...
+    _glew=`apt-cache showpkg libglew-dev|tail -n1|awk '{print $2}'|sed 's/-.*//'`
+  fi
+  version_ge $_glew "1.9.0"
+  if [ $? -eq 1 ]; then
+    version_ge $_glew "1.7.0"
+    if [ $? -eq 1 ]; then
+      WARNING "OpenSubdiv disabled because GLEW-$_glew is not enough"
+      WARNING "Blender will not use system GLEW library"
+      OSD_SKIP=true
+      NO_SYSTEM_GLEW=true
+    else
+      WARNING "OpenSubdiv will compile with GLEW-$_glew but with limited capability"
+      WARNING "Blender will not use system GLEW library"
+      NO_SYSTEM_GLEW=true
+    fi
+  fi
+
+
  PRINT ""
  _do_compile_python=false
  if [ "$PYTHON_SKIP" = true ]; then
@@ -4557,9 +4436,6 @@ install_DEB() {
    if [ "$VPX_USE" = true ]; then
      _packages="$_packages $VPX_DEV"
    fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
    if [ "$OPUS_USE" = true ]; then
      _packages="$_packages $OPUS_DEV"
    fi
@@ -4582,18 +4458,6 @@ install_DEB() {
    PRINT ""
    compile_XR_OpenXR_SDK
  fi
-
-  PRINT ""
-  if [ "$LEVEL_ZERO_SKIP" = true ]; then
-    WARNING "Skipping Level Zero installation, as requested..."
-  elif [ "$LEVEL_ZERO_FORCE_BUILD" = true ]; then
-    INFO "Forced Level Zero building, as requested..."
-    compile_Level_Zero
-  else
-    # No package currently!
-    PRINT ""
-    compile_Level_Zero
-  fi
 }


@@ -4860,27 +4724,21 @@ install_RPM() {
    WEBP_USE=true
  fi

-  VPX_DEV="libvpx-devel"
-  check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
-
-  AOM_DEV="libaom-devel"
-  check_package_version_ge_RPM $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="libopus-devel"
-  check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
-  fi
-
  if [ "$WITH_ALL" = true ]; then
+    VPX_DEV="libvpx-devel"
+    check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi
+
    PRINT ""
    install_packages_RPM libspnav-devel
+
+    OPUS_DEV="libopus-devel"
+    check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
  fi

  PRINT ""
@@ -5265,9 +5123,6 @@ install_RPM() {
    if [ "$VPX_USE" = true ]; then
      _packages="$_packages $VPX_DEV"
    fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
    if [ "$OPUS_USE" = true ]; then
      _packages="$_packages $OPUS_DEV"
    fi
@@ -5289,18 +5144,6 @@ install_RPM() {
    # No package currently!
    compile_XR_OpenXR_SDK
  fi
-
-  PRINT ""
-  if [ "$LEVEL_ZERO_SKIP" = true ]; then
-    WARNING "Skipping Level Zero installation, as requested..."
-  elif [ "$LEVEL_ZERO_FORCE_BUILD" = true ]; then
-    INFO "Forced Level Zero building, as requested..."
-    compile_Level_Zero
-  else
-    # No package currently!
-    PRINT ""
-    compile_Level_Zero
-  fi
 }


@@ -5457,34 +5300,30 @@ install_ARCH() {
    WEBP_USE=true
  fi

-  XVID_DEV="xvidcore"
-  check_package_ARCH $XVID_DEV
-  if [ $? -eq 0 ]; then
-    XVID_USE=true
-  fi
+  if [ "$WITH_ALL" = true ]; then
+    XVID_DEV="xvidcore"
+    check_package_ARCH $XVID_DEV
+    if [ $? -eq 0 ]; then
+      XVID_USE=true
+    fi

-  MP3LAME_DEV="lame"
-  check_package_ARCH $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    MP3LAME_USE=true
-  fi
+    MP3LAME_DEV="lame"
+    check_package_ARCH $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      MP3LAME_USE=true
+    fi

-  VPX_DEV="libvpx"
-  check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
+    VPX_DEV="libvpx"
+    check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi

-  AOM_DEV="libaom"
-  check_package_version_ge_ARCH $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="opus"
-  check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
+    OPUS_DEV="opus"
+    check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
  fi


@@ -5862,9 +5701,6 @@ install_ARCH() {
    if [ "$VPX_USE" = true ]; then
      _packages="$_packages $VPX_DEV"
    fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
    if [ "$OPUS_USE" = true ]; then
      _packages="$_packages $OPUS_DEV"
    fi
@@ -5885,18 +5721,6 @@ install_ARCH() {
    # No package currently!
    compile_XR_OpenXR_SDK
  fi
-
-  PRINT ""
-  if [ "$LEVEL_ZERO_SKIP" = true ]; then
-    WARNING "Skipping Level Zero installation, as requested..."
-  elif [ "$LEVEL_ZERO_FORCE_BUILD" = true ]; then
-    INFO "Forced Level Zero building, as requested..."
-    compile_Level_Zero
-  else
-    # No package currently!
-    PRINT ""
-    compile_Level_Zero
-  fi
 }


@@ -6071,14 +5895,6 @@ install_OTHER() {
    INFO "Forced OpenXR-SDK building, as requested..."
    compile_XR_OpenXR_SDK
  fi
-
-  PRINT ""
-  if [ "$LEVEL_ZERO_SKIP" = true ]; then
-    WARNING "Skipping Level Zero installation, as requested..."
-  elif [ "$LEVEL_ZERO_FORCE_BUILD" = true ]; then
-    INFO "Forced Level Zero building, as requested..."
-    compile_Level_Zero
-  fi
 }

 # ----------------------------------------------------------------------------
@@ -6293,6 +6109,12 @@ print_info() {
    fi
  fi

+  if [ "$NO_SYSTEM_GLEW" = true ]; then
+    _1="-D WITH_SYSTEM_GLEW=OFF"
+    PRINT "  $_1"
+    _buildargs="$_buildargs $_1"
+  fi
+
  if [ "$FFMPEG_SKIP" = false ]; then
    _1="-D WITH_CODEC_FFMPEG=ON"
    PRINT "  $_1"
@@ -6315,18 +6137,6 @@ print_info() {
    fi
  fi

-  # Not yet available in Blender.
-  #~ if [ "$LEVEL_ZERO_SKIP" = false ]; then
-    #~ _1="-D WITH_LEVEL_ZERO=ON"
-    #~ PRINT "  $_1"
-    #~ _buildargs="$_buildargs $_1"
-    #~ if [ -d $INST/level-zero ]; then
-      #~ _1="-D LEVEL_ZERO_ROOT_DIR=$INST/level-zero"
-      #~ PRINT "  $_1"
-      #~ _buildargs="$_buildargs $_1"
-    #~ fi
-  #~ fi
-
  PRINT ""
  PRINT "Or even simpler, just run (in your blender-source dir):"
  PRINT "  make -j$THREADS BUILD_CMAKE_ARGS=\"$_buildargs\""
--- a/build_files/build_environment/patches/cuew.diff
+++ b/build_files/build_environment/patches/cuew.diff
@@ -0,0 +1,26 @@
+--- CmakeLists.txt.orig	2015-12-31 03:46:41 -0700
+++ CMakeLists.txt	2016-04-01 13:28:33 -0600
+@@ -22,3 +22,10 @@
+ 
+ add_executable(testcuew cuewTest/cuewTest.c include/cuew.h)
+ target_link_libraries(testcuew cuew ${CMAKE_DL_LIBS})
+
+install(TARGETS cuew
+  LIBRARY DESTINATION lib COMPONENT libraries
+  ARCHIVE DESTINATION lib/static COMPONENT libraries)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/cuew.h
+  DESTINATION include/) 
+\ No newline at end of file
+--- src/cuew.c	2016-04-01 13:41:43 -0600
+++ src/cuew.c	2016-04-01 13:41:11 -0600
+@@ -15,7 +15,9 @@
+  */
+ 
+ #ifdef _MSC_VER
+#if _MSC_VER < 1900
+ #  define snprintf _snprintf
+#endif 
+ #  define popen _popen
+ #  define pclose _pclose
+ #  define _CRT_SECURE_NO_WARNINGS
--- a/build_files/build_environment/patches/dpcpp.diff
+++ b/build_files/build_environment/patches/dpcpp.diff
@@ -1,54 +0,0 @@
-diff -Naur external_dpcpp.orig/sycl/source/CMakeLists.txt external_dpcpp/sycl/source/CMakeLists.txt
--- external_dpcpp.orig/sycl/source/CMakeLists.txt      2022-05-20 04:19:45.067771362 +0000
-+++ external_dpcpp/sycl/source/CMakeLists.txt   2022-05-20 04:21:49.708025048 +0000
-@@ -66,10 +66,10 @@
-     target_compile_options(${LIB_OBJ_NAME} PUBLIC
-                            -fvisibility=hidden -fvisibility-inlines-hidden)
-     set(linker_script "${CMAKE_CURRENT_SOURCE_DIR}/ld-version-script.txt")
-    set(abi_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/abi_replacements_linux.txt")
-    target_link_libraries(
-      ${LIB_NAME} PRIVATE "-Wl,${abi_linker_script}")
-    set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${abi_linker_script})
-+#    set(abi_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/abi_replacements_linux.txt")
-+#    target_link_libraries(
-+#      ${LIB_NAME} PRIVATE "-Wl,${abi_linker_script}")
-+#    set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${abi_linker_script})
-     target_link_libraries(
-         ${LIB_NAME} PRIVATE "-Wl,--version-script=${linker_script}")
-     set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${linker_script})
-diff -Naur llvm-sycl-nightly-20220501.orig\opencl/CMakeLists.txt llvm-sycl-nightly-20220501\opencl/CMakeLists.txt
--- llvm-sycl-nightly-20220501.orig/opencl/CMakeLists.txt       2022-04-29 13:47:11 -0600
-+++ llvm-sycl-nightly-20220501/opencl/CMakeLists.txt    2022-05-21 15:25:06 -0600
-@@ -11,6 +11,11 @@
-   )
- endif()
-
-+# Blender code below is determined to use FetchContent_Declare
-+# temporarily allow it (but feed it our downloaded tarball
-+# in the OpenCL_HEADERS variable
-+set(FETCHCONTENT_FULLY_DISCONNECTED OFF)
-+
- # Repo URLs
-
- set(OCL_HEADERS_REPO
-@@ -77,5 +82,6 @@
-
- FetchContent_MakeAvailable(ocl-icd)
- add_library(OpenCL-ICD ALIAS OpenCL)
-+set(FETCHCONTENT_FULLY_DISCONNECTED ON)
-
- add_subdirectory(opencl-aot)
-diff -Naur llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake
--- llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake	2022-02-08 09:17:24 -0700
-+++ llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake	2022-05-24 11:35:51 -0600
-@@ -36,7 +36,9 @@
- add_custom_target(libsycldevice-obj)
- add_custom_target(libsycldevice-spv)
- 
-add_custom_target(libsycldevice DEPENDS
-+# Blender: add ALL here otherwise this target will not build
-+# and cause an error due to missing files during the install phase.
-+add_custom_target(libsycldevice ALL DEPENDS
-   libsycldevice-obj
-   libsycldevice-spv)
- 
--- a/build_files/build_environment/patches/embree.diff
+++ b/build_files/build_environment/patches/embree.diff
@@ -1,37 +1,30 @@
-diff -Naur org/kernels/rtcore_config.h.in embree-3.13.4/kernels/rtcore_config.h.in
--- org/kernels/rtcore_config.h.in      2022-06-14 22:13:52 -0600
-+++ embree-3.13.4/kernels/rtcore_config.h.in    2022-06-24 15:20:12 -0600
-@@ -14,6 +14,7 @@
- #cmakedefine01 EMBREE_MIN_WIDTH
- #define RTC_MIN_WIDTH EMBREE_MIN_WIDTH
-
-+#cmakedefine EMBREE_STATIC_LIB
- #cmakedefine EMBREE_API_NAMESPACE
-
- #if defined(EMBREE_API_NAMESPACE)
-diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
-index 7c2f43d..106b1d5 100644
--- a/kernels/CMakeLists.txt
-+++ b/kernels/CMakeLists.txt
-@@ -201,6 +201,12 @@ embree_files(EMBREE_LIBRARY_FILES_AVX512 ${AVX512})
- #message("AVX2: ${EMBREE_LIBRARY_FILES_AVX2}")
- #message("AVX512: ${EMBREE_LIBRARY_FILES_AVX512}")
+diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
+--- orig/common/sys/platform.h	2020-05-13 23:08:53 -0600
+++ external_embree/common/sys/platform.h	2020-06-13 17:40:26 -0600
+@@ -84,8 +84,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
 
-+# Bundle Neon2x into the main static library.
-+IF(EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB)
-+  LIST(APPEND EMBREE_LIBRARY_FILES ${EMBREE_LIBRARY_FILES_AVX2})
-+  LIST(REMOVE_DUPLICATES EMBREE_LIBRARY_FILES)
-+ENDIF()
-+
- # replaces all .cpp files with a dummy file that includes that .cpp file
- # this is to work around an ICC name mangling issue related to lambda functions under windows
- MACRO (CreateISADummyFiles list isa)
-@@ -277,7 +283,7 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
-   ENDIF()
- ENDIF()
- 
-IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2)
-+IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2 AND NOT (EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB))
-   DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES_AVX2})
-   ADD_LIBRARY(embree_avx2 STATIC ${EMBREE_LIBRARY_FILES_AVX2})
-   TARGET_LINK_LIBRARIES(embree_avx2 PRIVATE tasking)
+ #ifdef __WIN32__
+-#define dll_export __declspec(dllexport)
+-#define dll_import __declspec(dllimport)
+#define dll_export 
+#define dll_import 
+ #else
+ #define dll_export __attribute__ ((visibility ("default")))
+ #define dll_import 
+diff --git orig/common/tasking/CMakeLists.txt external_embree/common/tasking/CMakeLists.txt
+--- orig/common/tasking/CMakeLists.txt
+++ external_embree/common/tasking/CMakeLists.txt
+@@ -27,7 +27,11 @@
+     else()
+       # If not found try getting older TBB via module (FindTBB.cmake)
+       unset(TBB_DIR CACHE)
+-      find_package(TBB 4.1 REQUIRED tbb)
+      if (TBB_STATIC_LIB)
+        find_package(TBB 4.1 REQUIRED tbb_static)
+      else()
+        find_package(TBB 4.1 REQUIRED tbb)
+      endif()
+       if (TBB_FOUND)
+         TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
+         TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")
--- a/build_files/build_environment/patches/igc_opencl_clang.diff
+++ b/build_files/build_environment/patches/igc_opencl_clang.diff
@@ -1,44 +0,0 @@
-diff -Naur external_igc_opencl_clang.orig/CMakeLists.txt external_igc_opencl_clang/CMakeLists.txt
--- external_igc_opencl_clang.orig/CMakeLists.txt	2022-03-16 05:51:10 -0600
-+++ external_igc_opencl_clang/CMakeLists.txt	2022-05-23 10:40:09 -0600
-@@ -126,22 +126,24 @@
-         )
-     endif()
- 
-
-    set(SPIRV_BASE_REVISION llvm_release_110)
-    set(TARGET_BRANCH "ocl-open-110")
-    get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
-    set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
-                          ${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)
-    apply_patches(${LLVM_MONOREPO_DIR}
-                  "${LLVM_PATCHES_DIRS}"
-                  ${LLVM_BASE_REVISION}
-                  ${TARGET_BRANCH}
-                  ret)
-    apply_patches(${SPIRV_SOURCE_DIR}
-                  ${CMAKE_CURRENT_SOURCE_DIR}/patches/spirv
-                  ${SPIRV_BASE_REVISION}
-                  ${TARGET_BRANCH}
-                  ret)
-+    #
-+    # Blender: Why apply these manually in igc.cmake
-+    #
-+    #set(SPIRV_BASE_REVISION llvm_release_110)
-+    #set(TARGET_BRANCH "ocl-open-110")
-+    #get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
-+    #set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
-+    #                      ${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)
-+    #apply_patches(${LLVM_MONOREPO_DIR}
-+    #              "${LLVM_PATCHES_DIRS}"
-+    #              ${LLVM_BASE_REVISION}
-+    #              ${TARGET_BRANCH}
-+    #              ret)
-+    #apply_patches(${SPIRV_SOURCE_DIR}
-+    #              ${CMAKE_CURRENT_SOURCE_DIR}/patches/spirv
-+    #              ${SPIRV_BASE_REVISION}
-+    #              ${TARGET_BRANCH}
-+    #              ret)
- endif(NOT USE_PREBUILT_LLVM)
- 
- #
--- a/build_files/build_environment/patches/nanovdb.diff
+++ b/build_files/build_environment/patches/nanovdb.diff
@@ -0,0 +1,374 @@
+Index: nanovdb/nanovdb/NanoVDB.h
+===================================================================
+--- a/nanovdb/nanovdb/NanoVDB.h	(revision 62751)
+++ b/nanovdb/nanovdb/NanoVDB.h	(working copy)
+@@ -152,8 +152,8 @@
+ 
+ #endif // __CUDACC_RTC__
+ 
+-#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__
+@@ -461,7 +461,7 @@
+ /// Maximum floating-point values
+ template<typename T>
+ struct Maximum;
+-#ifdef __CUDA_ARCH__
+#if defined(__CUDA_ARCH__) || defined(__HIP__)
+ template<>
+ struct Maximum<int>
+ {
+@@ -1006,10 +1006,10 @@
+ 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])); }
+inline __hostdev__ 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])); }
+inline __hostdev__ Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
+ 
+ // ----------------------------> Vec4 <--------------------------------------
+ 
+@@ -1820,7 +1820,7 @@
+ }; // 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;
+@@ -2170,7 +2170,7 @@
+ }; // 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 = blindDataCount(); i < n; ++i)
+         if (blindMetaData(i).mSemantic == semantic)
+@@ -2328,7 +2328,7 @@
+ }; // 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().valueMin();
+     max = this->root().valueMax();
+@@ -2336,7 +2336,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-const NodeT* Tree<RootT>::getNode(uint32_t i) const
+__hostdev__ const NodeT* Tree<RootT>::getNode(uint32_t i) const
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: unvalid node type");
+     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
+@@ -2345,7 +2345,7 @@
+ 
+ template<typename RootT>
+ template<int LEVEL>
+-const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
+__hostdev__ const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
+ {
+     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
+     return reinterpret_cast<const TreeNodeT<LEVEL>*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
+@@ -2353,7 +2353,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-NodeT* Tree<RootT>::getNode(uint32_t i)
+__hostdev__ NodeT* Tree<RootT>::getNode(uint32_t i)
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: invalid node type");
+     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
+@@ -2362,7 +2362,7 @@
+ 
+ template<typename RootT>
+ template<int LEVEL>
+-typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
+__hostdev__ typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
+ {
+     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
+     return reinterpret_cast<TreeNodeT<LEVEL>*>(reinterpret_cast<uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
+@@ -2370,7 +2370,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
+__hostdev__ uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNodeID: invalid node type");
+     const NodeT* first = reinterpret_cast<const NodeT*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[NodeT::LEVEL]);
+@@ -2380,7 +2380,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
+__hostdev__ uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
+ {
+     return this->getNodeID(node) + DataType::mPFSum[NodeT::LEVEL];
+ }
+@@ -3366,7 +3366,7 @@
+ }; // LeafNode class
+ 
+ template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
+-inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
+inline __hostdev__ void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
+ {
+     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
+     if (!this->isActive()) return;
+Index: nanovdb/nanovdb/util/SampleFromVoxels.h
+===================================================================
+--- a/nanovdb/nanovdb/util/SampleFromVoxels.h	(revision 62751)
+++ b/nanovdb/nanovdb/util/SampleFromVoxels.h	(working copy)
+@@ -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 @@
+ 
+ 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 @@
+ }
+ 
+ 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 @@
+ 
+ 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 @@
+ }; // 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 @@
+ 
+ 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 @@
+ 
+ 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
+ #if 0
+@@ -270,7 +270,7 @@
+ }
+ 
+ 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -363,7 +363,7 @@
+ 
+ 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);
+@@ -370,7 +370,7 @@
+ }
+ 
+ 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);
+ }
+@@ -377,7 +377,7 @@
+ 
+ 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 @@
+ 
+ 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 @@
+ 
+ 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 @@
+ 
+ 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 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
+inline __hostdev__ 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 @@
+ 
+ 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 @@
+ }; // 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 @@
+ 
+ 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 @@
+ }
+ 
+ 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -624,7 +624,7 @@
+ 
+ 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);
+@@ -631,7 +631,7 @@
+ }
+ 
+ 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 @@
+ 
+ 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 @@
+ 
+ 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 @@
+ 
+ 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 @@
+ }; // 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 @@
+ 
+ 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 @@
+ 
+ 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) {
--- a/build_files/build_environment/patches/openvdb.diff
+++ b/build_files/build_environment/patches/openvdb.diff
@@ -99,321 +99,3 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/v
 +
 +    END
 +END
-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;
- 
- #endif // __CUDACC_RTC__
- 
-#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) {
-
--- a/build_files/build_environment/patches/usd.diff
+++ b/build_files/build_environment/patches/usd.diff
@@ -25,78 +25,3 @@ diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/default
 set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
 set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")

-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()
- {
-+    // BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
-+    return ArchGetTickTime();
-+
-+#if 0
-     uint64_t t;
- #if defined (ARCH_OS_DARWIN)
-     return ArchGetTickTime();
-@@ -123,6 +127,7 @@ ArchGetStartTickTime()
- #error "Unsupported architecture."
- #endif
-   return t;
-+#endif
- }
- 
- /// Get a "stop" tick time for measuring an interval of time.  See
-@@ -132,6 +137,10 @@ ArchGetStartTickTime()
- inline uint64_t
- ArchGetStopTickTime()
- {
-+    // BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
-+    return ArchGetTickTime();
-+
-+#if 0
-     uint64_t t;
- #if defined (ARCH_OS_DARWIN)
-     return ArchGetTickTime();
-@@ -162,11 +171,11 @@ ArchGetStopTickTime()
- #error "Unsupported architecture."
- #endif
-   return t;
-+#endif
- }
- 
-#if defined (doxygen) ||                                                       \
-    (!defined(ARCH_OS_DARWIN) && defined(ARCH_CPU_INTEL) &&                    \
-     (defined(ARCH_COMPILER_CLANG) || defined(ARCH_COMPILER_GCC)))
-+// BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
-+#if 0
- 
- /// A simple timer class for measuring an interval of time using the
- /// ArchTickTimer facilities.
--- a/build_files/build_environment/patches/vpx_windows.diff
+++ b/build_files/build_environment/patches/vpx_windows.diff
@@ -1,11 +0,0 @@
-diff -Naur orig/configure external_vpx/configure
--- orig/configure	2022-07-06 09:22:04 -0600
-+++ external_vpx/configure	2022-07-06 09:24:12 -0600
-@@ -270,7 +270,6 @@
- HAVE_LIST="
-     ${ARCH_EXT_LIST}
-     vpx_ports
-    pthread_h
-     unistd_h
- "
- EXPERIMENT_LIST="
--- a/build_files/build_environment/windows/build_deps.cmd
+++ b/build_files/build_environment/windows/build_deps.cmd
@@ -48,13 +48,10 @@ if "%4" == "nobuild" set dobuild=0

 REM If Python is be available certain deps may try to 
 REM to use this over the version we build, to prevent that
-REM make sure pythonw is NOT in the path. We look for pythonw.exe
-REM since windows apparently ships a python.exe that just opens up
-REM the windows store but does not ship any actual python files that
-REM could cause issues.  
-for %%X in (pythonw.exe) do (set PYTHONW=%%~$PATH:X)
-if EXIST "%PYTHONW%" (
-  echo PYTHON found at %PYTHONW% dependencies cannot be build with python available in the path
+REM make sure python is NOT in the path
+for %%X in (python.exe) do (set PYTHON=%%~$PATH:X)
+if EXIST "%PYTHON%" (
+  echo PYTHON found at %PYTHON% dependencies cannot be build with python available in the path
  goto exit
 )

@@ -110,8 +107,8 @@ 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 /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
+	msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
+	msbuild /maxcpucount:1 /m "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
 )
@@ -123,8 +120,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 /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
+	msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
+	msbuild /maxcpucount:1 /m "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
 )
--- a/build_files/cmake/Modules/FindLevelZero.cmake
+++ b/build_files/cmake/Modules/FindLevelZero.cmake
@@ -1,56 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021-2022 Intel Corporation
-
-# - Find Level Zero library
-# Find Level Zero headers and libraries needed by oneAPI implementation
-# This module defines
-#  LEVEL_ZERO_LIBRARY, libraries to link against in order to use L0.
-#  LEVEL_ZERO_INCLUDE_DIR, directories where L0 headers can be found.
-#  LEVEL_ZERO_ROOT_DIR, The base directory to search for L0 files.
-#                 This can also be an environment variable.
-#  LEVEL_ZERO_FOUND, If false, then don't try to use L0.
-
-IF(NOT LEVEL_ZERO_ROOT_DIR AND NOT $ENV{LEVEL_ZERO_ROOT_DIR} STREQUAL "")
-  SET(LEVEL_ZERO_ROOT_DIR $ENV{LEVEL_ZERO_ROOT_DIR})
-ENDIF()
-
-SET(_level_zero_search_dirs
-  ${LEVEL_ZERO_ROOT_DIR}
-  /usr/lib
-  /usr/local/lib
-)
-
-FIND_LIBRARY(_LEVEL_ZERO_LIBRARY
-  NAMES
-    ze_loader
-  HINTS
-    ${_level_zero_search_dirs}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(_LEVEL_ZERO_INCLUDE_DIR
-  NAMES
-    level_zero/ze_api.h
-  HINTS
-    ${_level_zero_search_dirs}
-  PATH_SUFFIXES
-    include
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LevelZero DEFAULT_MSG _LEVEL_ZERO_LIBRARY _LEVEL_ZERO_INCLUDE_DIR)
-
-IF(LevelZero_FOUND)
-  SET(LEVEL_ZERO_LIBRARY ${_LEVEL_ZERO_LIBRARY})
-  SET(LEVEL_ZERO_INCLUDE_DIR ${_LEVEL_ZERO_INCLUDE_DIR} ${_LEVEL_ZERO_INCLUDE_PARENT_DIR})
-  SET(LEVEL_ZERO_FOUND TRUE)
-ELSE()
-  SET(LEVEL_ZERO_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  LEVEL_ZERO_LIBRARY
-  LEVEL_ZERO_INCLUDE_DIR
-)
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -175,9 +175,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
 IF(PYTHONLIBSUNIX_FOUND)
  # Assign cache items
  SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_CONFIG_DIR})
-  IF(NOT WITH_PYTHON_MODULE)
-    SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
-  ENDIF()
+  SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})

  FIND_FILE(PYTHON_SITE_PACKAGES
    NAMES
--- a/build_files/cmake/Modules/FindSYCL.cmake
+++ b/build_files/cmake/Modules/FindSYCL.cmake
@@ -1,88 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021-2022 Intel Corporation
-
-# - Find SYCL library
-# Find the native SYCL header and libraries needed by oneAPI implementation
-# This module defines
-#  SYCL_COMPILER, compiler which will be used for compilation of SYCL code
-#  SYCL_LIBRARY, libraries to link against in order to use SYCL.
-#  SYCL_INCLUDE_DIR, directories where SYCL headers can be found
-#  SYCL_ROOT_DIR, The base directory to search for SYCL files.
-#                 This can also be an environment variable.
-#  SYCL_FOUND, If false, then don't try to use SYCL.
-
-IF(NOT SYCL_ROOT_DIR AND NOT $ENV{SYCL_ROOT_DIR} STREQUAL "")
-  SET(SYCL_ROOT_DIR $ENV{SYCL_ROOT_DIR})
-ENDIF()
-
-SET(_sycl_search_dirs
-  ${SYCL_ROOT_DIR}
-  /usr/lib
-  /usr/local/lib
-  /opt/intel/oneapi/compiler/latest/linux/
-  C:/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/windows
-)
-
-# Find DPC++ compiler.
-# Since the compiler name is possibly conflicting with the system-wide
-# CLang start with looking for either dpcpp or clang binary in the given
-# list of search paths only. If that fails, try to look for a system-wide
-# dpcpp binary.
-FIND_PROGRAM(SYCL_COMPILER
-  NAMES
-    dpcpp
-    clang++
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    bin
-  NO_CMAKE_FIND_ROOT_PATH
-  NAMES_PER_DIR
-)
-
-# NOTE: No clang++ here so that we do not pick up a system-wide CLang
-# compiler.
-if(NOT SYCL_COMPILER)
-  FIND_PROGRAM(SYCL_COMPILER
-   NAMES
-      dpcpp
-    HINTS
-      ${_sycl_search_dirs}
-    PATH_SUFFIXES
-      bin
-  )
-endif()
-
-FIND_LIBRARY(SYCL_LIBRARY
-  NAMES
-    sycl
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(SYCL_INCLUDE_DIR
-  NAMES
-    CL/sycl.hpp
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    include
-    include/sycl
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL DEFAULT_MSG SYCL_LIBRARY SYCL_INCLUDE_DIR)
-
-IF(SYCL_FOUND)
-  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()
-
-MARK_AS_ADVANCED(
-  _SYCL_INCLUDE_PARENT_DIR
-)
--- a/build_files/cmake/Modules/FindUSD.cmake
+++ b/build_files/cmake/Modules/FindUSD.cmake
@@ -64,7 +64,6 @@ ENDIF()
 MARK_AS_ADVANCED(
  USD_INCLUDE_DIR
  USD_LIBRARY_DIR
-  USD_LIBRARY
 )

 UNSET(_usd_SEARCH_DIRS)
--- a/build_files/cmake/Modules/FindWebP.cmake
+++ b/build_files/cmake/Modules/FindWebP.cmake
@@ -74,9 +74,4 @@ ENDIF()
 MARK_AS_ADVANCED(
  WEBP_INCLUDE_DIR
  WEBP_LIBRARY_DIR
-
-  # Generated names.
-  WEBP_WEBPDEMUX_LIBRARY
-  WEBP_WEBPMUX_LIBRARY
-  WEBP_WEBP_LIBRARY
 )
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 """
 Example linux usage
 python3 ~/blender-git/blender/build_files/cmake/cmake_netbeans_project.py ~/blender-git/cmake
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 r"""
 Example Linux usage:
 python ~/blender-git/blender/build_files/cmake/cmake_qtcreator_project.py --build-dir ~/blender-git/cmake
--- a/build_files/cmake/cmake_static_check_clang_array.py
+++ b/build_files/cmake/cmake_static_check_clang_array.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 import project_source_info
 import subprocess
 import sys
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 import project_source_info
 import subprocess
 import sys
--- a/build_files/cmake/cmake_static_check_smatch.py
+++ b/build_files/cmake/cmake_static_check_smatch.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 CHECKER_IGNORE_PREFIX = [
    "extern",
    "intern/moto",
--- a/build_files/cmake/cmake_static_check_sparse.py
+++ b/build_files/cmake/cmake_static_check_sparse.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 CHECKER_IGNORE_PREFIX = [
    "extern",
    "intern/moto",
--- a/build_files/cmake/cmake_static_check_splint.py
+++ b/build_files/cmake/cmake_static_check_splint.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 CHECKER_IGNORE_PREFIX = [
    "extern",
    "intern/moto",
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -37,9 +37,6 @@ set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          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)
-set(WITH_IO_WAVEFRONT_OBJ    OFF CACHE BOOL "" FORCE)
-set(WITH_IO_GPENCIL          OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -70,7 +70,7 @@ if(NOT WIN32)
  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 endif()
 if(WIN32)
-  set(WITH_WASAPI               ON  CACHE BOOL "" FORCE)
+  set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
  set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
@@ -86,8 +86,4 @@ if(NOT APPLE)
  set(WITH_CYCLES_CUDA_BINARIES   ON  CACHE BOOL "" FORCE)
  set(WITH_CYCLES_CUBIN_COMPILER  OFF CACHE BOOL "" FORCE)
  set(WITH_CYCLES_HIP_BINARIES    ON  CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_DEVICE_ONEAPI   ON  CACHE BOOL "" FORCE)
-
-  # Disable AoT kernels compilations until buildbot can deliver them in a reasonable time.
-  set(WITH_CYCLES_ONEAPI_BINARIES OFF CACHE BOOL "" FORCE)
 endif()
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -162,9 +162,6 @@ if(WITH_CODEC_FFMPEG)
    mp3lame ogg opus swresample swscale
    theora theoradec theoraenc vorbis vorbisenc
    vorbisfile vpx x264 xvidcore)
-  if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
-    list(APPEND FFMPEG_FIND_COMPONENTS aom)
-  endif()
  find_package(FFmpeg)
 endif()

@@ -218,12 +215,7 @@ if(WITH_SDL)
  find_package(SDL2)
  set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
  set(SDL_LIBRARY ${SDL2_LIBRARIES})
-  string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController")
-  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-    # The minimum macOS version of the libraries makes it so this is included in SDL on arm64
-    # but not x86_64.
-    string(APPEND PLATFORM_LINKFLAGS " -framework CoreHaptics")
-  endif()
+  string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController -framework CoreHaptics")
 endif()

 set(PNG_ROOT ${LIBDIR}/png)
@@ -470,9 +462,8 @@ string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")

 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.
-set(PLATFORM_SYMBOLS_MAP ${CMAKE_SOURCE_DIR}/source/creator/symbols_apple.map)
 string(APPEND PLATFORM_LINKFLAGS
-  " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
+  " -Wl,-unexported_symbols_list,'${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
 )

 string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
--- a/build_files/cmake/platform/platform_old_libs_update.cmake
+++ b/build_files/cmake/platform/platform_old_libs_update.cmake
@@ -25,7 +25,6 @@ if(UNIX AND
  unset_cache_variables("^PNG")
  unset_cache_variables("^USD")
  unset_cache_variables("^WEBP")
-  unset_cache_variables("^NANOVDB")
 endif()

 # Automatically set WebP on/off depending if libraries are available.
@@ -36,11 +35,3 @@ if(EXISTS ${LIBDIR}/webp)
 else()
  set(WITH_IMAGE_WEBP OFF)
 endif()
-
-# NanoVDB moved into openvdb.
-if(UNIX AND DEFINED NANOVDB_INCLUDE_DIR)
-  if(NOT EXISTS ${NANOVDB_INCLUDE_DIR} AND
-     EXISTS ${LIBDIR}/openvdb/include/nanovdb)
-    unset_cache_variables("^NANOVDB")
-  endif()
-endif()
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -38,15 +38,9 @@ if(EXISTS ${LIBDIR})
  message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")

  file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
-
  # Ignore Mesa software OpenGL libraries, they are not intended to be
  # linked against but to optionally override at runtime.
  list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/mesa)
-
-  # Ignore DPC++ as it contains its own copy of LLVM/CLang which we do
-  # not need to be ever discovered for the Blender linking.
-  list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/dpcpp)
-
  # NOTE: Make sure "proper" compiled zlib comes first before the one
  # which is a part of OpenCollada. They have different ABI, and we
  # do need to use the official one.
@@ -202,9 +196,6 @@ if(WITH_CODEC_FFMPEG)
      vpx
      x264
      xvidcore)
-    if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
-      list(APPEND FFMPEG_FIND_COMPONENTS aom)
-    endif()
  elseif(FFMPEG)
    # Old cache variable used for root dir, convert to new standard.
    set(FFMPEG_ROOT_DIR ${FFMPEG})
@@ -280,18 +271,6 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
  endif()
 endif()

-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 DPC++ and SYCL installation")
-  if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
-    set(SYCL_ROOT_DIR ${CYCLES_SYCL})
-  endif()
-endif()
-
 if(WITH_OPENVDB)
  find_package_wrapper(OpenVDB)
  find_package_wrapper(Blosc)
@@ -634,42 +613,17 @@ if(WITH_GHOST_WAYLAND)
  pkg_check_modules(wayland-scanner REQUIRED wayland-scanner)
  pkg_check_modules(xkbcommon REQUIRED xkbcommon)
  pkg_check_modules(wayland-cursor REQUIRED wayland-cursor)
+  pkg_check_modules(dbus REQUIRED dbus-1)

-  if(WITH_GHOST_WAYLAND_DBUS)
-    pkg_check_modules(dbus REQUIRED dbus-1)
-  endif()
-
-  if(WITH_GHOST_WAYLAND_LIBDECOR)
-    pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1)
-  endif()
+  set(WITH_GL_EGL ON)

  list(APPEND PLATFORM_LINKLIBS
+    ${wayland-client_LINK_LIBRARIES}
+    ${wayland-egl_LINK_LIBRARIES}
    ${xkbcommon_LINK_LIBRARIES}
+    ${wayland-cursor_LINK_LIBRARIES}
+    ${dbus_LINK_LIBRARIES}
  )
-
-  if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
-    list(APPEND PLATFORM_LINKLIBS
-      ${wayland-client_LINK_LIBRARIES}
-      ${wayland-egl_LINK_LIBRARIES}
-      ${wayland-cursor_LINK_LIBRARIES}
-    )
-  endif()
-
-  if(WITH_GHOST_WAYLAND_DBUS)
-    list(APPEND PLATFORM_LINKLIBS
-      ${dbus_LINK_LIBRARIES}
-    )
-    add_definitions(-DWITH_GHOST_WAYLAND_DBUS)
-  endif()
-
-  if(WITH_GHOST_WAYLAND_LIBDECOR)
-    if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
-      list(APPEND PLATFORM_LINKLIBS
-        ${libdecor_LIBRARIES}
-      )
-    endif()
-    add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR)
-  endif()
 endif()

 if(WITH_GHOST_X11)
@@ -888,9 +842,8 @@ unset(_IS_LINKER_DEFAULT)

 # Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may
 # use the same libraries as Blender with a different version or build options.
-set(PLATFORM_SYMBOLS_MAP ${CMAKE_SOURCE_DIR}/source/creator/symbols_unix.map)
 set(PLATFORM_LINKFLAGS
-  "${PLATFORM_LINKFLAGS} -Wl,--version-script='${PLATFORM_SYMBOLS_MAP}'"
+  "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
 )

 # Don't use position independent executable for portable install since file
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -104,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
+  pathcch Shcore
 )

 if(WITH_INPUT_IME)
@@ -950,6 +950,3 @@ endif()

 set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
 set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
-
-set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
-set(SYCL_ROOT_DIR ${LIBDIR}/dpcpp)
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 """
 Module for accessing project file data for Blender.

@@ -168,7 +170,7 @@ def cmake_advanced_info() -> Union[Tuple[List[str], List[Tuple[str, str]]], Tupl
    project_path = create_eclipse_project()

    if not exists(project_path):
-        print("Generating Eclipse Project File Failed: %r not found" % project_path)
+        print("Generating Eclipse Prokect File Failed: %r not found" % project_path)
        return None, None

    from xml.dom.minidom import parse
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 __all__ = (
    "build_info",
    "SOURCE_DIR",
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -54,8 +54,6 @@ buildbot:
        version: '10.1.243'
    cuda11:
        version: '11.4.1'
-    hip:
-        version: '5.2.21440'
    optix:
        version: '7.3.0'
    cmake:
--- a/build_files/package_spec/build_archive.py
+++ b/build_files/package_spec/build_archive.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 import os
 import shutil
 import subprocess
--- a/build_files/windows/find_dependencies.cmd
+++ b/build_files/windows/find_dependencies.cmd
@@ -3,10 +3,13 @@ for %%X in (svn.exe) do (set SVN=%%~$PATH:X)
 for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X)
 for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X)
 for %%X in (git.exe) do (set GIT=%%~$PATH:X)
-REM For python, default on 310 but if that does not exist also check
-REM the 311, 312 and finally 39 folders to see if those are there, it checks
-REM this far ahead to ensure good lib folder compatibility in the future
-REM it falls back to 3.9 just incase it is a very old lib folder.
+REM For python, default on 39 but if that does not exist also check
+REM the 310,311 and 312 folders to see if those are there, it checks
+REM this far ahead to ensure good lib folder compatibility in the future.
+set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
+if EXIST %PYTHON% (
+	goto detect_python_done
+)
 set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\310\bin\python.exe
 if EXIST %PYTHON% (
 	goto detect_python_done
@@ -19,10 +22,6 @@ set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\312\bin\python.exe
 if EXIST %PYTHON% (
 	goto detect_python_done
 )
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)

 if NOT EXIST %PYTHON% (
    echo Warning: Python not found, there is likely an issue with the library folder
--- a/doc/blender_file_format/BlendFileDnaExporter_25.py
+++ b/doc/blender_file_format/BlendFileDnaExporter_25.py
@@ -411,7 +411,7 @@ def main():
        # read blend header from blend file
        log.info("2: read file:")

-        if dir not in sys.path:
+        if not dir in sys.path:
            sys.path.append(dir)
        import BlendFileReader

--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = V3.4
+PROJECT_NUMBER         = V3.2

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/doc/manpage/blender.1.py
+++ b/doc/manpage/blender.1.py
@@ -11,6 +11,8 @@ where <path-to-blender> is the path to the Blender executable,
 and <output-filename> is where to write the generated man page.
 '''

+# <pep8 compliant>
+
 import argparse
 import os
 import subprocess
--- a/doc/python_api/examples/bpy.types.Context.temp_override.1.py
+++ b/doc/python_api/examples/bpy.types.Context.temp_override.1.py
@@ -10,7 +10,7 @@ Notes:

 - Temporary context overrides may be nested, when this is done, members will be added to the existing overrides.

- Context members are restored outside the scope of the context-manager.
+- Context members are restored outside the scope of the context.
  The only exception to this is when the data is no longer available.

  In the event windowing data was removed (for example), the state of the context is left as-is.
--- a/doc/python_api/examples/bpy.types.Image.py
+++ b/doc/python_api/examples/bpy.types.Image.py
@@ -1,46 +0,0 @@
-"""
-Image Data
-++++++++++
-
-The Image data-block is a shallow wrapper around image or video file(s)
-(on disk, as packed data, or generated).
-
-All actual data like the pixel buffer, size, resolution etc. is
-cached in an :class:`imbuf.types.ImBuf` image buffer (or several buffers
-in some cases, like UDIM textures, multi-views, animations...).
-
-Several properties and functions of the Image data-block are then actually
-using/modifying its image buffer, and not the Image data-block itself.
-
-.. warning::
-
-   One key limitation is that image buffers are not shared between different
-   Image data-blocks, and they are not duplicated when copying an image.
-
-   So until a modified image buffer is saved on disk, duplicating its Image
-   data-block will not propagate the underlying buffer changes to the new Image.
-
-
-This example script generates an Image data-block with a given size,
-change its first pixel, rescale it, and duplicates the image.
-
-The duplicated image still has the same size and colors as the original image
-at its creation, all editing in the original image's buffer is 'lost' in its copy.
-"""
-
-import bpy
-
-image_src = bpy.data.images.new('src', 1024, 102)
-print(image_src.size)
-print(image_src.pixels[0:4])
-
-image_src.scale(1024, 720)
-image_src.pixels[0:4] = (0.5, 0.5, 0.5, 0.5)
-image_src.update()
-print(image_src.size)
-print(image_src.pixels[0:4])
-
-image_dest = image_src.copy()
-image_dest.update()
-print(image_dest.size)
-print(image_dest.pixels[0:4])
--- a/doc/python_api/examples/gpu.6.py
+++ b/doc/python_api/examples/gpu.6.py
@@ -29,36 +29,3 @@ def draw():


 bpy.types.SpaceView3D.draw_handler_add(draw, (), 'WINDOW', 'POST_PIXEL')
-
-"""
-3D Image
--------
-
-Similar to the 2D Image shader, but works with 3D positions for the image vertices.
-To use this example you have to provide an image that should be displayed.
-"""
-import bpy
-import gpu
-from gpu_extras.batch import batch_for_shader
-
-IMAGE_NAME = "Untitled"
-image = bpy.data.images[IMAGE_NAME]
-texture = gpu.texture.from_image(image)
-
-shader = gpu.shader.from_builtin('3D_IMAGE')
-batch = batch_for_shader(
-    shader, 'TRIS',
-    {
-        "pos": ((0, 0, 0), (0, 1, 1), (1, 1, 1), (1, 1, 1), (1, 0, 0), (0, 0, 0)),
-        "texCoord": ((0, 0), (0, 1), (1, 1), (1, 1), (1, 0), (0, 0)),
-    },
-)
-
-
-def draw():
-    shader.bind()
-    shader.uniform_sampler("image", texture)
-    batch.draw(shader)
-
-
-bpy.types.SpaceView3D.draw_handler_add(draw, (), 'WINDOW', 'POST_VIEW')
--- a/doc/python_api/examples/gpu.8.py
+++ b/doc/python_api/examples/gpu.8.py
@@ -43,7 +43,7 @@ with offscreen.bind():
 offscreen.free()


-if IMAGE_NAME not in bpy.data.images:
+if not IMAGE_NAME in bpy.data.images:
    bpy.data.images.new(IMAGE_NAME, WIDTH, HEIGHT)
 image = bpy.data.images[IMAGE_NAME]
 image.scale(WIDTH, HEIGHT)
--- a/doc/python_api/requirements.txt
+++ b/doc/python_api/requirements.txt
@@ -1,12 +1,12 @@
-sphinx==5.0.1
+sphinx==4.1.1

 # Sphinx dependencies that are important
-Jinja2==3.1.2
-Pygments==2.12.0
+Jinja2==3.0.1
+Pygments==2.10.0
 docutils==0.17.1
-snowballstemmer==2.2.0
-babel==2.10.1
-requests==2.27.1
+snowballstemmer==2.1.0
+babel==2.9.1
+requests==2.26.0

 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
--- a/doc/python_api/rst/bgl.rst
+++ b/doc/python_api/rst/bgl.rst
@@ -4,12 +4,6 @@ OpenGL Wrapper (bgl)

 .. module:: bgl

-.. warning::
-
-   This module is deprecated and will be removed in a future release,
-   when OpenGL is replaced by Metal and Vulkan.
-   Use the graphics API independent :mod:`gpu` module instead.
-
 This module wraps OpenGL constants and functions, making them available from
 within Blender Python.

--- a/doc/python_api/rst/info_best_practice.rst
+++ b/doc/python_api/rst/info_best_practice.rst
@@ -40,6 +40,15 @@ As well as pep8 we have additional conventions used for Blender Python scripts:
 - pep8 also defines that lines should not exceed 79 characters,
  we have decided that this is too restrictive so it is optional per script.

+Periodically we run checks for pep8 compliance on Blender scripts,
+for scripts to be included in this check add this line as a comment at the top of the script:
+
+``# <pep8 compliant>``
+
+To enable line length checks use this instead:
+
+``# <pep8-80 compliant>``
+

 User Interface Layout
 =====================
--- a/doc/python_api/rst_from_bmesh_opdefines.py
+++ b/doc/python_api/rst_from_bmesh_opdefines.py
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 # This is a quite stupid script which extracts bmesh api docs from
 # 'bmesh_opdefines.c' in order to avoid having to add a lot of introspection
 # data access into the api.
--- a/doc/python_api/sphinx_changelog_gen.py
+++ b/doc/python_api/sphinx_changelog_gen.py
@@ -1,111 +1,61 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 """
---------------
+Dump the python API into a text file so we can generate changelogs.

-Dump the python API into a JSON file, or generate changelogs from those JSON API dumps.
+output from this tool should be added into "doc/python_api/rst/change_log.rst"

-Typically, changelog output from this tool should be added into "doc/python_api/rst/change_log.rst"
+# dump api blender_version.py in CWD
+blender --background --python doc/python_api/sphinx_changelog_gen.py -- --dump

-API dump files are saved together with the generated API doc on the server, with a general index file.
-This way the changelog generation simply needs to re-download the previous version's dump for the diffing process.
-
---------------
-
-# Dump api blender_version.json in CWD:
-blender --background  --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        dump --filepath-out="path/to/api/docs/<version>/api_dump.json"
-
-# Create changelog:
+# create changelog
 blender --background --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-out doc/python_api/rst/change_log.rst
+        --api_from blender_2_63_0.py \
+        --api_to   blender_2_64_0.py \
+        --api_out changes.rst

-# Api comparison can also run without blender,
-# will by default generate changeloig between the last two available versions listed in the index,
-# unless input files are provided explicitely:
+
+# Api comparison can also run without blender
 python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-in-from blender_api_2_63_0.json \
-                  --filepath-in-to   blender_api_2_64_0.json \
-                  --filepath-out changes.rst
+        --api_from blender_api_2_63_0.py \
+        --api_to   blender_api_2_64_0.py \
+        --api_out changes.rst

--------------
-
-API dump index format:
-
-{[version_main, version_sub]: "<version>/api_dump.json", ...
-}
-
-API dump format:
-
-[
-    [version_main, vserion_sub, version_path],
-    {"module.name":
-        {"parent.class":
-            {"basic_type", "member_name":
-                ["Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types]}, ...
-        }, ...
-    }
-]
+# Save the latest API dump in this folder, renaming it with its revision.
+# This way the next person updating it doesn't need to build an old Blender only for that

 """

-import json
-import os
-
+# format
+'''
+{"module.name":
+    {"parent.class":
+        {"basic_type", "member_name":
+            ("Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types)}, ...
+    }, ...
+}
+'''

 api_names = "basic_type" "name", "type", "range", "length", "default", "descr", "f_args", "f_arg_types", "f_ret_types"
+
 API_BASIC_TYPE = 0
 API_F_ARGS = 7


-def api_version():
-    try:
-        import bpy
-    except:
-        return None, None
-    version = tuple(bpy.app.version[:2])
-    version_key = "%d.%d" % (version[0], version[1])
-    return version, version_key
+def api_dunp_fname():
+    import bpy
+    return "blender_api_%s.py" % "_".join([str(i) for i in bpy.app.version])


-def api_version_previous_in_index(index, version):
-    print("Searching for previous version to %s in %r" % (version, index))
-    version_prev = (version[0], version[1])
-    while True:
-        version_prev = (version_prev[0], version_prev[1] - 1)
-        if version_prev[1] < 0:
-            version_prev = (version_prev[0] - 1, 99)
-        if version_prev[0] < 0:
-            return None, None
-        version_prev_key = "%d.%d" % (version_prev[0], version_prev[1])
-        if version_prev_key in index:
-            print("Found previous version %s: %r" % (version_prev, index[version_prev_key]))
-            return version_prev, version_prev_key
-
-
-class JSONEncoderAPIDump(json.JSONEncoder):
-    def default(self, o):
-        if o is ...:
-            return "..."
-        if isinstance(o, set):
-            return tuple(o)
-        return json.JSONEncoder.default(self, o)
-
-
-def api_dump(args):
-    import rna_info
-    import inspect
-
-    version, version_key = api_version()
-    if version is None:
-        raise(ValueError("API dumps can only be generated from within Blender."))
-
+def api_dump():
    dump = {}
    dump_module = dump["bpy.types"] = {}

+    import rna_info
+    import inspect
+
    struct = rna_info.BuildRNAInfo()[0]
    for struct_id, struct_info in sorted(struct.items()):

@@ -207,25 +157,17 @@ def api_dump(args):
            )
        del funcs

-    filepath_out = args.filepath_out
-    with open(filepath_out, 'w', encoding='utf-8') as file_handle:
-        json.dump((version, dump), file_handle, cls=JSONEncoderAPIDump)
+    import pprint

-    indexpath = args.indexpath
-    rootpath = os.path.dirname(indexpath)
-    if os.path.exists(indexpath):
-        with open(indexpath, 'r', encoding='utf-8') as file_handle:
-            index = json.load(file_handle)
-    else:
-        index = {}
-    index[version_key] = os.path.relpath(filepath_out, rootpath)
-    with open(indexpath, 'w', encoding='utf-8') as file_handle:
-        json.dump(index, file_handle)
-
-    print("API version %s dumped into %r, and index %r has been updated" % (version_key, filepath_out, indexpath))
+    filename = api_dunp_fname()
+    filehandle = open(filename, 'w', encoding='utf-8')
+    tot = filehandle.write(pprint.pformat(dump, width=1))
+    filehandle.close()
+    print("%s, %d bytes written" % (filename, tot))


 def compare_props(a, b, fuzz=0.75):
+
    # must be same basic_type, function != property
    if a[0] != b[0]:
        return False
@@ -240,44 +182,15 @@ def compare_props(a, b, fuzz=0.75):
    return ((tot / totlen) >= fuzz)


-def api_changelog(args):
-    indexpath = args.indexpath
-    filepath_in_from = args.filepath_in_from
-    filepath_in_to = args.filepath_in_to
-    filepath_out = args.filepath_out
+def api_changelog(api_from, api_to, api_out):

-    rootpath = os.path.dirname(indexpath)
+    file_handle = open(api_from, 'r', encoding='utf-8')
+    dict_from = eval(file_handle.read())
+    file_handle.close()

-    version, version_key = api_version()
-    if version is None and (filepath_in_from is None or filepath_in_to is None):
-        raise(ValueError("API dumps files must be given when ran outside of Blender."))
-
-    with open(indexpath, 'r', encoding='utf-8') as file_handle:
-        index = json.load(file_handle)
-
-    if filepath_in_to is None:
-        filepath_in_to = index.get(version_key, None)
-    if filepath_in_to is None:
-        raise(ValueError("Cannot find API dump file for Blender version " + str(version) + " in index file."))
-
-    print("Found to file: %r" % filepath_in_to)
-
-    if filepath_in_from is None:
-        version_from, version_from_key = api_version_previous_in_index(index, version)
-        if version_from is None:
-            raise(ValueError("No previous version of Blender could be found in the index."))
-        filepath_in_from = index.get(version_from_key, None)
-    if filepath_in_from is None:
-        raise(ValueError("Cannot find API dump file for previous Blender version " + str(version_from) + " in index file."))
-
-    print("Found from file: %r" % filepath_in_from)
-
-    with open(os.path.join(rootpath, filepath_in_from), 'r', encoding='utf-8') as file_handle:
-        _, dict_from = json.load(file_handle)
-
-    with open(os.path.join(rootpath, filepath_in_to), 'r', encoding='utf-8') as file_handle:
-        dump_version, dict_to = json.load(file_handle)
-        assert(tuple(dump_version) == version)
+    file_handle = open(api_to, 'r', encoding='utf-8')
+    dict_to = eval(file_handle.read())
+    file_handle.close()

    api_changes = []

@@ -338,66 +251,63 @@ def api_changelog(args):

    # also document function argument changes

-    with open(filepath_out, 'w', encoding='utf-8') as fout:
-        fw = fout.write
+    fout = open(api_out, 'w', encoding='utf-8')
+    fw = fout.write
+    # print(api_changes)

-        # Write header.
-        fw(""
-           ":tocdepth: 2\n"
-           "\n"
-           "Blender API Change Log\n"
-           "**********************\n"
-           "\n"
-           ".. note, this document is auto generated by sphinx_changelog_gen.py\n"
-           "\n"
-           "\n"
-           "%s to %s\n"
-           "============\n"
-           "\n" % (version_from_key, version_key))
+    # :class:`bpy_struct.id_data`

-        def write_title(title, title_char):
-            fw("%s\n%s\n\n" % (title, title_char * len(title)))
+    def write_title(title, title_char):
+        fw("%s\n%s\n\n" % (title, title_char * len(title)))

-        for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
-            class_name = class_id.split(".")[-1]
-            title = mod_id + "." + class_name
-            write_title(title, "-")
+    for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
+        class_name = class_id.split(".")[-1]
+        title = mod_id + "." + class_name
+        write_title(title, "-")

-            if props_new:
-                write_title("Added", "^")
-                for prop_id in props_new:
-                    fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
-                fw("\n")
+        if props_new:
+            write_title("Added", "^")
+            for prop_id in props_new:
+                fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
+            fw("\n")

-            if props_old:
-                write_title("Removed", "^")
-                for prop_id in props_old:
-                    fw("* **%s**\n" % prop_id)  # can't link to removed docs
-                fw("\n")
+        if props_old:
+            write_title("Removed", "^")
+            for prop_id in props_old:
+                fw("* **%s**\n" % prop_id)  # can't link to removed docs
+            fw("\n")

-            if props_moved:
-                write_title("Renamed", "^")
-                for prop_id_old, prop_id in props_moved:
-                    fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
-                fw("\n")
+        if props_moved:
+            write_title("Renamed", "^")
+            for prop_id_old, prop_id in props_moved:
+                fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
+            fw("\n")

-            if func_args:
-                write_title("Function Arguments", "^")
-                for func_id, args_old, args_new in func_args:
-                    args_new = ", ".join(args_new)
-                    args_old = ", ".join(args_old)
-                    fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
-                fw("\n")
+        if func_args:
+            write_title("Function Arguments", "^")
+            for func_id, args_old, args_new in func_args:
+                args_new = ", ".join(args_new)
+                args_old = ", ".join(args_old)
+                fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
+            fw("\n")

-    print("Written: %r" % filepath_out)
+    fout.close()
+
+    print("Written: %r" % api_out)


-def main(argv=None):
+def main():
    import sys
-    import argparse
+    import os

-    if argv is None:
-        argv = sys.argv
+    try:
+        import argparse
+    except ImportError:
+        print("Old Blender, just dumping")
+        api_dump()
+        return
+
+    argv = sys.argv

    if "--" not in argv:
        argv = []  # as if no args are passed
@@ -408,42 +318,42 @@ def main(argv=None):
    usage_text = "Run blender in background mode with this script: "
    "blender --background --factory-startup --python %s -- [options]" % os.path.basename(__file__)

-    parser = argparse.ArgumentParser(description=usage_text,
-                                     epilog=__doc__,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+    epilog = "Run this before releases"
+
+    parser = argparse.ArgumentParser(description=usage_text, epilog=epilog)
+
    parser.add_argument(
-        "--indexpath", dest="indexpath", metavar='FILE', required=True,
-        help="Path of the JSON file containing the index of all available API dumps.")
+        "--dump", dest="dump", action='store_true',
+        help="When set the api will be dumped into blender_version.py")

-    parser_commands = parser.add_subparsers(required=True)
+    parser.add_argument(
+        "--api_from", dest="api_from", metavar='FILE',
+        help="File to compare from (previous version)")
+    parser.add_argument(
+        "--api_to", dest="api_to", metavar='FILE',
+        help="File to compare from (current)")
+    parser.add_argument(
+        "--api_out", dest="api_out", metavar='FILE',
+        help="Output sphinx changelog")

-    parser_dump = parser_commands.add_parser('dump', help="Dump the current Blender Python API into a JSON file.")
-    parser_dump.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Path of the JSON file containing the dump of the API.")
-    parser_dump.set_defaults(func=api_dump)
+    args = parser.parse_args(argv)  # In this example we won't use the args

-    parser_changelog = parser_commands.add_parser(
-        'changelog',
-        help="Generate the RST changelog page based on two Blender Python API JSON dumps.",
-    )
+    if not argv:
+        print("No args given!")
+        parser.print_help()
+        return

-    parser_changelog.add_argument(
-        "--filepath-in-from", dest="filepath_in_from", metavar='FILE', default=None,
-        help="JSON dump file to compare from (typically, previous version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-in-to", dest="filepath_in_to", metavar='FILE', default=None,
-        help="JSON dump file to compare to (typically, current version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Output sphinx changelog RST file.")
-    parser_changelog.set_defaults(func=api_changelog)
+    if args.dump:
+        api_dump()
+    else:
+        if args.api_from and args.api_to and args.api_out:
+            api_changelog(args.api_from, args.api_to, args.api_out)
+        else:
+            print("Error: --api_from/api_to/api_out args needed")
+            parser.print_help()
+            return

-    args = parser.parse_args(argv)
-
-    args.func(args)
+    print("batch job finished, exiting")


 if __name__ == "__main__":
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
--- a/doc/python_api/sphinx_doc_gen_monkeypatch.py
+++ b/doc/python_api/sphinx_doc_gen_monkeypatch.py
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

+# <pep8 compliant>
+
 bpy_types_Operator_bl_property__doc__ = (
    """
 The name of a property to use as this operators primary property.
--- a/doc/python_api/static/css/theme_overrides.css
+++ b/doc/python_api/static/css/theme_overrides.css
@@ -1,3 +1,10 @@
+/* T76453: Prevent Long enum lists */
+.field-list > dd p {
+   max-height: 245px;
+   overflow-y: auto !important;
+   word-break: break-word;
+}
+
 /* Hide home icon in search area */
 .wy-side-nav-search > a:hover {background: none; opacity: 0.9}
 .wy-side-nav-search > a.icon::before {content: none}
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -450,11 +450,7 @@ if(WITH_COREAUDIO)
 		if(WITH_STRICT_DEPENDENCIES)
 			message(FATAL_ERROR "CoreAudio not found!")
 		else()
-			if(AUDASPACE_STANDALONE)
-				set(WITH_COREAUDIO FALSE CACHE BOOL "Build With CoreAudio" FORCE)
-			else()
-				set(WITH_COREAUDIO FALSE)
-			endif()
+			set(WITH_COREAUDIO FALSE CACHE BOOL "Build With CoreAudio" FORCE)
 			message(WARNING "CoreAudio not found, plugin will not be built.")
 		endif()
 	endif()
@@ -491,11 +487,7 @@ if(WITH_FFMPEG)
 			list(APPEND DLLS ${FFMPEG_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_FFMPEG FALSE CACHE BOOL "Build With FFMPEG" FORCE)
-		else()
-			set(WITH_FFMPEG FALSE)
-		endif()
+		set(WITH_FFMPEG FALSE CACHE BOOL "Build With FFMPEG" FORCE)
 		message(WARNING "FFMPEG not found, plugin will not be built.")
 	endif()
 endif()
@@ -544,11 +536,7 @@ if(WITH_FFTW)
 			list(APPEND DLLS ${FFTW_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_FFTW FALSE CACHE BOOL "Build With FFTW" FORCE)
-		else()
-			set(WITH_FFTW FALSE)
-		endif()
+		set(WITH_FFTW FALSE CACHE BOOL "Build With FFTW" FORCE)
 		message(WARNING "FFTW not found, convolution functionality will not be built.")
 	endif()
 endif()
@@ -591,11 +579,7 @@ if(WITH_JACK)
 			list(APPEND DLLS ${JACK_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_JACK FALSE CACHE BOOL "Build With JACK" FORCE)
-		else()
-			set(WITH_JACK FALSE)
-		endif()
+		set(WITH_JACK FALSE CACHE BOOL "Build With JACK" FORCE)
 		message(WARNING "JACK not found, plugin will not be built.")
 	endif()
 endif()
@@ -631,11 +615,7 @@ if(WITH_LIBSNDFILE)
 			list(APPEND DLLS ${LIBSNDFILE_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_LIBSNDFILE FALSE CACHE BOOL "Build With LibSndFile" FORCE)
-		else()
-			set(WITH_LIBSNDFILE FALSE)
-		endif()
+		set(WITH_LIBSNDFILE FALSE CACHE BOOL "Build With LibSndFile" FORCE)
 		message(WARNING "LibSndFile not found, plugin will not be built.")
 	endif()
 endif()
@@ -669,11 +649,7 @@ if(WITH_OPENAL)
 			list(APPEND DLLS ${OPENAL_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_OPENAL FALSE CACHE BOOL "Build With OpenAL" FORCE)
-		else()
-			set(WITH_OPENAL FALSE)
-		endif()
+		set(WITH_OPENAL FALSE CACHE BOOL "Build With OpenAL" FORCE)
 		message(WARNING "OpenAL not found, plugin will not be built.")
 	endif()
 endif()
@@ -709,11 +685,7 @@ if(WITH_PULSEAUDIO)
 			list(APPEND STATIC_PLUGINS PulseAudioDevice)
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_PULSEAUDIO FALSE CACHE BOOL "Build With PulseAudio" FORCE)
-		else()
-			set(WITH_PULSEAUDIO FALSE)
-		endif()
+		set(WITH_PULSEAUDIO FALSE CACHE BOOL "Build With PulseAudio" FORCE)
 		message(WARNING "PulseAudio not found, plugin will not be built.")
 	endif()
 endif()
@@ -744,12 +716,8 @@ if(WITH_PYTHON)
 			list(APPEND DLLS ${PYTHON_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_PYTHON FALSE CACHE BOOL "Build With Python Library" FORCE)
-		else()
-			set(WITH_PYTHON FALSE)
-		endif()
-		message(WARNING "Python & NumPy libraries not found, language binding will not be built.")
+		set(WITH_PYTHON FALSE CACHE BOOL "Build With Python Library" FORCE)
+		message(WARNING "Python libraries not found, language binding will not be built.")
 	endif()
 endif()

@@ -791,11 +759,7 @@ if(WITH_SDL)
 			list(APPEND DLLS ${SDL_DLLS})
 		endif()
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_SDL FALSE CACHE BOOL "Build With SDL" FORCE)
-		else()
-			set(WITH_SDL FALSE)
-		endif()
+		set(WITH_SDL FALSE CACHE BOOL "Build With SDL" FORCE)
 		message(WARNING "SDL not found, plugin will not be built.")
 	endif()
 endif()
@@ -1152,11 +1116,7 @@ if(WITH_DOCS)

 		add_custom_target(audaspace_doc ALL ${DOXYGEN_EXECUTABLE} Doxyfile COMMENT "Building C++ HTML documentation with Doxygen.")
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_DOCS FALSE CACHE BOOL "Build C++ HTML Documentation with Doxygen" FORCE)
-		else()
-			set(WITH_DOCS FALSE)
-		endif()
+		set(WITH_DOCS FALSE CACHE BOOL "Build C++ HTML Documentation with Doxygen" FORCE)
 		message(WARNING "Doxygen (and/or dot) not found, documentation will not be built.")
 	endif()
 endif()
@@ -1169,11 +1129,7 @@ if(WITH_BINDING_DOCS)

 		add_custom_target(bindings_doc ALL COMMAND ${PYTHON_EXECUTABLE} setup.py --build-docs ${SPHINX_EXECUTABLE} -q -b html -c "${CMAKE_CURRENT_BINARY_DIR}" -d "${CMAKE_CURRENT_BINARY_DIR}/_doctrees" "${CMAKE_CURRENT_SOURCE_DIR}/bindings/doc" "${CMAKE_CURRENT_BINARY_DIR}/doc/bindings" DEPENDS pythonmodule COMMENT "Building C/Python HTML documentation with Sphinx.")
 	else()
-		if(AUDASPACE_STANDALONE)
-			set(WITH_BINDING_DOCS FALSE CACHE BOOL "Build C/Python HTML Documentation with Sphinx" FORCE)
-		else()
-			set(WITH_BINDING_DOCS FALSE)
-		endif()
+		set(WITH_BINDING_DOCS FALSE CACHE BOOL "Build C/Python HTML Documentation with Sphinx" FORCE)
 		message(WARNING "Sphinx not found, binding documentation will not be built.")
 	endif()
 endif()
--- a/extern/audaspace/bindings/C/AUD_Special.cpp
+++ b/extern/audaspace/bindings/C/AUD_Special.cpp
@@ -270,7 +270,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl
 	return length;
 }

-AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data, char* error, size_t errorsize)
+AUD_API const char* AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data)
 {
 	try
 	{
@@ -282,20 +282,15 @@ AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int lengt
 		std::shared_ptr<IWriter> writer = FileWriter::createWriter(filename, convCToDSpec(specs), static_cast<Container>(format), static_cast<Codec>(codec), bitrate);
 		FileWriter::writeReader(reader, writer, length, buffersize, callback, data);

-		return true;
+		return nullptr;
 	}
 	catch(Exception& e)
 	{
-		if(error && errorsize)
-		{
-			std::strncpy(error, e.getMessage().c_str(), errorsize);
-			error[errorsize - 1] = '\0';
-		}
-		return false;
+		return e.getMessage().c_str();
 	}
 }

-AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data, char* error, size_t errorsize)
+AUD_API const char* AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data)
 {
 	try
 	{
@@ -333,16 +328,11 @@ AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsign
 		reader->seek(start);
 		FileWriter::writeReader(reader, writers, length, buffersize, callback, data);

-		return true;
+		return nullptr;
 	}
 	catch(Exception& e)
 	{
-		if(error && errorsize)
-		{
-			std::strncpy(error, e.getMessage().c_str(), errorsize);
-			error[errorsize - 1] = '\0';
-		}
-		return false;
+		return e.getMessage().c_str();
 	}
 }

--- a/extern/audaspace/bindings/C/AUD_Special.h
+++ b/extern/audaspace/bindings/C/AUD_Special.h
@@ -70,15 +70,13 @@ extern AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, in
 * \param bitrate The bitrate for encoding.
 * \param callback A callback function that is called periodically during mixdown, reporting progress if length > 0. Can be NULL.
 * \param data Pass through parameter that is passed to the callback.
- * \param error String buffer to copy the error message to in case of failure.
- * \param errorsize The size of the error buffer.
- * \return Whether or not the operation succeeded.
+ * \return An error message or NULL in case of success.
 */
-extern AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length,
+extern AUD_API const char* AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length,
 							   unsigned int buffersize, const char* filename,
 							   AUD_DeviceSpecs specs, AUD_Container format,
 							   AUD_Codec codec, unsigned int bitrate,
-							   void(*callback)(float, void*), void* data, char* error, size_t errorsize);
+							   void(*callback)(float, void*), void* data);

 /**
 * Mixes a sound down into multiple files.
@@ -93,15 +91,13 @@ extern AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned in
 * \param bitrate The bitrate for encoding.
 * \param callback A callback function that is called periodically during mixdown, reporting progress if length > 0. Can be NULL.
 * \param data Pass through parameter that is passed to the callback.
- * \param error String buffer to copy the error message to in case of failure.
- * \param errorsize The size of the error buffer.
- * \return Whether or not the operation succeeded.
+ * \return An error message or NULL in case of success.
 */
-extern AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length,
+extern AUD_API const char* AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length,
 										   unsigned int buffersize, const char* filename,
 										   AUD_DeviceSpecs specs, AUD_Container format,
 										   AUD_Codec codec, unsigned int bitrate,
-										   void(*callback)(float, void*), void* data, char* error, size_t errorsize);
+										   void(*callback)(float, void*), void* data);

 /**
 * Opens a read device and prepares it for mixdown of the sound scene.
--- a/extern/audaspace/include/util/Buffer.h
+++ b/extern/audaspace/include/util/Buffer.h
@@ -34,7 +34,7 @@ class AUD_API Buffer
 {
 private:
 	/// The size of the buffer in bytes.
-	long long m_size;
+	int m_size;

 	/// The pointer to the buffer memory.
 	data_t* m_buffer;
@@ -48,7 +48,7 @@ public:
 	 * Creates a new buffer.
 	 * \param size The size of the buffer in bytes.
 	 */
-	Buffer(long long size = 0);
+	Buffer(int size = 0);

 	/**
 	 * Destroys the buffer.
@@ -63,7 +63,7 @@ public:
 	/**
 	 * Returns the size of the buffer in bytes.
 	 */
-	long long getSize() const;
+	int getSize() const;

 	/**
 	 * Resizes the buffer.
@@ -71,7 +71,7 @@ public:
 	 * \param keep Whether to keep the old data. If the new buffer is smaller,
 	 *        the data at the end will be lost.
 	 */
-	void resize(long long size, bool keep = false);
+	void resize(int size, bool keep = false);

 	/**
 	 * Makes sure the buffer has a minimum size.
@@ -81,7 +81,7 @@ public:
 	 * \param keep Whether to keep the old data. If the new buffer is smaller,
 	 *        the data at the end will be lost.
 	 */
-	void assureSize(long long size, bool keep = false);
+	void assureSize(int size, bool keep = false);
 };

 AUD_NAMESPACE_END
--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
@@ -361,7 +361,7 @@ int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
 {
 	FFMPEGReader* reader = reinterpret_cast<FFMPEGReader*>(opaque);

-	long long size = std::min(static_cast<long long>(buf_size), reader->m_membuffer->getSize() - reader->m_membufferpos);
+	int size = std::min(buf_size, reader->m_membuffer->getSize() - reader->m_membufferpos);

 	if(size < 0)
 		return -1;
--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h
@@ -114,7 +114,7 @@ private:
 	/**
 	 * Reading position of the buffer.
 	 */
-	long long m_membufferpos;
+	int m_membufferpos;

 	/**
 	 * Whether the audio data has to be interleaved after reading.
--- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
@@ -23,9 +23,7 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avio.h>
-#if LIBAVCODEC_VERSION_MAJOR >= 59
 #include <libavutil/channel_layout.h>
-#endif
 }

 AUD_NAMESPACE_BEGIN
@@ -400,7 +398,7 @@ FFMPEGWriter::FFMPEGWriter(std::string filename, DeviceSpecs specs, Container fo
 		m_specs.rate = m_codecCtx->sample_rate;

 #ifdef FFMPEG_OLD_CODE
-		m_codecCtx->codec_id = audio_codec;
+		m_codecCtx->codec_id = outputFmt->audio_codec;
 #endif

 		m_codecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
@@ -41,7 +41,7 @@ double PulseAudioDevice::PulseAudioSynchronizer::getPosition(std::shared_ptr<IHa

 void PulseAudioDevice::updateRingBuffer()
 {
-	unsigned int samplesize = AUD_DEVICE_SAMPLE_SIZE(m_specs);
+	unsigned int samplesize = AUD_SAMPLE_SIZE(m_specs);

 	std::unique_lock<std::mutex> lock(m_mixingLock);

--- a/extern/audaspace/src/util/Buffer.cpp
+++ b/extern/audaspace/src/util/Buffer.cpp
@@ -25,7 +25,7 @@

 AUD_NAMESPACE_BEGIN

-Buffer::Buffer(long long size)
+Buffer::Buffer(int size)
 {
 	m_size = size;
 	m_buffer = (data_t*) std::malloc(size + ALIGNMENT);
@@ -41,12 +41,12 @@ sample_t* Buffer::getBuffer() const
 	return (sample_t*) ALIGN(m_buffer);
 }

-long long Buffer::getSize() const
+int Buffer::getSize() const
 {
 	return m_size;
 }

-void Buffer::resize(long long size, bool keep)
+void Buffer::resize(int size, bool keep)
 {
 	if(keep)
 	{
@@ -63,7 +63,7 @@ void Buffer::resize(long long size, bool keep)
 	m_size = size;
 }

-void Buffer::assureSize(long long size, bool keep)
+void Buffer::assureSize(int size, bool keep)
 {
 	if(m_size < size)
 		resize(size, keep);
--- a/extern/audaspace/src/util/StreamBuffer.cpp
+++ b/extern/audaspace/src/util/StreamBuffer.cpp
@@ -18,12 +18,8 @@
 #include "util/BufferReader.h"
 #include "util/Buffer.h"

-#include <algorithm>
-
 // 5 sec * 48000 samples/sec * 4 bytes/sample * 6 channels
 #define BUFFER_RESIZE_BYTES 5760000
-// 90 min * 60 sec/min * 48000 samples/sec * 4 bytes/sample * 2 channels
-#define MAXIMUM_INITIAL_BUFFER_SIZE_BYTES 2073600000

 AUD_NAMESPACE_BEGIN

@@ -36,15 +32,14 @@ StreamBuffer::StreamBuffer(std::shared_ptr<ISound> sound) :

 	int sample_size = AUD_SAMPLE_SIZE(m_specs);
 	int length;
-	long long index = 0;
+	int index = 0;
 	bool eos = false;

 	// get an approximated size if possible
-	long long size = std::min(reader->getLength(), MAXIMUM_INITIAL_BUFFER_SIZE_BYTES / sample_size);
-	long long size_increase = BUFFER_RESIZE_BYTES / sample_size;
+	int size = reader->getLength();

 	if(size <= 0)
-		size = size_increase;
+		size = BUFFER_RESIZE_BYTES / sample_size;
 	else
 		size += m_specs.rate;

@@ -52,16 +47,13 @@ StreamBuffer::StreamBuffer(std::shared_ptr<ISound> sound) :
 	while(!eos)
 	{
 		// increase
-		m_buffer->resize(static_cast<long long>(size) * sample_size, true);
+		m_buffer->resize(size*sample_size, true);

 		// read more
 		length = size-index;
 		reader->read(length, eos, m_buffer->getBuffer() + index * m_specs.channels);
 		if(index == m_buffer->getSize() / sample_size)
-		{
-			size += size_increase;
-			size_increase <<= 1;
-		}
+			size += BUFFER_RESIZE_BYTES / sample_size;
 		index += length;
 	}

--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -1,11 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright 2012 Blender Foundation. All rights reserved.

+# NOTE: This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
 set(INC
  .
  include
  internal
  config
+  ../gflags/src
 )

 set(INC_SYS
@@ -15,296 +20,279 @@ set(INC_SYS
 )

 set(SRC
-  include/ceres/autodiff_cost_function.h
-  include/ceres/autodiff_first_order_function.h
-  include/ceres/autodiff_local_parameterization.h
-  include/ceres/autodiff_manifold.h
-  include/ceres/c_api.h
-  include/ceres/ceres.h
-  include/ceres/conditioned_cost_function.h
-  include/ceres/context.h
-  include/ceres/cost_function.h
-  include/ceres/cost_function_to_functor.h
-  include/ceres/covariance.h
-  include/ceres/crs_matrix.h
-  include/ceres/cubic_interpolation.h
-  include/ceres/dynamic_autodiff_cost_function.h
-  include/ceres/dynamic_cost_function.h
-  include/ceres/dynamic_cost_function_to_functor.h
-  include/ceres/dynamic_numeric_diff_cost_function.h
-  include/ceres/evaluation_callback.h
-  include/ceres/first_order_function.h
-  include/ceres/gradient_checker.h
-  include/ceres/gradient_problem.h
-  include/ceres/gradient_problem_solver.h
-  include/ceres/iteration_callback.h
-  include/ceres/jet.h
-  include/ceres/jet_fwd.h
-  include/ceres/line_manifold.h
-  include/ceres/local_parameterization.h
-  include/ceres/loss_function.h
-  include/ceres/manifold.h
-  include/ceres/manifold_test_utils.h
-  include/ceres/normal_prior.h
-  include/ceres/numeric_diff_cost_function.h
-  include/ceres/numeric_diff_first_order_function.h
-  include/ceres/numeric_diff_options.h
-  include/ceres/ordered_groups.h
-  include/ceres/problem.h
-  include/ceres/product_manifold.h
-  include/ceres/rotation.h
-  include/ceres/sized_cost_function.h
-  include/ceres/solver.h
-  include/ceres/sphere_manifold.h
-  include/ceres/tiny_solver.h
-  include/ceres/tiny_solver_autodiff_function.h
-  include/ceres/tiny_solver_cost_function_adapter.h
-  include/ceres/types.h
-  include/ceres/version.h
+	internal/ceres/accelerate_sparse.cc
+	internal/ceres/array_utils.cc
+	internal/ceres/blas.cc
+	internal/ceres/block_evaluate_preparer.cc
+	internal/ceres/block_jacobian_writer.cc
+	internal/ceres/block_jacobi_preconditioner.cc
+	internal/ceres/block_random_access_dense_matrix.cc
+	internal/ceres/block_random_access_diagonal_matrix.cc
+	internal/ceres/block_random_access_matrix.cc
+	internal/ceres/block_random_access_sparse_matrix.cc
+	internal/ceres/block_sparse_matrix.cc
+	internal/ceres/block_structure.cc
+	internal/ceres/callbacks.cc
+	internal/ceres/canonical_views_clustering.cc
+	internal/ceres/c_api.cc
+	internal/ceres/cgnr_solver.cc
+	internal/ceres/compressed_col_sparse_matrix_utils.cc
+	internal/ceres/compressed_row_jacobian_writer.cc
+	internal/ceres/compressed_row_sparse_matrix.cc
+	internal/ceres/conditioned_cost_function.cc
+	internal/ceres/conjugate_gradients_solver.cc
+	internal/ceres/context.cc
+	internal/ceres/context_impl.cc
+	internal/ceres/coordinate_descent_minimizer.cc
+	internal/ceres/corrector.cc
+	internal/ceres/covariance.cc
+	internal/ceres/covariance_impl.cc
+	internal/ceres/cxsparse.cc
+	internal/ceres/dense_normal_cholesky_solver.cc
+	internal/ceres/dense_qr_solver.cc
+	internal/ceres/dense_sparse_matrix.cc
+	internal/ceres/detect_structure.cc
+	internal/ceres/dogleg_strategy.cc
+	internal/ceres/dynamic_compressed_row_jacobian_writer.cc
+	internal/ceres/dynamic_compressed_row_sparse_matrix.cc
+	internal/ceres/dynamic_sparse_normal_cholesky_solver.cc
+	internal/ceres/eigensparse.cc
+	internal/ceres/evaluator.cc
+	internal/ceres/file.cc
+	internal/ceres/float_cxsparse.cc
+	internal/ceres/float_suitesparse.cc
+	internal/ceres/function_sample.cc
+	internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
+	internal/ceres/generated/schur_eliminator_d_d_d.cc
+	internal/ceres/gradient_checker.cc
+	internal/ceres/gradient_checking_cost_function.cc
+	internal/ceres/gradient_problem.cc
+	internal/ceres/gradient_problem_solver.cc
+	internal/ceres/implicit_schur_complement.cc
+	internal/ceres/inner_product_computer.cc
+	internal/ceres/is_close.cc
+	internal/ceres/iterative_refiner.cc
+	internal/ceres/iterative_schur_complement_solver.cc
+	internal/ceres/lapack.cc
+	internal/ceres/levenberg_marquardt_strategy.cc
+	internal/ceres/linear_least_squares_problems.cc
+	internal/ceres/linear_operator.cc
+	internal/ceres/linear_solver.cc
+	internal/ceres/line_search.cc
+	internal/ceres/line_search_direction.cc
+	internal/ceres/line_search_minimizer.cc
+	internal/ceres/line_search_preprocessor.cc
+	internal/ceres/local_parameterization.cc
+	internal/ceres/loss_function.cc
+	internal/ceres/low_rank_inverse_hessian.cc
+	internal/ceres/minimizer.cc
+	internal/ceres/normal_prior.cc
+	internal/ceres/parallel_for_cxx.cc
+	internal/ceres/parallel_for_nothreads.cc
+	internal/ceres/parallel_for_openmp.cc
+	internal/ceres/parallel_utils.cc
+	internal/ceres/parameter_block_ordering.cc
+	internal/ceres/partitioned_matrix_view.cc
+	internal/ceres/polynomial.cc
+	internal/ceres/preconditioner.cc
+	internal/ceres/preprocessor.cc
+	internal/ceres/problem.cc
+	internal/ceres/problem_impl.cc
+	internal/ceres/program.cc
+	internal/ceres/reorder_program.cc
+	internal/ceres/residual_block.cc
+	internal/ceres/residual_block_utils.cc
+	internal/ceres/schur_complement_solver.cc
+	internal/ceres/schur_eliminator.cc
+	internal/ceres/schur_jacobi_preconditioner.cc
+	internal/ceres/schur_templates.cc
+	internal/ceres/scratch_evaluate_preparer.cc
+	internal/ceres/single_linkage_clustering.cc
+	internal/ceres/solver.cc
+	internal/ceres/solver_utils.cc
+	internal/ceres/sparse_cholesky.cc
+	internal/ceres/sparse_matrix.cc
+	internal/ceres/sparse_normal_cholesky_solver.cc
+	internal/ceres/split.cc
+	internal/ceres/stringprintf.cc
+	internal/ceres/subset_preconditioner.cc
+	internal/ceres/suitesparse.cc
+	internal/ceres/thread_pool.cc
+	internal/ceres/thread_token_provider.cc
+	internal/ceres/triplet_sparse_matrix.cc
+	internal/ceres/trust_region_minimizer.cc
+	internal/ceres/trust_region_preprocessor.cc
+	internal/ceres/trust_region_step_evaluator.cc
+	internal/ceres/trust_region_strategy.cc
+	internal/ceres/types.cc
+	internal/ceres/visibility_based_preconditioner.cc
+	internal/ceres/visibility.cc
+	internal/ceres/wall_time.cc

-  include/ceres/internal/array_selector.h
-  include/ceres/internal/autodiff.h
-  include/ceres/internal/disable_warnings.h
-  include/ceres/internal/eigen.h
-  include/ceres/internal/fixed_array.h
-  include/ceres/internal/householder_vector.h
-  include/ceres/internal/integer_sequence_algorithm.h
-  include/ceres/internal/jet_traits.h
-  include/ceres/internal/line_parameterization.h
-  include/ceres/internal/memory.h
-  include/ceres/internal/numeric_diff.h
-  include/ceres/internal/parameter_dims.h
-  include/ceres/internal/port.h
-  include/ceres/internal/reenable_warnings.h
-  include/ceres/internal/sphere_manifold_functions.h
-  include/ceres/internal/variadic_evaluate.h
-
-  internal/ceres/accelerate_sparse.cc
-  internal/ceres/accelerate_sparse.h
-  internal/ceres/array_utils.cc
-  internal/ceres/array_utils.h
-  internal/ceres/block_evaluate_preparer.cc
-  internal/ceres/block_evaluate_preparer.h
-  internal/ceres/block_jacobi_preconditioner.cc
-  internal/ceres/block_jacobi_preconditioner.h
-  internal/ceres/block_jacobian_writer.cc
-  internal/ceres/block_jacobian_writer.h
-  internal/ceres/block_random_access_dense_matrix.cc
-  internal/ceres/block_random_access_dense_matrix.h
-  internal/ceres/block_random_access_diagonal_matrix.cc
-  internal/ceres/block_random_access_diagonal_matrix.h
-  internal/ceres/block_random_access_matrix.cc
-  internal/ceres/block_random_access_matrix.h
-  internal/ceres/block_random_access_sparse_matrix.cc
-  internal/ceres/block_random_access_sparse_matrix.h
-  internal/ceres/block_sparse_matrix.cc
-  internal/ceres/block_sparse_matrix.h
-  internal/ceres/block_structure.cc
-  internal/ceres/block_structure.h
-  internal/ceres/c_api.cc
-  internal/ceres/callbacks.cc
-  internal/ceres/callbacks.h
-  internal/ceres/canonical_views_clustering.cc
-  internal/ceres/canonical_views_clustering.h
-  internal/ceres/casts.h
-  internal/ceres/cgnr_linear_operator.h
-  internal/ceres/cgnr_solver.cc
-  internal/ceres/cgnr_solver.h
-  internal/ceres/compressed_col_sparse_matrix_utils.cc
-  internal/ceres/compressed_col_sparse_matrix_utils.h
-  internal/ceres/compressed_row_jacobian_writer.cc
-  internal/ceres/compressed_row_jacobian_writer.h
-  internal/ceres/compressed_row_sparse_matrix.cc
-  internal/ceres/compressed_row_sparse_matrix.h
-  internal/ceres/concurrent_queue.h
-  internal/ceres/conditioned_cost_function.cc
-  internal/ceres/conjugate_gradients_solver.cc
-  internal/ceres/conjugate_gradients_solver.h
-  internal/ceres/context.cc
-  internal/ceres/context_impl.cc
-  internal/ceres/context_impl.h
-  internal/ceres/coordinate_descent_minimizer.cc
-  internal/ceres/coordinate_descent_minimizer.h
-  internal/ceres/corrector.cc
-  internal/ceres/corrector.h
-  internal/ceres/cost_function.cc
-  internal/ceres/covariance.cc
-  internal/ceres/covariance_impl.cc
-  internal/ceres/covariance_impl.h
-  internal/ceres/cuda_buffer.h
-  internal/ceres/cxsparse.cc
-  internal/ceres/cxsparse.h
-  internal/ceres/dense_cholesky.cc
-  internal/ceres/dense_cholesky.h
-  internal/ceres/dense_jacobian_writer.h
-  internal/ceres/dense_normal_cholesky_solver.cc
-  internal/ceres/dense_normal_cholesky_solver.h
-  internal/ceres/dense_qr.cc
-  internal/ceres/dense_qr.h
-  internal/ceres/dense_qr_solver.cc
-  internal/ceres/dense_qr_solver.h
-  internal/ceres/dense_sparse_matrix.cc
-  internal/ceres/dense_sparse_matrix.h
-  internal/ceres/detect_structure.cc
-  internal/ceres/detect_structure.h
-  internal/ceres/dogleg_strategy.cc
-  internal/ceres/dogleg_strategy.h
-  internal/ceres/dynamic_compressed_row_finalizer.h
-  internal/ceres/dynamic_compressed_row_jacobian_writer.cc
-  internal/ceres/dynamic_compressed_row_jacobian_writer.h
-  internal/ceres/dynamic_compressed_row_sparse_matrix.cc
-  internal/ceres/dynamic_compressed_row_sparse_matrix.h
-  internal/ceres/dynamic_sparse_normal_cholesky_solver.cc
-  internal/ceres/dynamic_sparse_normal_cholesky_solver.h
-  internal/ceres/eigensparse.cc
-  internal/ceres/eigensparse.h
-  internal/ceres/evaluation_callback.cc
-  internal/ceres/evaluator.cc
-  internal/ceres/evaluator.h
-  internal/ceres/execution_summary.h
-  internal/ceres/file.cc
-  internal/ceres/file.h
-  internal/ceres/first_order_function.cc
-  internal/ceres/float_cxsparse.cc
-  internal/ceres/float_cxsparse.h
-  internal/ceres/float_suitesparse.cc
-  internal/ceres/float_suitesparse.h
-  internal/ceres/function_sample.cc
-  internal/ceres/function_sample.h
-  internal/ceres/gradient_checker.cc
-  internal/ceres/gradient_checking_cost_function.cc
-  internal/ceres/gradient_checking_cost_function.h
-  internal/ceres/gradient_problem.cc
-  internal/ceres/gradient_problem_evaluator.h
-  internal/ceres/gradient_problem_solver.cc
-  internal/ceres/graph.h
-  internal/ceres/graph_algorithms.h
-  internal/ceres/implicit_schur_complement.cc
-  internal/ceres/implicit_schur_complement.h
-  internal/ceres/inner_product_computer.cc
-  internal/ceres/inner_product_computer.h
-  internal/ceres/invert_psd_matrix.h
-  internal/ceres/is_close.cc
-  internal/ceres/is_close.h
-  internal/ceres/iteration_callback.cc
-  internal/ceres/iterative_refiner.cc
-  internal/ceres/iterative_refiner.h
-  internal/ceres/iterative_schur_complement_solver.cc
-  internal/ceres/iterative_schur_complement_solver.h
-  internal/ceres/levenberg_marquardt_strategy.cc
-  internal/ceres/levenberg_marquardt_strategy.h
-  internal/ceres/line_search.cc
-  internal/ceres/line_search.h
-  internal/ceres/line_search_direction.cc
-  internal/ceres/line_search_direction.h
-  internal/ceres/line_search_minimizer.cc
-  internal/ceres/line_search_minimizer.h
-  internal/ceres/line_search_preprocessor.cc
-  internal/ceres/line_search_preprocessor.h
-  internal/ceres/linear_least_squares_problems.cc
-  internal/ceres/linear_least_squares_problems.h
-  internal/ceres/linear_operator.cc
-  internal/ceres/linear_operator.h
-  internal/ceres/linear_solver.cc
-  internal/ceres/linear_solver.h
-  internal/ceres/local_parameterization.cc
-  internal/ceres/loss_function.cc
-  internal/ceres/low_rank_inverse_hessian.cc
-  internal/ceres/low_rank_inverse_hessian.h
-  internal/ceres/manifold.cc
-  internal/ceres/manifold_adapter.h
-  internal/ceres/map_util.h
-  internal/ceres/minimizer.cc
-  internal/ceres/minimizer.h
-  internal/ceres/normal_prior.cc
-  internal/ceres/pair_hash.h
-  internal/ceres/parallel_for.h
-  internal/ceres/parallel_for_cxx.cc
-  internal/ceres/parallel_for_nothreads.cc
-  internal/ceres/parallel_for_openmp.cc
-  internal/ceres/parallel_utils.cc
-  internal/ceres/parallel_utils.h
-  internal/ceres/parameter_block.h
-  internal/ceres/parameter_block_ordering.cc
-  internal/ceres/parameter_block_ordering.h
-  internal/ceres/partitioned_matrix_view.cc
-  internal/ceres/partitioned_matrix_view.h
-  internal/ceres/partitioned_matrix_view_impl.h
-  internal/ceres/polynomial.cc
-  internal/ceres/polynomial.h
-  internal/ceres/preconditioner.cc
-  internal/ceres/preconditioner.h
-  internal/ceres/preprocessor.cc
-  internal/ceres/preprocessor.h
-  internal/ceres/problem.cc
-  internal/ceres/problem_impl.cc
-  internal/ceres/problem_impl.h
-  internal/ceres/program.cc
-  internal/ceres/program.h
-  internal/ceres/program_evaluator.h
-  internal/ceres/random.h
-  internal/ceres/reorder_program.cc
-  internal/ceres/reorder_program.h
-  internal/ceres/residual_block.cc
-  internal/ceres/residual_block.h
-  internal/ceres/residual_block_utils.cc
-  internal/ceres/residual_block_utils.h
-  internal/ceres/schur_complement_solver.cc
-  internal/ceres/schur_complement_solver.h
-  internal/ceres/schur_eliminator.cc
-  internal/ceres/schur_eliminator.h
-  internal/ceres/schur_eliminator_impl.h
-  internal/ceres/schur_jacobi_preconditioner.cc
-  internal/ceres/schur_jacobi_preconditioner.h
-  internal/ceres/schur_templates.cc
-  internal/ceres/schur_templates.h
-  internal/ceres/scoped_thread_token.h
-  internal/ceres/scratch_evaluate_preparer.cc
-  internal/ceres/scratch_evaluate_preparer.h
-  internal/ceres/single_linkage_clustering.cc
-  internal/ceres/single_linkage_clustering.h
-  internal/ceres/small_blas.h
-  internal/ceres/small_blas_generic.h
-  internal/ceres/solver.cc
-  internal/ceres/solver_utils.cc
-  internal/ceres/solver_utils.h
-  internal/ceres/sparse_cholesky.cc
-  internal/ceres/sparse_cholesky.h
-  internal/ceres/sparse_matrix.cc
-  internal/ceres/sparse_matrix.h
-  internal/ceres/sparse_normal_cholesky_solver.cc
-  internal/ceres/sparse_normal_cholesky_solver.h
-  internal/ceres/stl_util.h
-  internal/ceres/stringprintf.cc
-  internal/ceres/stringprintf.h
-  internal/ceres/subset_preconditioner.cc
-  internal/ceres/subset_preconditioner.h
-  internal/ceres/suitesparse.cc
-  internal/ceres/suitesparse.h
-  internal/ceres/thread_pool.cc
-  internal/ceres/thread_pool.h
-  internal/ceres/thread_token_provider.cc
-  internal/ceres/thread_token_provider.h
-  internal/ceres/triplet_sparse_matrix.cc
-  internal/ceres/triplet_sparse_matrix.h
-  internal/ceres/trust_region_minimizer.cc
-  internal/ceres/trust_region_minimizer.h
-  internal/ceres/trust_region_preprocessor.cc
-  internal/ceres/trust_region_preprocessor.h
-  internal/ceres/trust_region_step_evaluator.cc
-  internal/ceres/trust_region_step_evaluator.h
-  internal/ceres/trust_region_strategy.cc
-  internal/ceres/trust_region_strategy.h
-  internal/ceres/types.cc
-  internal/ceres/visibility.cc
-  internal/ceres/visibility.h
-  internal/ceres/visibility_based_preconditioner.cc
-  internal/ceres/visibility_based_preconditioner.h
-  internal/ceres/wall_time.cc
-  internal/ceres/wall_time.h
-
-  internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
-  internal/ceres/generated/schur_eliminator_d_d_d.cc
+	include/ceres/autodiff_cost_function.h
+	include/ceres/autodiff_first_order_function.h
+	include/ceres/autodiff_local_parameterization.h
+	include/ceres/c_api.h
+	include/ceres/ceres.h
+	include/ceres/conditioned_cost_function.h
+	include/ceres/context.h
+	include/ceres/cost_function.h
+	include/ceres/cost_function_to_functor.h
+	include/ceres/covariance.h
+	include/ceres/crs_matrix.h
+	include/ceres/cubic_interpolation.h
+	include/ceres/dynamic_autodiff_cost_function.h
+	include/ceres/dynamic_cost_function.h
+	include/ceres/dynamic_cost_function_to_functor.h
+	include/ceres/dynamic_numeric_diff_cost_function.h
+	include/ceres/evaluation_callback.h
+	include/ceres/first_order_function.h
+	include/ceres/gradient_checker.h
+	include/ceres/gradient_problem.h
+	include/ceres/gradient_problem_solver.h
+	include/ceres/internal/array_selector.h
+	include/ceres/internal/autodiff.h
+	include/ceres/internal/disable_warnings.h
+	include/ceres/internal/eigen.h
+	include/ceres/internal/fixed_array.h
+	include/ceres/internal/householder_vector.h
+	include/ceres/internal/integer_sequence_algorithm.h
+	include/ceres/internal/line_parameterization.h
+	include/ceres/internal/memory.h
+	include/ceres/internal/numeric_diff.h
+	include/ceres/internal/parameter_dims.h
+	include/ceres/internal/port.h
+	include/ceres/internal/reenable_warnings.h
+	include/ceres/internal/variadic_evaluate.h
+	include/ceres/iteration_callback.h
+	include/ceres/jet.h
+	include/ceres/local_parameterization.h
+	include/ceres/loss_function.h
+	include/ceres/normal_prior.h
+	include/ceres/numeric_diff_cost_function.h
+	include/ceres/numeric_diff_options.h
+	include/ceres/ordered_groups.h
+	include/ceres/problem.h
+	include/ceres/rotation.h
+	include/ceres/sized_cost_function.h
+	include/ceres/solver.h
+	include/ceres/tiny_solver_autodiff_function.h
+	include/ceres/tiny_solver_cost_function_adapter.h
+	include/ceres/tiny_solver.h
+	include/ceres/types.h
+	include/ceres/version.h
+	internal/ceres/accelerate_sparse.h
+	internal/ceres/array_utils.h
+	internal/ceres/blas.h
+	internal/ceres/block_evaluate_preparer.h
+	internal/ceres/block_jacobian_writer.h
+	internal/ceres/block_jacobi_preconditioner.h
+	internal/ceres/block_random_access_dense_matrix.h
+	internal/ceres/block_random_access_diagonal_matrix.h
+	internal/ceres/block_random_access_matrix.h
+	internal/ceres/block_random_access_sparse_matrix.h
+	internal/ceres/block_sparse_matrix.h
+	internal/ceres/block_structure.h
+	internal/ceres/callbacks.h
+	internal/ceres/canonical_views_clustering.h
+	internal/ceres/casts.h
+	internal/ceres/cgnr_linear_operator.h
+	internal/ceres/cgnr_solver.h
+	internal/ceres/compressed_col_sparse_matrix_utils.h
+	internal/ceres/compressed_row_jacobian_writer.h
+	internal/ceres/compressed_row_sparse_matrix.h
+	internal/ceres/concurrent_queue.h
+	internal/ceres/conjugate_gradients_solver.h
+	internal/ceres/context_impl.h
+	internal/ceres/coordinate_descent_minimizer.h
+	internal/ceres/corrector.h
+	internal/ceres/covariance_impl.h
+	internal/ceres/cxsparse.h
+	internal/ceres/dense_jacobian_writer.h
+	internal/ceres/dense_normal_cholesky_solver.h
+	internal/ceres/dense_qr_solver.h
+	internal/ceres/dense_sparse_matrix.h
+	internal/ceres/detect_structure.h
+	internal/ceres/dogleg_strategy.h
+	internal/ceres/dynamic_compressed_row_finalizer.h
+	internal/ceres/dynamic_compressed_row_jacobian_writer.h
+	internal/ceres/dynamic_compressed_row_sparse_matrix.h
+	internal/ceres/dynamic_sparse_normal_cholesky_solver.h
+	internal/ceres/eigensparse.h
+	internal/ceres/evaluator.h
+	internal/ceres/execution_summary.h
+	internal/ceres/file.h
+	internal/ceres/float_cxsparse.h
+	internal/ceres/float_suitesparse.h
+	internal/ceres/function_sample.h
+	internal/ceres/gradient_checking_cost_function.h
+	internal/ceres/gradient_problem_evaluator.h
+	internal/ceres/graph_algorithms.h
+	internal/ceres/graph.h
+	internal/ceres/implicit_schur_complement.h
+	internal/ceres/inner_product_computer.h
+	internal/ceres/invert_psd_matrix.h
+	internal/ceres/is_close.h
+	internal/ceres/iterative_refiner.h
+	internal/ceres/iterative_schur_complement_solver.h
+	internal/ceres/lapack.h
+	internal/ceres/levenberg_marquardt_strategy.h
+	internal/ceres/linear_least_squares_problems.h
+	internal/ceres/linear_operator.h
+	internal/ceres/linear_solver.h
+	internal/ceres/line_search_direction.h
+	internal/ceres/line_search.h
+	internal/ceres/line_search_minimizer.h
+	internal/ceres/line_search_preprocessor.h
+	internal/ceres/low_rank_inverse_hessian.h
+	internal/ceres/map_util.h
+	internal/ceres/minimizer.h
+	internal/ceres/pair_hash.h
+	internal/ceres/parallel_for.h
+	internal/ceres/parallel_utils.h
+	internal/ceres/parameter_block.h
+	internal/ceres/parameter_block_ordering.h
+	internal/ceres/partitioned_matrix_view.h
+	internal/ceres/partitioned_matrix_view_impl.h
+	internal/ceres/polynomial.h
+	internal/ceres/preconditioner.h
+	internal/ceres/preprocessor.h
+	internal/ceres/problem_impl.h
+	internal/ceres/program_evaluator.h
+	internal/ceres/program.h
+	internal/ceres/random.h
+	internal/ceres/reorder_program.h
+	internal/ceres/residual_block.h
+	internal/ceres/residual_block_utils.h
+	internal/ceres/schur_complement_solver.h
+	internal/ceres/schur_eliminator.h
+	internal/ceres/schur_eliminator_impl.h
+	internal/ceres/schur_jacobi_preconditioner.h
+	internal/ceres/schur_templates.h
+	internal/ceres/scoped_thread_token.h
+	internal/ceres/scratch_evaluate_preparer.h
+	internal/ceres/single_linkage_clustering.h
+	internal/ceres/small_blas_generic.h
+	internal/ceres/small_blas.h
+	internal/ceres/solver_utils.h
+	internal/ceres/sparse_cholesky.h
+	internal/ceres/sparse_matrix.h
+	internal/ceres/sparse_normal_cholesky_solver.h
+	internal/ceres/split.h
+	internal/ceres/stl_util.h
+	internal/ceres/stringprintf.h
+	internal/ceres/subset_preconditioner.h
+	internal/ceres/suitesparse.h
+	internal/ceres/thread_pool.h
+	internal/ceres/thread_token_provider.h
+	internal/ceres/triplet_sparse_matrix.h
+	internal/ceres/trust_region_minimizer.h
+	internal/ceres/trust_region_preprocessor.h
+	internal/ceres/trust_region_step_evaluator.h
+	internal/ceres/trust_region_strategy.h
+	internal/ceres/visibility_based_preconditioner.h
+	internal/ceres/visibility.h
+	internal/ceres/wall_time.h
 )

 set(LIB
@@ -314,48 +302,48 @@ set(LIB

 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
  list(APPEND SRC
-    internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
-    internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
-    internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
-    internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
-    internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
-    internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
-    internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
-    internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
-    internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_6.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
-    internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
-    internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
-    internal/ceres/generated/partitioned_matrix_view_3_3_3.cc
-    internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
-    internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
-    internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
-    internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
-    internal/ceres/generated/schur_eliminator_2_2_2.cc
-    internal/ceres/generated/schur_eliminator_2_2_3.cc
-    internal/ceres/generated/schur_eliminator_2_2_4.cc
-    internal/ceres/generated/schur_eliminator_2_2_d.cc
-    internal/ceres/generated/schur_eliminator_2_3_3.cc
-    internal/ceres/generated/schur_eliminator_2_3_4.cc
-    internal/ceres/generated/schur_eliminator_2_3_6.cc
-    internal/ceres/generated/schur_eliminator_2_3_9.cc
-    internal/ceres/generated/schur_eliminator_2_3_d.cc
-    internal/ceres/generated/schur_eliminator_2_4_3.cc
-    internal/ceres/generated/schur_eliminator_2_4_4.cc
-    internal/ceres/generated/schur_eliminator_2_4_6.cc
-    internal/ceres/generated/schur_eliminator_2_4_8.cc
-    internal/ceres/generated/schur_eliminator_2_4_9.cc
-    internal/ceres/generated/schur_eliminator_2_4_d.cc
-    internal/ceres/generated/schur_eliminator_2_d_d.cc
-    internal/ceres/generated/schur_eliminator_3_3_3.cc
-    internal/ceres/generated/schur_eliminator_4_4_2.cc
-    internal/ceres/generated/schur_eliminator_4_4_3.cc
-    internal/ceres/generated/schur_eliminator_4_4_4.cc
-    internal/ceres/generated/schur_eliminator_4_4_d.cc
+		internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
+		internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
+		internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
+		internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
+		internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
+		internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
+		internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
+		internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
+		internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_6.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
+		internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
+		internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
+		internal/ceres/generated/partitioned_matrix_view_3_3_3.cc
+		internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
+		internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
+		internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
+		internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
+		internal/ceres/generated/schur_eliminator_2_2_2.cc
+		internal/ceres/generated/schur_eliminator_2_2_3.cc
+		internal/ceres/generated/schur_eliminator_2_2_4.cc
+		internal/ceres/generated/schur_eliminator_2_2_d.cc
+		internal/ceres/generated/schur_eliminator_2_3_3.cc
+		internal/ceres/generated/schur_eliminator_2_3_4.cc
+		internal/ceres/generated/schur_eliminator_2_3_6.cc
+		internal/ceres/generated/schur_eliminator_2_3_9.cc
+		internal/ceres/generated/schur_eliminator_2_3_d.cc
+		internal/ceres/generated/schur_eliminator_2_4_3.cc
+		internal/ceres/generated/schur_eliminator_2_4_4.cc
+		internal/ceres/generated/schur_eliminator_2_4_6.cc
+		internal/ceres/generated/schur_eliminator_2_4_8.cc
+		internal/ceres/generated/schur_eliminator_2_4_9.cc
+		internal/ceres/generated/schur_eliminator_2_4_d.cc
+		internal/ceres/generated/schur_eliminator_2_d_d.cc
+		internal/ceres/generated/schur_eliminator_3_3_3.cc
+		internal/ceres/generated/schur_eliminator_4_4_2.cc
+		internal/ceres/generated/schur_eliminator_4_4_3.cc
+		internal/ceres/generated/schur_eliminator_4_4_4.cc
+		internal/ceres/generated/schur_eliminator_4_4_d.cc
  )
 else()
  add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION)
@@ -363,5 +351,16 @@ endif()

 add_definitions(${GFLAGS_DEFINES})
 add_definitions(${GLOG_DEFINES})
+add_definitions(${CERES_DEFINES})
+
+add_definitions(
+  -DCERES_HAVE_PTHREAD
+  -DCERES_NO_SUITESPARSE
+  -DCERES_NO_CXSPARSE
+  -DCERES_NO_LAPACK
+  -DCERES_NO_ACCELERATE_SPARSE
+  -DCERES_HAVE_RWLOCK
+  -DCERES_USE_CXX_THREADS
+)

 blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/extern/ceres/ChangeLog
+++ b/extern/ceres/ChangeLog
@@ -0,0 +1,596 @@
+commit 399cda773035d99eaf1f4a129a666b3c4df9d1b1
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Fri Oct 23 19:36:08 2020 +0100
+
+    Update build documentation to reflect detection of Eigen via config mode
+    
+    Change-Id: I18d5f0fc1eb51ea630164c911d935e9bffea35ce
+
+commit bb127272f9b57672bca48424f2d83bc430a46eb8
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Oct 19 09:28:34 2020 -0700
+
+    Fix typos.
+    
+    Contributed by Ishamis@, IanBoyanZhang@, gkrobner@ & mithunjacob@.
+    
+    Change-Id: Iab3c19a07a6f3db2486e3557dcb55bfe5de2aee5
+
+commit a0ec5c32af5c5f5a52168dc2748be910dba14810
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun Oct 18 15:20:36 2020 -0700
+
+    Update version history for 2.0.0RC2
+    
+    Change-Id: I75b7515fbf9880bd8eaea6ecd5e72ce1ae4a3a86
+
+commit 3f6d2736769044e7c08c873c41a184849eea73ab
+Author: Taylor Braun-Jones <taylor@braun-jones.org>
+Date:   Tue Jan 28 12:09:30 2020 -0500
+
+    Unify symbol visibility configuration for all compilers
+    
+    This makes it possible to build unit tests with shared libraries on MSVC.
+    
+    Change-Id: I1db66a80b2c78c4f3d354e35235244d17bac9809
+
+commit 29c2912ee635c77f3ddf2e382a5d6a9cf9805a3d
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Oct 13 12:07:06 2020 -0700
+
+    Unbreak the bazel build some more
+    
+    Change-Id: I6bbf3df977a473b9b5e16a9e59da5f535f8cdc24
+
+commit bf47e1a36829f62697b930241d0a353932f34090
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Oct 13 10:00:22 2020 -0700
+
+    Fix the Bazel build.
+    
+    1. Fix the path to eigen, now that it uses gitlab instead of bitbucket.
+    2. Remove an unrecognized compiler option.
+    3. Remove an obsolete benchmark.
+    
+    This CL only unbreaks the build, it is likely that it is still not
+    at par with the cmake build.
+    
+    https://github.com/ceres-solver/ceres-solver/issues/628
+    
+    Change-Id: I470209cbb48b6a4f499564a86b52436e0c8d98ef
+
+commit 600e8c529ebbb4bb89d5baefa3d5ab6ad923706a
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Mon Oct 12 23:00:39 2020 +0200
+
+    fix minor typos
+    
+    all timing values in the summary are initialized to -1, so the one
+    +1 is likely an oversight.
+    
+    Change-Id: Ie355f3b7da08a56d49d19ca9a5bc48fe5581dee3
+
+commit bdcdcc78af61a0cb85317ebee52dc804bf4ea975
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Mon Sep 7 01:48:50 2020 +0200
+
+    update docs for changed cmake usage
+    
+    - update links to cmake docs to version 3.5
+    - highlight difference between dependencies with and without custom
+      find modules
+    - point out removal of CERES_INCLUDE_DIRS
+    - point out that TBB might be linked if SuiteSparseQR is found
+    - added 'Migration' section
+    - fixed typos
+    
+    Change-Id: Icbcc0e723d11f12246fb3cf09b9d7c6206195a82
+
+commit 3f69e5b36a49b44344e96a26b39693a914ba80c6
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Oct 12 11:46:40 2020 -0700
+
+    Corrections from William Rucklidge
+    
+    Change-Id: I0b5d4808be48f68df7829c70ec93ffa67d81315d
+
+commit 8bfdb02fb18551bbd5f222c5472e45eddecd42b9
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Oct 12 10:07:13 2020 -0700
+
+    Rewrite uses of VLOG_IF and LOG_IF.
+    
+    VLOG_IF's evaluation order is ambiguous - does it mean
+    `if (cond) VLOG(lvl)` or `if (VLOG_IS_ON(lvl) && cond) LOG(INFO)`?
+    In particular, the way it works now is inconsistent with the way the
+    rest of the LOG macros evaluate their arguments.
+    Fixing this would be hard, and the macro's behavior would still surprise
+    some people. Replacing it with an if statement is simple, clear, and unambiguous.
+    
+    Change-Id: I97a92d17a932c0a5344a1bf98d676308793ba877
+
+commit d1b35ffc161fd857c7c433574ca82aa9b2db7f98
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Oct 12 10:58:05 2020 -0700
+
+    Corrections from William Rucklidge
+    
+    Change-Id: Ifb50e87aa915d00f9861fe1a6da0acee11bc0a94
+
+commit f34e80e91f600014a3030915cf9ea28bcbc576e7
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu Oct 8 12:34:53 2020 -0700
+
+    Add dividers between licenses.
+    
+    Change-Id: I4e4aaa15e0621c5648550cfa622fe0a79f1f4f9f
+
+commit 65c397daeca77da53d16e73720b9a17edd6757ab
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed Oct 7 14:34:52 2020 -0700
+
+    Fix formatting
+    
+    Change-Id: Ib4ca8a097059dbb8d2f3a6a888222c0188cb126e
+
+commit f63b1fea9cfa48ae4530c327b10efa4985e69631
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed Oct 7 14:30:54 2020 -0700
+
+    Add the MIT license text corresponding to the libmv derived files.
+    
+    Change-Id: Ie72fb45ae96a7892c00411eee6873db7f0e365a8
+
+commit 542613c13d8b7469822aff5eec076f2cad4507ec
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Tue Oct 6 22:48:59 2020 +0200
+
+    minor formatting fix for trust_region_minimizer.cc
+    
+    Change-Id: I18ba27825fc23dd0e9e3e15dc13fc0833db01b5b
+
+commit 6d9e9843d8c61cfb04cc55b9def9518f823a592a
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Sep 28 11:35:37 2020 -0700
+
+    Remove inclusion of ceres/eigen.h
+    
+    The initial reason for this is because of a previous reformatting CL
+    triggered a macro redefinition warning in the schur eliminator. But
+    actually it was worse because the reordering had caused the macro
+    definition to be ignored and caused a performance regression.
+    
+    This simplifies the generated files, fixes some formatting errors
+    and recovers the performance.
+    
+    Change-Id: I9dbeffc38743b3f24b25843feec2e26a73188413
+
+commit eafeca5dcb7af8688d40a9c14b0d2fcb856c96fc
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Sep 28 11:12:59 2020 -0700
+
+    Fix a logging bug in TrustRegionMinimizer.
+    
+    Upon encountering an unsuccessful step (one where the cost goes up)
+    the the trust region minimizer failed to populate the gradient norm
+    in the IterationSummary. This would cause the gradient norm to be
+    logged as zero which is incorrect. Instead it should be the gradient
+    norm at the current point.
+    
+    This CL fixes this issue.
+    
+    Before:
+    iter      cost      cost_change  |gradient|   |step|    tr_ratio  tr_radius  ls_iter  iter_time  total_time
+       0  1.115206e+07    0.00e+00    1.90e+07   0.00e+00   0.00e+00  1.00e+04        0    2.72e-01    1.33e+00
+       1  3.687552e+06    7.46e+06    1.84e+08   2.86e+03   6.91e-01  1.06e+04        1    1.32e+00    2.65e+00
+       2  3.670266e+10   -3.67e+10    0.00e+00   3.27e+03  -1.07e+04  5.30e+03        1    7.52e-01    3.40e+00
+       3  4.335397e+07   -3.97e+07    0.00e+00   2.74e+03  -1.16e+01  1.32e+03        1    7.28e-01    4.13e+00
+       4  1.345488e+06    2.34e+06    4.12e+07   1.55e+03   6.87e-01  1.40e+03        1    9.31e-01    5.06e+00
+       5  5.376653e+05    8.08e+05    9.99e+06   6.64e+02   7.46e-01  1.59e+03        1    9.64e-01    6.03e+00
+    
+    After:
+    iter      cost      cost_change  |gradient|   |step|    tr_ratio  tr_radius  ls_iter  iter_time  total_time
+       0  1.115206e+07    0.00e+00    1.90e+07   0.00e+00   0.00e+00  1.00e+04        0    2.37e-01    1.13e+00
+       1  3.687552e+06    7.46e+06    1.84e+08   2.86e+03   6.91e-01  1.06e+04        1    1.08e+00    2.21e+00
+       2  3.670266e+10   -3.67e+10    1.84e+08   3.27e+03  -1.07e+04  5.30e+03        1    7.50e-01    2.96e+00
+       3  4.335397e+07   -3.97e+07    1.84e+08   2.74e+03  -1.16e+01  1.32e+03        1    7.13e-01    3.67e+00
+       4  1.345488e+06    2.34e+06    4.12e+07   1.55e+03   6.87e-01  1.40e+03        1    9.01e-01    4.57e+00
+       5  5.376653e+05    8.08e+05    9.99e+06   6.64e+02   7.46e-01  1.59e+03        1    9.36e-01    5.51e+00
+    
+    Change-Id: Iae538fe089be07c7bb219337a6f1392f7213acfe
+
+commit 1fd0be916dd4ff4241bd52264b9e9170bc7e4339
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Mon Sep 28 18:54:33 2020 +0100
+
+    Fix default initialisation of IterationCallback::cost
+    
+    Change-Id: I9f529093fc09424c90dbff8e9648b90b16990623
+
+commit 137bbe845577929a87f8eef979196df6a8b30ee4
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Mon Sep 28 02:17:32 2020 +0200
+
+    add info about clang-format to contributing docs
+    
+    Change-Id: I2f4dcbda2e4f36096df217d76de370103ffaa43e
+
+commit d3f66d77f45482b90d01af47938289c32dd2cc08
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Mon Sep 28 02:01:43 2020 +0200
+
+    fix formatting generated files (best effort)
+    
+    - update file generator scripts / templates so generated files adhere
+      to clang-format
+    - A few exceptions are not fixed, where the file generation results in
+      lines of different width. To properly fix this would make the code
+      more complicated and it's not that important for generated files
+      anyway.
+    - note that generated files are excluded in ./scripts/format_all.sh
+    
+    Change-Id: I4f42c83d1fec01242eada5e7ce6c1a5192234d37
+
+commit a9c7361c8dc1d37e78d216754a4c03e8a8f1e74f
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Mon Sep 28 02:14:29 2020 +0200
+
+    minor formatting fix (wrongly updated in earlier commit)
+    
+    Change-Id: I544635fd936cb5b7f7bd9255876641cd5a9590c6
+
+commit 7b8f675bfdb1d924af6a2dcc1f79bda5ace7e886
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Sun Sep 20 21:45:24 2020 +0200
+
+    fix formatting for (non-generated) internal source files
+    
+    - Change formatting standard to Cpp11. Main difference is not having
+      the space between two closing >> for nested templates. We don't
+      choose c++14, because older versions of clang-format (version 9
+      and earlier) don't know this value yet, and it doesn't make a
+      difference in the formatting.
+    - Apply clang-format to all (non generated) internal source files.
+    - Manually fix some code sections (clang-format on/off) and c-strings
+    - Exclude some embedded external files with very different formatting
+      (gtest/gmock)
+    - Add script to format all source files
+    
+    Change-Id: Ic6cea41575ad6e37c9e136dbce176b0d505dc44d
+
+commit 921368ce31c42ee793cf131860abba291a7e39ad
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed Sep 9 09:15:37 2020 -0700
+
+    Fix a number of typos in covariance.h
+    
+    Also some minor cleanups in covariance_impl.h
+    
+    Thanks to Lorenzo Lamia for pointing these out.
+    
+    Change-Id: Icb4012a367fdd1f249bc1e7019e0114c868e45b6
+
+commit 7b6b2491cc1be0b3abb67338366d8d69bef3a402
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Tue Sep 8 17:51:32 2020 +0200
+
+    fix formatting for examples
+    
+    This is mostly just applying the existing clang format config, except:
+    - Use NOLINT on overlong comment lines.
+    - Wrap some sections in 'clang-format off' / 'clang format on'.
+    - Manually split or join some multi-line strings.
+    
+    Change-Id: Ia1a40eeb92112e12c3a169309afe087af55b2f4f
+
+commit 82275d8a4eac4fc0bd07e17c3a41a6e429e72bfb
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Tue Sep 8 02:00:21 2020 +0200
+
+    some fixes for Linux and macOS install docs
+    
+    Linux:
+    - Remove workaround for Ubuntu 14.04, which is EOL. libsuitesparse-dev
+      seems to come with a shared library on 16.04 and later, so linking
+      to a shared build of ceres doesn't seem to be an issue any more.
+    - Add missing libgflags-dev.
+    
+    macOS:
+    - OS X is now called macOS.
+    - Update homebrew link.
+    - Mac homebrew the preferred method of installation.
+    - Fix OpenMP instructions.
+    - Remove reference to homebrew/science. Everything is in core.
+    - Add missing gflags.
+    
+    Change-Id: I633b3c7ea84a87886bfd823f8187fdd0a84737c9
+
+commit 9d762d74f06b946bbd2f098de7216032d0e7b51d
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Sun Sep 6 21:04:24 2020 +0200
+
+    fix formatting for public header files
+    
+    - ensure all public headers files adhere to clang-format
+    - preserve one-per-line for enums by adding trailing comma
+    - preserve include order for en/disable_warning.h
+    
+    Change-Id: I78dbd0527a294ab2ec5f074fb426e48b20c393e6
+
+commit c76478c4898f3af11a6a826ac89c261205f4dd96
+Author: Nikolaus Demmel <nikolaus@nikolaus-demmel.de>
+Date:   Sun Sep 6 23:29:56 2020 +0200
+
+    gitignore *.pyc
+    
+    Change-Id: Ic6238a617a3c7ce92df7dcefcc44bae20c32b30b
+
+commit 4e69a475cd7d7cbed983f5aebf79ae13a46e5415
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Tue Sep 1 10:15:23 2020 +0100
+
+    Fix potential for mismatched release/debug TBB libraries
+    
+    - Protect against the case when the user has multiple installs of TBB
+      in their search paths and the first install does not contain debug
+      libraries.  In this case it is possible to get mismatched versions
+      of TBB inserted into TBB_LIBRARIES.
+    - Also suppresses warning about use of TBB_ROOT on modern versions of
+      CMake due to CMP0074.
+    
+    Change-Id: I2eaafdde4a028cbf6c500c63771973d85bc4723d
+
+commit 8e1d8e32ad0d28c0d4d1d7b2b1ce7fc01d90b7b0
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu Sep 3 10:49:20 2020 -0700
+
+    A number of small changes.
+    
+    1. Add a move constructor to NumericDiffCostFunction, DynamicAutoDiffCostfunction
+       and DynamicNumericDiffCostFunction.
+    2. Add optional ownership of the underlying functor.
+    3. Update docs to reflect this as well as the variadic templates that allow an
+       arbitrary number of parameter blocks.
+    
+    Change-Id: I57bbb51fb9e75f36ec2a661b603beda270f30a19
+
+commit 368a738e5281039f19587545806b7bc6f35e78f9
+Author: Julian Kent <jkflying@gmail.com>
+Date:   Thu May 7 12:54:35 2020 +0200
+
+    AutoDiffCostFunction: optional ownership
+    
+    Add Ownership semantics to the AutoDiffCostFunction
+    
+    This allows several benefits, such as pointer ordering always being the
+    same for numerical repeatability (due to blocks being ordered by
+    pointer address), memory adjacency for better cache performance, and
+    reduced allocator pressure / overhead.
+    
+    This is then made use of in libmv by preallocating the errors and
+    cost functions into vectors
+    
+    Change-Id: Ia5b97e7249b55a463264b6e26f7a02291927c9f2
+
+commit 8cbd721c199c69f127af6ef7c187ddf7e8f116f9
+Author: Morten Hannemose <morten@hannemose.dk>
+Date:   Thu Sep 3 17:54:20 2020 +0200
+
+    Add erf and erfc to jet.h, including tests in jet_test.cc
+    
+    erf is necessary for evaluating Gaussian functions.
+    erfc was added because it is so similar to erf.
+    
+    Change-Id: I5e470dbe013cc938fabb87cde3b0ebf26a90fff4
+
+commit 31366cff299cf2a8d97b43a7533d953ff28fdc29
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Sep 1 09:23:34 2020 -0700
+
+    Benchmarks for dynamic autodiff.
+    
+    This patch is from Clement Courbet. courbet@google.com
+    
+    Change-Id: I886390663644733bfa5b7b52b0c883079e793726
+
+commit 29fb08aeae1ce691851724af7209fea6127523a9
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Tue Sep 1 10:23:31 2020 +0100
+
+    Use CMAKE_PREFIX_PATH to pass Homebrew install location
+    
+    - Passing HINTS disables the MODULE mode of find_package() which
+      precludes users from creating their own find modules to provide
+      Ceres' dependencies.
+    
+    Change-Id: I6f2edf429331d13fe67bf61ac4b79d17579d9a57
+
+commit 242c703b501ffd64d645f4016d63c8b41c381038
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Aug 4 21:02:11 2020 -0700
+
+    Minor fixes to the documentation
+    
+    Change-Id: I65e6f648d963b8aa640078684ce02dcde6acb87d
+
+commit 79bbf95103672fa4b5485e055ff7692ee4a1f9da
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Aug 4 18:26:02 2020 -0700
+
+    Add changelog for 2.0.0
+    
+    Change-Id: I8acad62bfe629454ae5032732693e43fe37b97ff
+
+commit 41d05f13d0ffb230d7a5a9d67ed31b0cfb35d669
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Aug 4 14:56:33 2020 -0700
+
+    Fix lint errors in evaluation_callback_test.cc
+    
+    Change-Id: I63eb069544ad0d8f495490fe4caa07b9f04f7ec2
+
+commit 4b67903c1f96037048c83a723028c5d0991c09cf
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Aug 4 14:40:50 2020 -0700
+
+    Remove unused variables from problem_test.cc
+    
+    Change-Id: Ia1a13cfc6e462f6d249dcbf169ad34831dd93ec2
+
+commit 10449fc3664c96d4b5454c092195432df79412f8
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue Aug 4 14:30:25 2020 -0700
+
+    Add Apache license to the LICENSE file for FixedArray
+    
+    FixedArray implementation comes from ABSL which is Apache
+    licensed.
+    
+    Change-Id: I566dbe9d236814c95945732c6347d3bf7b508283
+
+commit 8c3ecec6db26d7a66f5de8dc654475ec7aa0df14
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue May 26 04:44:11 2020 -0700
+
+    Fix some minor errors in IterationCallback docs
+    
+    Change-Id: Id3d7f21a523ff8466868cdec542921c566bbbfa9
+
+commit 7d3ffcb4234632dc51ee84c8a509d9428263070b
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Sun Jul 26 19:42:16 2020 +0100
+
+    Remove forced CONFIG from find_package(Eigen3)
+    
+    - Ceres will fail to configure if Eigen3::Eigen target is not found, and
+      the minimum required Eigen version specified (3.3) exports Eigen as
+      a CMake package and this is reflected in the default Ubuntu 18.04
+      packages.
+    - This permits users to specify their own Eigen3 detection should they
+      choose to do so, but they must do so via an imported target.
+    
+    Change-Id: I5edff117c8001770004f49012ac1ae63b66ec9c1
+
+commit a029fc0f93817f20b387b707bc578dc1f1a269ae
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Sun Jul 26 18:44:59 2020 +0100
+
+    Use latest FindTBB.cmake from VTK project
+    
+    - Retrieved from [1], SHA: 0d9bbf9beb97f8f696c43a9edf1e52c082b3639b on
+      2020-07-26
+    - [1]: https://gitlab.kitware.com/vtk/vtk/blob/master/CMake/FindTBB.cmake
+    
+    Change-Id: I953a8c87802a974d30ccc7c80f5229683826efbd
+
+commit aa1abbc578797c6b17ee7221db31535dc249ae66
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Sun Jul 26 19:57:31 2020 +0100
+
+    Replace use of GFLAGS_LIBRARIES with export gflags target
+    
+    - As our minimum required version of gflags (2.2) exports itself as
+      a CMake package and this is the case for the default 18.04 package
+      we can use the gflags target directly.
+    - Replaces forced use of CONFIG in find_package(gflags) with a check
+      that the gflags imported target exists to avoid ambiguity with
+      libgflags if installed in a default location.  This permits users to
+      override the gflags detection should they so choose, provided that
+      they do so via an imported target.
+    - Also removes some previously removed legacy GLAGS_ vars from the
+      installation docs.
+    
+    Change-Id: I015f5a751e5b22f956bbf9df692e63a6825c9f0d
+
+commit db2af1be8780bbe88944775400baa2dbd3592b7d
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Aug 3 04:57:08 2020 -0700
+
+    Add Problem::EvaluateResidualBlockAssumingParametersUnchanged
+    
+    Simplify the semantics for Problem::EvaluateResidualBlock to
+    not ignore the presence of EvaluationCallback and add another method
+    EvaluateResidualBlockAssumingParametersUnchanged to handle the case
+    where the user has an EvaluationCallback but knows that the parameter
+    blocks do not change between calls.
+    
+    Updated the documentation for the methods and EvaluationCallback to
+    reflect these semantics.
+    
+    Also added tests for Evaluation related methods calling i
+    EvaluationCallback when its present.
+    
+    https://github.com/ceres-solver/ceres-solver/issues/483
+    
+    Change-Id: If0a0c95c2f1f92e9183a90df240104a69a71c46d
+
+commit ab4ed32cda004befd29a0b4b02f1d907e0c4dab7
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Mon Aug 3 04:17:33 2020 -0700
+
+    Replace NULL with nullptr in the documentation.
+    
+    Change-Id: I995f68770e2a4b6027c0a1d3edf5eb5132b081d7
+
+commit ee280e27a6140295ef6258d24c92305628f3d508
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Fri Jul 31 16:48:06 2020 -0700
+
+    Allow SubsetParameterization to accept an empty vector of constant parameters.
+    
+    Thanks to Frédéric Devernay for reporting this and providing an initial fix.
+    
+    Change-Id: Id86a2051ab7841ecafdcfb00f4634b353a7ef3b4
+
+commit 4b8c731d8a4f3fda53c642ff14a25fab6c233918
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Fri Jul 31 10:05:52 2020 -0700
+
+    Fix a bug in DynamicAutoDiffCostFunction
+    
+    DynamicAutoDiffCostFunction::Evaluate when provided with a jacobians
+    array that was non-empty but all its entries are nullptr, would
+    compute num_active_parameters = 0, and then skip over all the loops
+    that evaluated the CostFunctor.
+    
+    The fix is to check if num_active_parameters == 0, and then treat
+    it as the case where jacobians array is null.
+    
+    Thanks to Ky Waegel for reporting and providing a reproduction for this.
+    
+    Change-Id: Ib86930c2c3f722724d249f662bf88238679bbf98
+
+commit 5cb5b35a930c1702278083c75769dbb4e5801045
+Author: Alex Stewart <alexs.mac@gmail.com>
+Date:   Sun Jul 26 20:42:12 2020 +0100
+
+    Fixed incorrect argument name in RotationMatrixToQuaternion()
+    
+    - Raised as: https://github.com/ceres-solver/ceres-solver/pull/607 by
+      Frank Dellaert
+    
+    Change-Id: Id3e9f190e814cf18206e2f8c3b1b67b995c21dd5
+
+commit e39d9ed1d60dfeb58dd2a0df4622c683f87b28e3
+Author: Carl Dehlin <carl@dehlin.com>
+Date:   Tue Jun 16 09:02:05 2020 +0200
+
+    Add a missing term and remove a superfluous word
+    
+    Change-Id: I25f40f0bf241302b975e6fc14690aa863c0728b0
+
+commit 27cab77b699a1a2b5354820c57a91c92eaeb21e3
+Author: Carl Dehlin <carl@dehlin.com>
+Date:   Mon Jun 15 20:01:18 2020 +0200
+
+    Reformulate some sentences
+    
+    Change-Id: I4841aa8e8522008dd816261d9ad98e5fb8ad1758
+
+commit 8ac6655ce85a4462f2882fcb9e9118a7057ebe09
+Author: Carl Dehlin <carl@dehlin.com>
+Date:   Mon Jun 15 19:10:12 2020 +0200
+
+    Fix documentation formatting issues
+    
+    Change-Id: Iea3a6e75dc3a7376eda866ab24e535a6df84f8ea
--- a/extern/ceres/LICENSE
+++ b/extern/ceres/LICENSE
@@ -1,6 +1,6 @@
 Ceres Solver - A fast non-linear least squares minimizer
-Copyright 2015 Google Inc. All rights reserved.
-http://ceres-solver.org/
+Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+http://code.google.com/p/ceres-solver/

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -25,233 +25,3 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
----------------------------------------------------------------------------------------------------------------------------
-
-                              Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-------------------------------------------------------------------------------------------------------------------------------
-
-Some of the code in the examples directory derives from libmv, which is
-distributed under the MIT license as described below
-
-
-Copyright (c) 2007-2011 libmv authors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
--- a/extern/ceres/README
+++ b/extern/ceres/README
@@ -0,0 +1,3 @@
+Ceres Solver - A non-linear least squares minimizer
+==================================================
+Please see ceres.pdf in docs/ for a tutorial and reference.
--- a/extern/ceres/README.blender
+++ b/extern/ceres/README.blender
@@ -1,5 +1,5 @@
 Project: Ceres Solver
 URL: http://ceres-solver.org/
 License: BSD 3-Clause
-Upstream version 2.1.0
+Upstream version 2.0.0
 Local modifications: None
--- a/extern/ceres/README.md
+++ b/extern/ceres/README.md
@@ -1,18 +0,0 @@
-[![Android](https://github.com/ceres-solver/ceres-solver/actions/workflows/android.yml/badge.svg)](https://github.com/ceres-solver/ceres-solver/actions/workflows/android.yml)
-[![Linux](https://github.com/ceres-solver/ceres-solver/actions/workflows/linux.yml/badge.svg)](https://github.com/ceres-solver/ceres-solver/actions/workflows/linux.yml)
-[![macOS](https://github.com/ceres-solver/ceres-solver/actions/workflows/macos.yml/badge.svg)](https://github.com/ceres-solver/ceres-solver/actions/workflows/macos.yml)
-[![Windows](https://github.com/ceres-solver/ceres-solver/actions/workflows/windows.yml/badge.svg)](https://github.com/ceres-solver/ceres-solver/actions/workflows/windows.yml)
-
-Ceres Solver
-============
-
-Ceres Solver is an open source C++ library for modeling and solving
-large, complicated optimization problems. It is a feature rich, mature
-and performant library which has been used in production at Google
-since 2010. Ceres Solver can solve two kinds of problems.
-
-1. Non-linear Least Squares problems with bounds constraints.
-2. General unconstrained optimization problems.
-
-Please see [ceres-solver.org](http://ceres-solver.org/) for more
-information.
--- a/Show More
+++ b/Show More