EEVEE: Move Closure definitions to gpu_shader_codegen_lib.glsl

This way they can be used as inputs to the closure eval functions.

.clang-format

@@ -205,7 +205,6 @@ ForEachMacros:
   - FOREACH_SCENE_COLLECTION_BEGIN
   - FOREACH_SCENE_OBJECT_BEGIN
   - FOREACH_SELECTED_BASE_BEGIN
-  - FOREACH_SELECTED_BEZT_BEGIN
   - FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN
   - FOREACH_SELECTED_OBJECT_BEGIN
   - FOREACH_TRANS_DATA_CONTAINER
@@ -265,13 +264,13 @@ ForEachMacros:
   - SET_SLOT_PROBING_BEGIN
   - MAP_SLOT_PROBING_BEGIN
   - VECTOR_SET_SLOT_PROBING_BEGIN
-  - WL_ARRAY_FOR_EACH
-  - FOREACH_SPECTRUM_CHANNEL
+  - LIGHT_FOREACH_BEGIN_DIRECTIONAL
+  - LIGHT_FOREACH_BEGIN_LOCAL
+  - LIGHT_FOREACH_BEGIN_LOCAL_NO_CULL
 
 StatementMacros:
   - PyObject_HEAD
   - PyObject_VAR_HEAD
-  - ccl_gpu_kernel_postfix
 
 MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$"
 MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$"

.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
 

.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

CMakeLists.txt

@@ -25,6 +25,13 @@ endif()
 
 cmake_minimum_required(VERSION 3.10)
 
+# Prefer LEGACY OpenGL to be compatible with all the existing releases and
+# platforms which don't have GLVND yet. Only do it if preference was not set
+# externally.
+if(NOT DEFINED OpenGL_GL_PREFERENCE)
+  set(OpenGL_GL_PREFERENCE "LEGACY")
+endif()
+
 if(NOT EXECUTABLE_OUTPUT_PATH)
   set(FIRST_RUN TRUE)
 else()
@@ -105,12 +112,6 @@ blender_project_hack_post()
 
 enable_testing()
 
-#-----------------------------------------------------------------------------
-# Test compiler/library features.
-
-include(build_files/cmake/have_features.cmake)
-
-
 #-----------------------------------------------------------------------------
 # Redirect output files
 
@@ -195,7 +196,7 @@ endif()
 option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON)
 
 # Compositor
-option(WITH_COMPOSITOR_CPU     "Enable the tile based CPU nodal compositor" ON)
+option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 option(WITH_OPENIMAGEDENOISE   "Enable the OpenImageDenoise compositing node" ON)
 
 option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ON)
@@ -221,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)
@@ -261,14 +251,23 @@ if(WITH_GHOST_X11)
   option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
   option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
   option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
+  option(WITH_X11_ALPHA     "Enable X11 transparent background"                     ON)
 endif()
 
 if(UNIX AND NOT APPLE)
+  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
+  option(WITH_SYSTEM_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()
 
 
@@ -285,7 +284,6 @@ option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
-option(WITH_IMAGE_WEBP          "Enable WebP Image Support" ON)
 
 # Audio/Video format support
 option(WITH_CODEC_AVI           "Enable Blenders own AVI file support (raw/jpeg)" ON)
@@ -301,12 +299,9 @@ 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)
+option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
 if(APPLE)
   option(WITH_COREAUDIO    "Enable CoreAudio for audio support on macOS" ON)
@@ -364,7 +359,7 @@ if(WIN32 OR APPLE)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 if(UNIX AND NOT APPLE)
-  option(WITH_INSTALL_PORTABLE "Install redistributable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+  option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
   option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
   if(WITH_STATIC_LIBS)
     option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF)
@@ -413,8 +408,6 @@ option(WITH_CYCLES_DEBUG             "Build Cycles with options useful for debug
 option(WITH_CYCLES_STANDALONE        "Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI    "Build Cycles standalone with GUI" OFF)
 
-option(WITH_CYCLES_HYDRA_RENDER_DELEGATE "Build Cycles Hydra render delegate" OFF)
-
 option(WITH_CYCLES_DEBUG_NAN         "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
 option(WITH_CYCLES_NATIVE_ONLY       "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN       "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
@@ -435,23 +428,22 @@ if(NOT APPLE)
   option(WITH_CYCLES_CUBIN_COMPILER    "Build cubins with nvrtc based compiler instead of nvcc" OFF)
   option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
   option(WITH_CUDA_DYNLOAD             "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON)
-
-  set(OPTIX_ROOT_DIR                   "" CACHE PATH "Path to the OptiX SDK root directory, for building Cycles OptiX kernels.")
-  set(CYCLES_RUNTIME_OPTIX_ROOT_DIR    "" CACHE PATH "Path to the OptiX SDK root directory. When set, this path will be used at runtime to compile OptiX kernels.")
-
   mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
   mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
   mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
   mark_as_advanced(WITH_CUDA_DYNLOAD)
-  mark_as_advanced(OPTIX_ROOT_DIR)
-  mark_as_advanced(CYCLES_RUNTIME_OPTIX_ROOT_DIR)
 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()
@@ -461,21 +453,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)
@@ -511,7 +488,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)
@@ -541,24 +518,27 @@ endif()
 # OpenGL
 
 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_GPU_BUILDTIME_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)
+option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
+option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
+option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               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_GPU_BUILDTIME_SHADER_BUILDER
+  WITH_GLEW_ES
+  WITH_GL_EGL
+  WITH_GL_PROFILE_ES20
+  WITH_GPU_SHADER_BUILDER
 )
 
-# Metal
-
-if(APPLE)
-  option(WITH_METAL_BACKEND "Use Metal for graphics instead of (or as well as) OpenGL on macOS." OFF)
-  mark_as_advanced(WITH_METAL_BACKEND)
-else()
-  set(WITH_METAL_BACKEND OFF)
+if(WIN32)
+  option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
+  mark_as_advanced(WITH_GL_ANGLE)
 endif()
 
-if(WITH_METAL_BACKEND)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
+if(WITH_GLEW_ES AND WITH_SYSTEM_GLEW)
+  message(WARNING Ignoring WITH_SYSTEM_GLEW and using WITH_GLEW_ES)
+  set(WITH_SYSTEM_GLEW OFF)
 endif()
 
 if(WIN32)
@@ -737,13 +717,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   endif()
 endif()
 
-# Effective install path including config folder, as a generator expression.
-get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(GENERATOR_IS_MULTI_CONFIG)
-  string(REPLACE "\${BUILD_TYPE}" "$<CONFIG>" CMAKE_INSTALL_PREFIX_WITH_CONFIG ${CMAKE_INSTALL_PREFIX})
-else()
-  string(REPLACE "\${BUILD_TYPE}" "" CMAKE_INSTALL_PREFIX_WITH_CONFIG ${CMAKE_INSTALL_PREFIX})
-endif()
 
 
 # Apple
@@ -756,10 +729,9 @@ endif()
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
-if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE AND NOT WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
   message(FATAL_ERROR
     "At least one of WITH_BLENDER or WITH_CYCLES_STANDALONE "
-    "or WITH_CYCLES_HYDRA_RENDER_DELEGATE "
     "must be enabled, nothing to do!"
   )
 endif()
@@ -781,7 +753,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")
@@ -798,9 +769,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
@@ -825,9 +794,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)
@@ -864,6 +830,7 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
   set(WITH_X11_XINPUT    OFF)
   set(WITH_X11_XF86VMODE OFF)
   set(WITH_X11_XFIXES    OFF)
+  set(WITH_X11_ALPHA     OFF)
   set(WITH_GHOST_XDND    OFF)
   set(WITH_INPUT_IME     OFF)
   set(WITH_XR_OPENXR     OFF)
@@ -953,10 +920,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)
 
@@ -1162,8 +1126,7 @@ if(WITH_OPENVDB)
   list(APPEND OPENVDB_INCLUDE_DIRS
     ${BOOST_INCLUDE_DIR}
     ${TBB_INCLUDE_DIRS}
-    ${OPENEXR_INCLUDE_DIRS}
-  )
+    ${OPENEXR_INCLUDE_DIRS})
 
   list(APPEND OPENVDB_LIBRARIES ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
 
@@ -1178,18 +1141,137 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 
+find_package(OpenGL)
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
+
 if(WITH_OPENGL)
   add_definitions(-DWITH_OPENGL)
 endif()
 
-#-----------------------------------------------------------------------------
-# Configure Metal.
-if(WITH_METAL_BACKEND)
-  add_definitions(-DWITH_METAL_BACKEND)
+if(WITH_SYSTEM_GLES)
+  find_package_wrapper(OpenGLES)
+endif()
 
-  # No need to add frameworks here, all the ones we need for Metal and
-  # Metal-OpenGL Interop are already being added by
-  # build_files/cmake/platform/platform_apple.cmake
+if(WITH_GL_PROFILE_ES20)
+  if(WITH_SYSTEM_GLES)
+    if(NOT OPENGLES_LIBRARY)
+      message(FATAL_ERROR
+        "Unable to find OpenGL ES libraries. "
+        "Install them or disable WITH_SYSTEM_GLES."
+      )
+    endif()
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+
+  else()
+    set(OPENGLES_LIBRARY "" CACHE FILEPATH "OpenGL ES 2.0 library file")
+    mark_as_advanced(OPENGLES_LIBRARY)
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+
+    if(NOT OPENGLES_LIBRARY)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_LIBRARY "
+        "to the file path of an OpenGL ES 2.0 library."
+      )
+    endif()
+
+  endif()
+
+  if(WIN32)
+    # Setup paths to files needed to install and redistribute Windows Blender with OpenGL ES
+
+    set(OPENGLES_DLL "" CACHE FILEPATH "OpenGL ES 2.0 redistributable DLL file")
+    mark_as_advanced(OPENGLES_DLL)
+
+    if(NOT OPENGLES_DLL)
+      message(FATAL_ERROR
+        "To compile WITH_GL_PROFILE_ES20 you need to set OPENGLES_DLL to the file "
+        "path of an OpenGL ES 2.0 runtime dynamic link library (DLL)."
+      )
+    endif()
+
+    if(WITH_GL_ANGLE)
+      list(APPEND GL_DEFINITIONS -DWITH_ANGLE)
+
+      set(D3DCOMPILER_DLL "" CACHE FILEPATH "Direct3D Compiler redistributable DLL file (needed by ANGLE)")
+
+      get_filename_component(D3DCOMPILER_FILENAME "${D3DCOMPILER_DLL}" NAME)
+      list(APPEND GL_DEFINITIONS "-DD3DCOMPILER=\"\\\"${D3DCOMPILER_FILENAME}\\\"\"")
+
+      mark_as_advanced(D3DCOMPILER_DLL)
+
+      if(D3DCOMPILER_DLL STREQUAL "")
+        message(FATAL_ERROR
+          "To compile WITH_GL_ANGLE you need to set D3DCOMPILER_DLL to the file "
+          "path of a copy of the DirectX redistributable DLL file: D3DCompiler_46.dll"
+        )
+      endif()
+
+    endif()
+
+  endif()
+
+else()
+  if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
+  else()
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+  endif()
+endif()
+
+if(WITH_GL_EGL)
+  find_package(OpenGL REQUIRED EGL)
+  list(APPEND BLENDER_GL_LIBRARIES OpenGL::EGL)
+
+  list(APPEND GL_DEFINITIONS -DWITH_GL_EGL -DGLEW_EGL -DGLEW_INC_EGL)
+
+  if(WITH_SYSTEM_GLES)
+    if(NOT OPENGLES_EGL_LIBRARY)
+      message(FATAL_ERROR
+        "Unable to find OpenGL ES libraries. "
+        "Install them or disable WITH_SYSTEM_GLES."
+      )
+    endif()
+
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGLES_EGL_LIBRARY})
+
+  else()
+    set(OPENGLES_EGL_LIBRARY "" CACHE FILEPATH "EGL library file")
+    mark_as_advanced(OPENGLES_EGL_LIBRARY)
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}" "${OPENGLES_EGL_LIBRARY}")
+
+    if(NOT OPENGLES_EGL_LIBRARY)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_EGL_LIBRARY "
+        "to the file path of an EGL library."
+      )
+    endif()
+
+  endif()
+
+  if(WIN32)
+    # Setup paths to files needed to install and redistribute Windows Blender with OpenGL ES
+
+    set(OPENGLES_EGL_DLL "" CACHE FILEPATH "EGL redistributable DLL file")
+    mark_as_advanced(OPENGLES_EGL_DLL)
+
+    if(NOT OPENGLES_EGL_DLL)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_EGL_DLL "
+        "to the file path of an EGL runtime dynamic link library (DLL)."
+      )
+    endif()
+
+  endif()
+
+endif()
+
+if(WITH_GL_PROFILE_ES20)
+  list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_ES20)
+else()
+  list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1225,6 +1307,66 @@ if(WITH_OPENMP)
   )
 endif()
 
+#-----------------------------------------------------------------------------
+# Configure GLEW
+
+if(WITH_SYSTEM_GLEW)
+  find_package(GLEW)
+
+  # Note: There is an assumption here that the system GLEW is not a static library.
+
+  if(NOT GLEW_FOUND)
+    message(FATAL_ERROR "GLEW is required to build Blender. Install it or disable WITH_SYSTEM_GLEW.")
+  endif()
+
+  set(GLEW_INCLUDE_PATH "${GLEW_INCLUDE_DIR}")
+  set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+else()
+  if(WITH_GLEW_ES)
+    set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")
+
+    list(APPEND GL_DEFINITIONS -DGLEW_STATIC -DWITH_GLEW_ES)
+
+    # These definitions remove APIs from glew.h, making GLEW smaller, and catching unguarded API usage
+    if(WITH_GL_PROFILE_ES20)
+      list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
+    else()
+      # No ES functions are needed
+      list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+    endif()
+
+    if(WITH_GL_PROFILE_ES20)
+      if(WITH_GL_EGL)
+        list(APPEND GL_DEFINITIONS -DGLEW_USE_LIB_ES20)
+      endif()
+
+      # ToDo: This is an experiment to eliminate ES 1 symbols,
+      # GLEW doesn't really properly provide this level of control
+      # (for example, without modification it eliminates too many symbols)
+      # so there are lots of modifications to GLEW to make this work,
+      # and no attempt to make it work beyond Blender at this point.
+      list(APPEND GL_DEFINITIONS -DGL_ES_VERSION_1_0=0 -DGL_ES_VERSION_CL_1_1=0 -DGL_ES_VERSION_CM_1_1=0)
+    endif()
+
+    set(BLENDER_GLEW_LIBRARIES extern_glew_es bf_intern_glew_mx)
+
+  else()
+    set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+
+    list(APPEND GL_DEFINITIONS -DGLEW_STATIC)
+
+    # This won't affect the non-experimental glew library,
+    # but is used for conditional compilation elsewhere.
+    list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+
+    set(BLENDER_GLEW_LIBRARIES extern_glew)
+
+  endif()
+
+endif()
+
+list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+
 #-----------------------------------------------------------------------------
 # Configure Bullet
 
@@ -1288,6 +1430,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.
@@ -1364,6 +1514,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)
@@ -1448,18 +1599,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)
@@ -1515,9 +1654,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)
@@ -1583,7 +1719,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
@@ -1749,12 +1884,14 @@ if(WITH_BLENDER)
   # source after intern and extern to gather all
   # internal and external library information first, for test linking
   add_subdirectory(source)
-elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+elseif(WITH_CYCLES_STANDALONE)
+  add_subdirectory(intern/glew-mx)
   add_subdirectory(intern/guardedalloc)
   add_subdirectory(intern/libc_compat)
   add_subdirectory(intern/sky)
 
   add_subdirectory(intern/cycles)
+  add_subdirectory(extern/clew)
   if(WITH_CYCLES_LOGGING)
     if(NOT WITH_SYSTEM_GFLAGS)
       add_subdirectory(extern/gflags)
@@ -1767,6 +1904,9 @@ elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
   if(WITH_HIP_DYNLOAD)
     add_subdirectory(extern/hipew)
   endif()
+  if(NOT WITH_SYSTEM_GLEW)
+    add_subdirectory(extern/glew)
+  endif()
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1808,7 +1948,7 @@ if(FIRST_RUN)
 
     set(_msg "  - ${_setting}")
     string(LENGTH "${_msg}" _len)
-    while("36" GREATER "${_len}")
+    while("32" GREATER "${_len}")
       string(APPEND _msg " ")
       math(EXPR _len "${_len} + 1")
     endwhile()
@@ -1859,6 +1999,8 @@ if(FIRST_RUN)
   info_cfg_option(WITH_INSTALL_PORTABLE)
   info_cfg_option(WITH_MEM_JEMALLOC)
   info_cfg_option(WITH_MEM_VALGRIND)
+  info_cfg_option(WITH_SYSTEM_GLEW)
+  info_cfg_option(WITH_X11_ALPHA)
   info_cfg_option(WITH_X11_XF86VMODE)
   info_cfg_option(WITH_X11_XFIXES)
   info_cfg_option(WITH_X11_XINPUT)
@@ -1905,6 +2047,14 @@ if(FIRST_RUN)
   info_cfg_option(WITH_MOD_OCEANSIM)
   info_cfg_option(WITH_MOD_REMESH)
 
+  info_cfg_text("OpenGL:")
+  if(WIN32)
+    info_cfg_option(WITH_GL_ANGLE)
+  endif()
+  info_cfg_option(WITH_GL_EGL)
+  info_cfg_option(WITH_GL_PROFILE_ES20)
+  info_cfg_option(WITH_GLEW_ES)
+
   info_cfg_text("")
 
   message("${_config_msg}")

GNUmakefile

@@ -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)
 
 
 # -----------------------------------------------------------------------------

build_files/build_environment/CMakeLists.txt

@@ -30,11 +30,8 @@ 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/boost_build_options.cmake)
 include(cmake/download.cmake)
-include(cmake/macros.cmake)
 
 if(ENABLE_MINGW64)
   include(cmake/setup_mingw64.cmake)
@@ -49,16 +46,19 @@ include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
-include(cmake/imath.cmake)
 include(cmake/openexr.cmake)
 include(cmake/brotli.cmake)
 include(cmake/freetype.cmake)
-include(cmake/epoxy.cmake)
 include(cmake/freeglut.cmake)
+include(cmake/glew.cmake)
 include(cmake/alembic.cmake)
+include(cmake/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()
@@ -75,8 +75,8 @@ endif()
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
+include(cmake/nanovdb.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)
@@ -94,24 +94,12 @@ include(cmake/pugixml.cmake)
 include(cmake/ispc.cmake)
 include(cmake/openimagedenoise.cmake)
 include(cmake/embree.cmake)
-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.
 include(cmake/expat.cmake)
-include(cmake/pystring.cmake)
 include(cmake/yamlcpp.cmake)
 include(cmake/opencolorio.cmake)
 
@@ -119,9 +107,8 @@ if(BLENDER_PLATFORM_ARM)
   include(cmake/sse2neon.cmake)
 endif()
 
-include(cmake/webp.cmake)
-if(NOT APPLE)
-  include(cmake/level-zero.cmake)
+if(WITH_WEBP)
+  include(cmake/webp.cmake)
 endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)
@@ -139,7 +126,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)

build_files/build_environment/cmake/alembic.cmake

@@ -1,16 +1,30 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(ALEMBIC_EXTRA_ARGS
-  -DImath_ROOT=${LIBDIR}/imath
-  -DUSE_PYALEMBIC=OFF
-  -DUSE_ARNOLD=OFF
-  -DUSE_MAYA=OFF
-  -DUSE_PRMAN=OFF
-  -DUSE_HDF5=OFF
-  -DUSE_TESTS=OFF
+  -DBUILDSTATIC=ON
+  -DLINKSTATIC=ON
+  -DILMBASE_ROOT=${LIBDIR}/openexr
+  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
+  -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DUSE_PYILMBASE=0
+  -DUSE_PYALEMBIC=0
+  -DUSE_ARNOLD=0
+  -DUSE_MAYA=0
+  -DUSE_PRMAN=0
+  -DUSE_HDF5=Off
+  -DUSE_STATIC_HDF5=Off
+  -DUSE_TESTS=Off
+  -DALEMBIC_NO_OPENGL=1
   -DUSE_BINARIES=ON
-  -DALEMBIC_ILMBASE_LINK_STATIC=OFF
+  -DALEMBIC_ILMBASE_LINK_STATIC=On
   -DALEMBIC_SHARED_LIBS=OFF
+  -DGLUT_INCLUDE_DIR=""
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
 )
 
 ExternalProject_Add(external_alembic
@@ -41,6 +55,6 @@ endif()
 
 add_dependencies(
   external_alembic
+  external_zlib
   external_openexr
-  external_imath
 )

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
-)

build_files/build_environment/cmake/blosc.cmake

@@ -24,6 +24,7 @@ ExternalProject_Add(external_blosc
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
   PREFIX ${BUILD_DIR}/blosc
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/blosc
 )

build_files/build_environment/cmake/boost.cmake

@@ -1,6 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+set(BOOST_ADDRESS_MODEL 64)
+
+if(BLENDER_PLATFORM_ARM)
+  set(BOOST_ARCHITECTURE arm)
+else()
+  set(BOOST_ARCHITECTURE x86)
+endif()
+
 if(WIN32)
+  if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
+    set(BOOST_TOOLSET toolset=msvc-14.2)
+    set(BOOST_COMPILER_STRING -vc142)
+  else() # 2017
+    set(BOOST_TOOLSET toolset=msvc-14.1)
+    set(BOOST_COMPILER_STRING -vc141)
+  endif()
+
   set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
   set(BOOST_BUILD_COMMAND b2)
   set(BOOST_BUILD_OPTIONS runtime-link=shared )
@@ -20,6 +36,11 @@ else()
   set(BOOST_BUILD_COMMAND ./b2)
   set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
   set(BOOST_PATCH_COMMAND echo .)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(BOOST_ADDRESS_MODEL 64)
+  else()
+    set(BOOST_ADDRESS_MODEL 32)
+  endif()
 endif()
 
 if(WITH_BOOST_PYTHON)

build_files/build_environment/cmake/boost_build_options.cmake

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(BOOST_ADDRESS_MODEL 64)
-if(BLENDER_PLATFORM_ARM)
-  set(BOOST_ARCHITECTURE arm)
-else()
-  set(BOOST_ARCHITECTURE x86)
-endif()
-
-if(WIN32)
-  if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
-    set(BOOST_TOOLSET toolset=msvc-14.2)
-    set(BOOST_COMPILER_STRING -vc142)
-  else() # 2017
-    set(BOOST_TOOLSET toolset=msvc-14.1)
-    set(BOOST_COMPILER_STRING -vc141)
-  endif()
-endif()
-
-set(DEFAULT_BOOST_FLAGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
-  -DBOOST_ROOT=${LIBDIR}/boost
-  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
-  -DBoost_ADDITIONAL_VERSIONS=${BOOST_VERSION_SHORT}
-  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-)

build_files/build_environment/cmake/check_software.cmake

@@ -12,13 +12,21 @@ if(UNIX)
     automake
     bison
     ${_libtoolize_name}
-    meson
-    ninja
     pkg-config
     tclsh
     yasm
   )
 
+  if(NOT APPLE)
+    set(_required_software
+      ${_required_software}
+
+      # Needed for Mesa.
+      meson
+      ninja
+    )
+  endif()
+
   foreach(_software ${_required_software})
     find_program(_software_find NAMES ${_software})
     if(NOT _software_find)
@@ -48,8 +56,11 @@ 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"
-      "  brew install autoconf automake bison flex libtool meson ninja pkg-config yasm\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"
       "  Install equivalent packages.\n")

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
+)

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
+)

build_files/build_environment/cmake/download.cmake

@@ -1,16 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
-
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
   set(TARGET_HASH_TYPE ${${dep}_HASH_TYPE})
   set(TARGET_HASH ${${dep}_HASH})
   if(PACKAGE_USE_UPSTREAM_SOURCES)
     set(TARGET_URI  ${${dep}_URI})
-  elseif(BLENDER_VERSION)
-    set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/tags/blender-${BLENDER_VERSION}-release/lib/packages/${TARGET_FILE})
   else()
     set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
   endif()
@@ -36,9 +31,13 @@ download_source(BLOSC)
 download_source(PTHREADS)
 download_source(OPENEXR)
 download_source(FREETYPE)
-download_source(EPOXY)
+download_source(GLEW)
 download_source(FREEGLUT)
 download_source(ALEMBIC)
+download_source(GLFW)
+download_source(CLEW)
+download_source(GLFW)
+download_source(CUEW)
 download_source(OPENSUBDIV)
 download_source(SDL)
 download_source(OPENCOLLADA)
@@ -67,7 +66,9 @@ download_source(FFMPEG)
 download_source(FFTW)
 download_source(ICONV)
 download_source(SNDFILE)
-download_source(WEBP)
+if(WITH_WEBP)
+  download_source(WEBP)
+endif()
 download_source(SPNAV)
 download_source(JEMALLOC)
 download_source(XML2)
@@ -94,27 +95,5 @@ download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
-download_source(SSE2NEON)
 download_source(FLEX)
 download_source(BROTLI)
-download_source(FMT)
-download_source(ROBINMAP)
-download_source(IMATH)
-download_source(PYSTRING)
-download_source(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)

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()

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 .
-)

build_files/build_environment/cmake/embree.cmake

@@ -10,33 +10,53 @@ 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)
-  set(EMBREE_EXTRA_ARGS
-    ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_MAX_ISA=AVX2)
-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()
 
-ExternalProject_Add(external_embree
-  URL file://${PACKAGE_DIR}/${EMBREE_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
-  PREFIX ${BUILD_DIR}/embree
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/embree
-)
+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()
+
+if(BLENDER_PLATFORM_ARM)
+  ExternalProject_Add(external_embree
+    GIT_REPOSITORY ${EMBREE_ARM_GIT}
+    GIT_TAG "blender-arm"
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    PREFIX ${BUILD_DIR}/embree
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/embree
+  )
+else()
+  ExternalProject_Add(external_embree
+    URL file://${PACKAGE_DIR}/${EMBREE_FILE}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
+    PREFIX ${BUILD_DIR}/embree
+    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/embree
+  )
+endif()
 
 add_dependencies(
   external_embree

build_files/build_environment/cmake/epoxy.cmake

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

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(

build_files/build_environment/cmake/fmt.cmake

@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(FMT_EXTRA_ARGS
-  -DFMT_TEST=Off
-)
-
-ExternalProject_Add(external_fmt
-  URL file://${PACKAGE_DIR}/${FMT_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FMT_HASH_TYPE}=${FMT_HASH}
-  PREFIX ${BUILD_DIR}/fmt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fmt ${DEFAULT_CMAKE_FLAGS} ${FMT_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/fmt
-)

build_files/build_environment/cmake/glew.cmake

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

build_files/build_environment/cmake/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
+)

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
-)

build_files/build_environment/cmake/harvest.cmake

@@ -14,14 +14,20 @@ if(WIN32)
 if(BUILD_MODE STREQUAL Release)
   add_custom_target(Harvest_Release_Results
     COMMAND # jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
         # png
         ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
         ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
         # freeglut-> opengl
         ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
         ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # glew-> opengl
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # 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()
@@ -40,8 +46,7 @@ function(harvest from to)
     install(
       FILES ${LIBDIR}/${from}
       DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename}
-    )
+      RENAME ${filename})
   else()
     install(
       DIRECTORY ${LIBDIR}/${from}/
@@ -51,8 +56,7 @@ function(harvest from to)
       PATTERN "pkgconfig" EXCLUDE
       PATTERN "cmake" EXCLUDE
       PATTERN "__pycache__" EXCLUDE
-      PATTERN "tests" EXCLUDE
-    )
+      PATTERN "tests" EXCLUDE)
   endif()
 endfunction()
 
@@ -63,8 +67,6 @@ harvest(brotli/include brotli/include "*.h")
 harvest(brotli/lib brotli/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
-harvest(imath/include imath/include "*.h")
-harvest(imath/lib imath/lib "*.a")
 harvest(ffmpeg/include ffmpeg/include "*.h")
 harvest(ffmpeg/lib ffmpeg/lib "*.a")
 harvest(fftw3/include fftw3/include "*.h")
@@ -72,19 +74,15 @@ harvest(fftw3/lib fftw3/lib "*.a")
 harvest(flac/lib sndfile/lib "libFLAC.a")
 harvest(freetype/include freetype/include "*.h")
 harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
-harvest(epoxy/include epoxy/include "*.h")
-harvest(epoxy/lib epoxy/lib "*.a")
+harvest(glew/include glew/include "*.h")
+harvest(glew/lib glew/lib "*.a")
 harvest(gmp/include gmp/include "*.h")
 harvest(gmp/lib gmp/lib "*.a")
 harvest(jemalloc/include jemalloc/include "*.h")
 harvest(jemalloc/lib jemalloc/lib "*.a")
-harvest(jpeg/include jpeg/include "*.h")
-harvest(jpeg/lib jpeg/lib "libjpeg.a")
+harvest(jpg/include jpeg/include "*.h")
+harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
-if(NOT APPLE)
-  harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
-  harvest(level-zero/lib level-zero/lib "*.so*")
-endif()
 harvest(llvm/bin llvm/bin "clang-format")
 if(BUILD_CLANG_TOOLS)
   harvest(llvm/bin llvm/bin "clang-tidy")
@@ -137,13 +135,13 @@ harvest(openimagedenoise/include openimagedenoise/include "*")
 harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
 harvest(embree/include embree/include "*.h")
 harvest(embree/lib embree/lib "*.a")
-harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
+harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
 harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
-harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
+harvest(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")
@@ -171,11 +169,9 @@ harvest(tiff/lib tiff/lib "*.a")
 harvest(vorbis/lib ffmpeg/lib "*.a")
 harvest(opus/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
+harvest(webp/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(aom/lib ffmpeg/lib "*.a")
-harvest(webp/lib webp/lib "*.a")
-harvest(webp/include webp/include "*.h")
 harvest(usd/include usd/include "*.h")
 harvest(usd/lib/usd usd/lib/usd "*")
 harvest(usd/plugin usd/plugin "*")
@@ -189,10 +185,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()

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()

build_files/build_environment/cmake/imath.cmake

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(IMATH_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_TESTING=OFF
-  -DIMATH_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
-)
-
-ExternalProject_Add(external_imath
-  URL file://${PACKAGE_DIR}/${IMATH_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
-  PREFIX ${BUILD_DIR}/imath
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/imath
-)
-
-if(WIN32)
-  ExternalProject_Add_Step(external_imath after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
-    DEPENDEES install
-  )
-endif()

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)

build_files/build_environment/cmake/jpeg.cmake

@@ -2,52 +2,44 @@
 
 if(WIN32)
   # cmake for windows
-  set(JPEG_EXTRA_ARGS
-    -DNASM=${NASM_PATH}
-    -DWITH_JPEG8=ON
-    -DCMAKE_DEBUG_POSTFIX=d
-    -DWITH_CRT_DLL=On
-    -DENABLE_SHARED=OFF
-    -DENABLE_STATIC=ON
-  )
+  set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d -DWITH_CRT_DLL=On)
 
   ExternalProject_Add(external_jpeg
     URL file://${PACKAGE_DIR}/${JPEG_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpeg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpeg
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
   )
 
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_jpeg after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
+      DEPENDEES install
+    )
+  endif()
+
   if(BUILD_MODE STREQUAL Release)
     set(JPEG_LIBRARY jpeg-static${LIBEXT})
   else()
     set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
   endif()
-
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_jpeg after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}  ${LIBDIR}/jpeg/lib/jpeg${LIBEXT}
-      DEPENDEES install
-    )
-  endif()
-
 else(WIN32)
   # cmake for unix
   set(JPEG_EXTRA_ARGS
     -DWITH_JPEG8=ON
     -DENABLE_STATIC=ON
     -DENABLE_SHARED=OFF
-    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpeg/lib)
+    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
 
   ExternalProject_Add(external_jpeg
     URL file://${PACKAGE_DIR}/${JPEG_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpeg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpeg
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
   )
 
   set(JPEG_LIBRARY libjpeg${LIBEXT})

build_files/build_environment/cmake/level-zero.cmake

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(LEVEL_ZERO_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_level-zero
-  URL file://${PACKAGE_DIR}/${LEVEL_ZERO_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LEVEL_ZERO_HASH_TYPE}=${LEVEL_ZERO_HASH}
-  PREFIX ${BUILD_DIR}/level-zero
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/level-zero/src/external_level-zero < ${PATCH_DIR}/level-zero.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/level-zero ${DEFAULT_CMAKE_FLAGS} ${LEVEL_ZERO_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/level-zero
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_level-zero after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/level-zero ${HARVEST_TARGET}/level-zero
-    DEPENDEES install
-  )
-endif()

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
-)

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()

build_files/build_environment/cmake/nanovdb.cmake

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(NANOVDB_EXTRA_ARGS
+   # NanoVDB is header-only, so only need the install target
+  -DNANOVDB_BUILD_UNITTESTS=OFF
+  -DNANOVDB_BUILD_EXAMPLES=OFF
+  -DNANOVDB_BUILD_BENCHMARK=OFF
+  -DNANOVDB_BUILD_DOCS=OFF
+  -DNANOVDB_BUILD_TOOLS=OFF
+  -DNANOVDB_CUDA_KEEP_PTX=OFF
+   # Do not need to include any of the dependencies because of this
+  -DNANOVDB_USE_OPENVDB=OFF
+  -DNANOVDB_USE_OPENGL=OFF
+  -DNANOVDB_USE_OPENCL=OFF
+  -DNANOVDB_USE_CUDA=OFF
+  -DNANOVDB_USE_TBB=OFF
+  -DNANOVDB_USE_BLOSC=OFF
+  -DNANOVDB_USE_ZLIB=OFF
+  -DNANOVDB_USE_OPTIX=OFF
+  -DNANOVDB_ALLOW_FETCHCONTENT=OFF
+)
+
+ExternalProject_Add(nanovdb
+  URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
+  PREFIX ${BUILD_DIR}/nanovdb
+  SOURCE_SUBDIR nanovdb
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/nanovdb/src/nanovdb < ${PATCH_DIR}/nanovdb.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/nanovdb
+)
+
+if(WIN32)
+  ExternalProject_Add_Step(nanovdb after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/nanovdb/nanovdb ${HARVEST_TARGET}/nanovdb/include/nanovdb
+    DEPENDEES install
+  )
+endif()

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
-)

build_files/build_environment/cmake/opencolorio.cmake

@@ -11,12 +11,13 @@ set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_BUILD_GPU_TESTS=OFF
   -DOCIO_USE_SSE=ON
 
-  -DOCIO_INSTALL_EXT_PACKAGES=NONE
-
+  # Manually build ext packages except for pystring, which does not have
+  # a CMake or autotools build system that we can easily use.
+  -DOCIO_INSTALL_EXT_PACKAGES=MISSING
+  -DHalf_ROOT=${LIBDIR}/openexr
+  -DHalf_STATIC_LIBRARY=ON
   -Dexpat_ROOT=${LIBDIR}/expat
   -Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
-  -Dpystring_ROOT=${LIBDIR}/pystring
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 if(BLENDER_PLATFORM_ARM)
@@ -29,9 +30,7 @@ endif()
 if(WIN32)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
-    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpatMD
-    -Dyaml-cpp_LIBRARY=${LIBDIR}/expat/lib/libyaml-cppmd.lib
-    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}
+    -DOCIO_INLINES_HIDDEN=OFF
   )
 else()
   set(OPENCOLORIO_EXTRA_ARGS
@@ -53,8 +52,7 @@ add_dependencies(
   external_opencolorio
   external_yamlcpp
   external_expat
-  external_imath
-  external_pystring
+  external_openexr
 )
 
 if(WIN32)
@@ -64,7 +62,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
       DEPENDEES install
     )
   endif()
@@ -73,7 +71,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
       DEPENDEES install
     )
   endif()
@@ -81,7 +79,7 @@ else()
     ExternalProject_Add_Step(external_opencolorio after_install
       COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
       COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
-      COMMAND cp ${LIBDIR}/pystring/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
+      COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
       DEPENDEES install
     )
 endif()

build_files/build_environment/cmake/openexr.cmake

@@ -16,10 +16,12 @@ set(OPENEXR_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBUILD_TESTING=OFF
   -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
+  -DILMBASE_BUILD_BOTH_STATIC_SHARED=OFF
   -DBUILD_SHARED_LIBS=OFF
-  -DOPENEXR_INSTALL_TOOLS=OFF
-  -DOPENEXR_INSTALL_EXAMPLES=OFF
-  -DImath_DIR=${LIBDIR}/imath/lib/cmake/Imath
+  -DOPENEXR_BUILD_UTILS=OFF
+  -DPYILMBASE_ENABLE=OFF
+  -DOPENEXR_VIEWERS_ENABLE=OFF
+  -DILMBASE_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
   -DOPENEXR_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
 )
 

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -8,8 +8,6 @@ set(OIDN_EXTRA_ARGS
   -DOIDN_STATIC_LIB=ON
   -DOIDN_STATIC_RUNTIME=OFF
   -DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
-  -DOIDN_FILTER_RTLIGHTMAP=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
 )
 
 if(WIN32)
@@ -39,7 +37,6 @@ add_dependencies(
   external_openimagedenoise
   external_tbb
   external_ispc
-  external_python
 )
 
 if(WIN32)

build_files/build_environment/cmake/openimageio.cmake

@@ -18,31 +18,40 @@ 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(WITH_WEBP)
+  set(WEBP_ARGS
+    -DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
+    -DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
+  )
+  set(WEBP_DEP external_webp)
 endif()
 
 if(MSVC)
   set(OPENJPEG_FLAGS
-    -DOpenJPEG_ROOT=${LIBDIR}/openjpeg_msvc
+    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg_msvc
   )
 else()
   set(OPENJPEG_FLAGS
-    -DOpenJPEG_ROOT=${LIBDIR}/openjpeg
+    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg
   )
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
   -DBUILD_SHARED_LIBS=OFF
   ${OPENIMAGEIO_LINKSTATIC}
-  ${DEFAULT_BOOST_FLAGS}
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DUSE_LIBSQUISH=OFF
   -DUSE_QT5=OFF
   -DUSE_NUKE=OFF
@@ -53,6 +62,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_LIBHEIF=OFF
   -DUSE_OPENGL=OFF
   -DUSE_TBB=OFF
+  -DUSE_FIELD3D=OFF
   -DUSE_QT=OFF
   -DUSE_PYTHON=OFF
   -DUSE_GIF=OFF
@@ -63,7 +73,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_FREETYPE=OFF
   -DUSE_LIBRAW=OFF
   -DUSE_OPENCOLORIO=OFF
-  -DUSE_WEBP=ON
+  -DUSE_WEBP=${WITH_WEBP}
   -DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
   -DOIIO_BUILD_TESTS=OFF
   -DBUILD_TESTING=OFF
@@ -71,11 +81,16 @@ 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
+  -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
+  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
   ${OPENJPEG_FLAGS}
+  -DOpenEXR_USE_STATIC_LIBS=On
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
@@ -83,14 +98,8 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_EXTERNAL_PUGIXML=ON
   -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
   -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
-  -DBUILD_MISSING_ROBINMAP=OFF
-  -DBUILD_MISSING_FMT=OFF
-  -DFMT_INCLUDE_DIR=${LIBDIR}/fmt/include/
-  -DRobinmap_ROOT=${LIBDIR}/robinmap
-  -DWebP_ROOT=${LIBDIR}/webp
+  ${WEBP_FLAGS}
   ${OIIO_SIMD_FLAGS}
-  -DOpenEXR_ROOT=${LIBDIR}/openexr
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 ExternalProject_Add(external_openimageio
@@ -108,15 +117,12 @@ add_dependencies(
   external_png
   external_zlib
   external_openexr
-  external_imath
   external_jpeg
   external_boost
   external_tiff
   external_pugixml
-  external_fmt
-  external_robinmap
   external_openjpeg${OPENJPEG_POSTFIX}
-  external_webp
+  ${WEBP_DEP}
 )
 
 if(WIN32)
@@ -131,8 +137,8 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openjpeg.cmake

@@ -3,24 +3,20 @@
 # Note the encoder/decoder may use png/tiff/lcms system libraries, but the
 # library itself does not depend on them, so should give no problems.
 
+set(OPENJPEG_EXTRA_ARGS -DBUILD_SHARED_LIBS=OFF)
+
 if(WIN32)
   set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
 else()
   set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
 
-set(OPENJPEG_EXTRA_ARGS
-  ${OPENJPEG_EXTRA_ARGS}
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_CODEC=OFF
-)
-
 ExternalProject_Add(external_openjpeg
   URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
   PREFIX ${BUILD_DIR}/openjpeg
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg ${BUILD_DIR}/openjpeg/src/external_openjpeg
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
   INSTALL_DIR ${LIBDIR}/openjpeg

build_files/build_environment/cmake/opensubdiv.cmake

@@ -1,25 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(OPENSUBDIV_EXTRA_ARGS
-  -DNO_LIB=OFF
   -DNO_EXAMPLES=ON
-  -DNO_TUTORIALS=ON
   -DNO_REGRESSION=ON
+  -DNO_PYTHON=ON
+  -DNO_MAYA=ON
   -DNO_PTEX=ON
   -DNO_DOC=ON
-  -DNO_OMP=ON
-  -DNO_TBB=OFF
-  -DNO_CUDA=ON
-  -DNO_OPENCL=ON
-  -DNO_CLEW=ON
-  -DNO_OPENGL=OFF
-  -DNO_METAL=OFF
-  -DNO_DX=ON
-  -DNO_TESTS=ON
-  -DNO_GLTESTS=ON
-  -DNO_GLEW=ON
-  -DNO_GLFW=ON
-  -DNO_GLFW_X11=ON
+  -DNO_CLEW=OFF
+  -DNO_OPENCL=OFF
+  -DNO_TUTORIALS=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 +21,30 @@ 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}
   )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=OFF
+    )
+  else()
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=ON
+    )
+  endif()
+
 else()
   set(OPENSUBDIV_EXTRA_ARGS
     ${OPENSUBDIV_EXTRA_ARGS}
-    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DNO_CUDA=ON
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
   )
 endif()
 
@@ -64,5 +76,9 @@ endif()
 
 add_dependencies(
   external_opensubdiv
+  external_glew
+  external_glfw
+  external_clew
+  external_cuew
   external_tbb
 )

build_files/build_environment/cmake/openvdb.cmake

@@ -13,7 +13,6 @@ else()
 endif()
 
 set(OPENVDB_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
   -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
   -DBoost_USE_MULTITHREADED=ON
   -DBoost_USE_STATIC_LIBS=ON
@@ -25,20 +24,22 @@ set(OPENVDB_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
   -DBlosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DBlosc_LIBRARY_RELEASE=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DBlosc_LIBRARY_DEBUG=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DOPENVDB_BUILD_UNITTESTS=OFF
-  -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-  -DOPENVDB_BUILD_NANOVDB=ON
-  -DNANOVDB_BUILD_TOOLS=OFF
+  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+  -DOPENVDB_BUILD_UNITTESTS=Off
+  -DOPENVDB_BUILD_PYTHON_MODULE=Off
   -DBlosc_ROOT=${LIBDIR}/blosc/
   -DTBB_ROOT=${LIBDIR}/tbb/
+  -DOpenEXR_ROOT=${LIBDIR}/openexr
+  -DIlmBase_ROOT=${LIBDIR}/openexr
+  -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
+   # All libs live in openexr, even the ilmbase ones
+  -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
   -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
   -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
-  -DOPENVDB_BUILD_BINARIES=OFF
+  -DOPENVDB_BUILD_BINARIES=Off
   -DCMAKE_DEBUG_POSTFIX=_d
-  -DBLOSC_USE_STATIC_LIBS=ON
-  -DUSE_NANOVDB=ON
+  -DILMBASE_USE_STATIC_LIBS=On
+  -DOPENEXR_USE_STATIC_LIBS=On
 )
 
 if(WIN32)
@@ -47,6 +48,15 @@ if(WIN32)
   # needs to link pthreads due to it being a blosc dependency
   set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
     -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
+    -DUSE_EXR=On
+  )
+else()
+  # OpenVDB can't find the _static libraries automatically.
+  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+    -DTbb_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DTbb_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DTbb_tbbmalloc_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_static${LIBEXT}
+    -DTbb_tbbmalloc_proxy_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_proxy_static${LIBEXT}
   )
 endif()
 
@@ -64,6 +74,7 @@ add_dependencies(
   openvdb
   external_tbb
   external_boost
+  external_openexr
   external_zlib
   external_blosc
 )
@@ -71,7 +82,7 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include/openvdb ${HARVEST_TARGET}/openvdb/include/openvdb
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
       DEPENDEES install

build_files/build_environment/cmake/options.cmake

@@ -3,6 +3,7 @@
 if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
 endif()
+option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
 cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
@@ -38,33 +39,32 @@ 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
-  set(COMMON_DEFINES /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+  set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
   if(MSVC_VERSION GREATER 1909)
     set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
   endif()
   string(APPEND COMMON_MSVC_FLAGS " /bigobj")
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   set(PLATFORM_FLAGS)
   set(PLATFORM_CXX_FLAGS)
@@ -97,7 +97,6 @@ if(WIN32)
 else()
   set(PATCH_CMD patch)
   set(LIBEXT ".a")
-  set(SHAREDLIBEXT ".so")
   set(LIBPREFIX "lib")
 
   if(APPLE)

build_files/build_environment/cmake/osl.cmake

@@ -3,15 +3,33 @@
 if(WIN32)
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
   set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
+  set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
 endif()
 
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
+
 set(OSL_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DOpenEXR_ROOT=${LIBDIR}/openexr/
+  -DIlmBase_ROOT=${LIBDIR}/openexr/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
@@ -31,10 +49,10 @@ set(OSL_EXTRA_ARGS
   -DUSE_QT=OFF
   -DUSE_Qt5=OFF
   -DINSTALL_DOCS=OFF
+  ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
   -DCMAKE_CXX_STANDARD=14
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 ExternalProject_Add(external_osl

build_files/build_environment/cmake/pystring.cmake

@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(PYSTRING_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_pystring
-  URL file://${PACKAGE_DIR}/${PYSTRING_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PYSTRING_HASH_TYPE}=${PYSTRING_HASH}
-  PREFIX ${BUILD_DIR}/pystring
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_pystring.txt ${BUILD_DIR}/pystring/src/external_pystring/CMakeLists.txt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pystring ${DEFAULT_CMAKE_FLAGS} ${PYSTRING_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pystring
-)
-
-if(WIN32)
-  ExternalProject_Add_Step(external_pystring after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/lib ${HARVEST_TARGET}/pystring/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/include ${HARVEST_TARGET}/pystring/include
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/python.cmake

@@ -27,7 +27,6 @@ if(WIN32)
     PREFIX ${BUILD_DIR}/python
     CONFIGURE_COMMAND ""
     BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
-    PATCH_COMMAND ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
 

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)

build_files/build_environment/cmake/robinmap.cmake

@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(ROBINMAP_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_robinmap
-  URL file://${PACKAGE_DIR}/${ROBINMAP_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ROBINMAP_HASH_TYPE}=${ROBINMAP_HASH}
-  PREFIX ${BUILD_DIR}/robinmap
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/robinmap ${DEFAULT_CMAKE_FLAGS} ${ROBINMAP_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/robinmap
-)

build_files/build_environment/cmake/sse2neon.cmake

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

build_files/build_environment/cmake/tiff.cmake

@@ -1,16 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+if(WITH_WEBP)
+  set(WITH_TIFF_WEBP ON)
+else()
+  set(WITH_TIFF_WEBP OFF)
+endif()
+
 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
   -Djbig=OFF
   -Dzstd=OFF
-  -Dwebp=OFF
+  -Dwebp=${WITH_TIFF_WEBP}
 )
 
 ExternalProject_Add(external_tiff
@@ -26,12 +30,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()

build_files/build_environment/cmake/usd.cmake

@@ -1,72 +1,39 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if(WIN32)
-  # OIIO and OSL are statically linked for us, but USD doesn't know
-  set(USD_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DOIIO_STATIC_DEFINE /DOSL_STATIC_DEFINE")
-  if(BUILD_MODE STREQUAL Debug)
-    # USD does not look for debug libs, nor does it link them
-    # when building static, so this is just to keep find_package happy
-    # if we ever link dynamically on windows util will need to be linked as well.
-    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}")
-  endif()
-  set(USD_PLATFORM_FLAGS
-    ${USD_OIIO_CMAKE_DEFINES}
-    -DCMAKE_CXX_FLAGS=${USD_CXX_FLAGS}
-  )
-endif()
-
 set(USD_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
-  ${USD_PLATFORM_FLAGS}
-  # This is a preventative measure that avoids possible conflicts when add-ons
-  # try to load another USD library into the same process space.
-  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
-  -DOPENSUBDIV_ROOT_DIR=${LIBDIR}/opensubdiv
-  -DOpenImageIO_ROOT=${LIBDIR}/openimageio
-  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
-  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
-  -DPXR_BUILD_IMAGING=ON
-  -DPXR_BUILD_TESTS=OFF
-  -DPXR_BUILD_EXAMPLES=OFF
-  -DPXR_BUILD_TUTORIALS=OFF
-  -DPXR_ENABLE_HDF5_SUPPORT=OFF
-  -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-  -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
-  # USD 22.03 does not support OCIO 2.x
-  # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
-  -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF
-  -DPXR_ENABLE_PTEX_SUPPORT=OFF
-  -DPXR_BUILD_USD_TOOLS=OFF
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -DBUILD_SHARED_LIBS=Off
-  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
-  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
-  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
   -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
   -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
   # USD wants the tbb debug lib set even when you are doing a release build
   # Otherwise it will error out during the cmake configure phase.
   -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
+
+  # This is a preventative measure that avoids possible conflicts when add-ons
+  # try to load another USD library into the same process space.
+  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
+
+  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
+  -DPXR_BUILD_IMAGING=OFF
+  -DPXR_BUILD_TESTS=OFF
+  -DBUILD_SHARED_LIBS=OFF
+  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
+  -DPXR_BUILD_MONOLITHIC=ON
+
+  # The PXR_BUILD_USD_TOOLS argument is patched-in by usd.diff. An upstream pull request
+  # can be found at https://github.com/PixarAnimationStudios/USD/pull/1048.
+  -DPXR_BUILD_USD_TOOLS=OFF
+
+  -DCMAKE_DEBUG_POSTFIX=_d
+  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
+  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
+  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
 )
 
 ExternalProject_Add(external_usd
@@ -83,31 +50,29 @@ add_dependencies(
   external_usd
   external_tbb
   external_boost
-  external_opensubdiv
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
-# See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
-if(NOT WIN32)
-  if (USD_VERSION VERSION_LESS 21.11)
-    set(PXR_LIB_PREFIX "")
-  else()
-    set(PXR_LIB_PREFIX "usd_")
-  endif()
-endif()
-
 if(WIN32)
+  # USD currently demands python be available at build time
+  # and then proceeds not to use it, but still checks that the
+  # version of the interpreter it is not going to use is atleast 2.7
+  # so we need this dep currently since there is no system python
+  # on windows.
+  add_dependencies(
+    external_usd
+    external_python
+  )
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_usd_m.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_usd_m_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
       DEPENDEES install
     )
   endif()
@@ -119,7 +84,7 @@ else()
   # case (only the shared library). As a result, we need to grab the `libusd_m.a`
   # file from the build directory instead of from the install directory.
   ExternalProject_Add_Step(external_usd after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/lib${PXR_LIB_PREFIX}usd_m.a ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.a
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/libusd_m.a ${HARVEST_TARGET}/usd/lib/libusd_m.a
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/versions.cmake

@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(ZLIB_VERSION 1.2.12)
+set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 5fc414a9726be31427b440b434d05f78)
+set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
 set(ZLIB_HASH_TYPE MD5)
 set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)
 
-set(OPENAL_VERSION 1.21.1)
+set(OPENAL_VERSION 1.20.1)
 set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
-set(OPENAL_HASH a936806ebd8de417b0ffd8cf3f48f456)
+set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
 set(OPENAL_HASH_TYPE MD5)
 set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2)
 
@@ -18,24 +18,24 @@ set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca)
 set(PNG_HASH_TYPE SHA256)
 set(PNG_FILE libpng-${PNG_VERSION}.tar.xz)
 
-set(JPEG_VERSION 2.1.3)
+set(JPEG_VERSION 2.0.4)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
-set(JPEG_HASH 627b980fad0573e08e4c3b80b290fc91)
+set(JPEG_HASH 44c43e4a9fb352f47090804529317c88)
 set(JPEG_HASH_TYPE MD5)
 set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
 
-set(BOOST_VERSION 1.78.0)
-set(BOOST_VERSION_SHORT 1.78)
-set(BOOST_VERSION_NODOTS 1_78_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_78)
+set(BOOST_VERSION 1.73.0)
+set(BOOST_VERSION_NODOTS 1_73_0)
+set(BOOST_VERSION_NODOTS_SHORT 1_73)
 set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH c2f6428ac52b0e5a3c9b2e1d8cc832b5)
+set(BOOST_HASH 4036cd27ef7548b8d29c30ea10956196)
 set(BOOST_HASH_TYPE MD5)
 set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
 
-set(BLOSC_VERSION 1.21.1)
+# Using old version as recommended by OpenVDB build documentation.
+set(BLOSC_VERSION 1.5.0)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
-set(BLOSC_HASH 134b55813b1dca57019d2a2dc1f7a923)
+set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
 set(BLOSC_HASH_TYPE MD5)
 set(BLOSC_FILE blosc-${BLOSC_VERSION}.tar.gz)
 
@@ -45,19 +45,12 @@ 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 2.5.5)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH a92f38eedd43e56c0af56d4852506886)
+set(OPENEXR_HASH 85e8a979092c9055d10ed103062d31a0)
 set(OPENEXR_HASH_TYPE MD5)
 set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
 
-set(IMATH_VERSION 3.1.5)
-set(IMATH_URI https://github.com/AcademySoftwareFoundation/Imath/archive/v${OPENEXR_VERSION}.tar.gz)
-set(IMATH_HASH dd375574276c54872b7b3d54053baff0)
-set(IMATH_HASH_TYPE MD5)
-set(IMATH_FILE imath-${IMATH_VERSION}.tar.gz)
-
-
 if(WIN32)
   # Openexr started appending _d on its own so now
   # we need to tell the build the postfix is _s while
@@ -80,11 +73,11 @@ set(FREETYPE_HASH bd4e3b007474319909a6b79d50908e85)
 set(FREETYPE_HASH_TYPE MD5)
 set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
 
-set(EPOXY_VERSION 1.5.10)
-set(EPOXY_URI https://github.com/anholt/libepoxy/archive/refs/tags/${EPOXY_VERSION}.tar.gz)
-set(EPOXY_HASH f0730aad115c952e77591fcc805b1dc1)
-set(EPOXY_HASH_TYPE MD5)
-set(EPOXY_FILE libepoxy-${EPOXY_VERSION}.tar.gz)
+set(GLEW_VERSION 1.13.0)
+set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
+set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)
+set(GLEW_HASH_TYPE MD5)
+set(GLEW_FILE glew-${GLEW_VERSION}.tgz)
 
 set(FREEGLUT_VERSION 3.0.0)
 set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
@@ -92,21 +85,42 @@ set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)
 set(FREEGLUT_HASH_TYPE MD5)
 set(FREEGLUT_FILE freeglut-${FREEGLUT_VERSION}.tar.gz)
 
-set(ALEMBIC_VERSION 1.8.3)
+set(ALEMBIC_VERSION 1.7.16)
 set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
-set(ALEMBIC_HASH 2cd8d6e5a3ac4a014e24a4b04f4fadf9)
+set(ALEMBIC_HASH effcc86e42fe6605588e3de57bde6677)
 set(ALEMBIC_HASH_TYPE MD5)
 set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
 
-set(OPENSUBDIV_VERSION v3_4_4)
+# 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_3)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
-set(OPENSUBDIV_HASH 39ecc5caf0abebc943d1ce131855e76e)
+set(OPENSUBDIV_HASH 7bbfa275d021fb829e521df749160edb)
 set(OPENSUBDIV_HASH_TYPE MD5)
 set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
-set(SDL_VERSION 2.0.20)
+set(SDL_VERSION 2.0.12)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_HASH a53acc02e1cca98c4123229069b67c9e)
+set(SDL_HASH 783b6f2df8ff02b19bb5ce492b99c8ff)
 set(SDL_HASH_TYPE MD5)
 set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
 
@@ -116,9 +130,9 @@ set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
 set(OPENCOLLADA_HASH_TYPE MD5)
 set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
-set(OPENCOLORIO_VERSION 2.1.1)
+set(OPENCOLORIO_VERSION 2.0.0)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH 604f562e073f23d88ce89ed4f7f709ba)
+set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
@@ -141,37 +155,21 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.3.13.0)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c)
+set(OPENIMAGEIO_VERSION 2.2.15.1)
+set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
+set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
 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.
-# 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)
-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.
-# 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)
-set(ROBINMAP_HASH c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1)
-set(ROBINMAP_HASH_TYPE SHA256)
-set(ROBINMAP_FILE robinmap-${ROBINMAP_VERSION}.tar.gz)
-
-set(TIFF_VERSION 4.4.0)
+set(TIFF_VERSION 4.1.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 376f17f189e9d02280dfe709b2b2bbea)
+set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.17.0)
+set(OSL_VERSION 1.11.14.1)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 63265472ce14548839ace2e21e401544)
+set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -183,18 +181,24 @@ set(PYTHON_HASH 14e8c22458ed7779a1957b26cde01db9)
 set(PYTHON_HASH_TYPE MD5)
 set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
 
-set(TBB_VERSION 2020_U3)
+set(TBB_VERSION 2020_U2)
 set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 55ec8df6eae5ed6364a47f0e671e460c)
+set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
 set(TBB_HASH_TYPE MD5)
 set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
 
-set(OPENVDB_VERSION 9.0.0)
+set(OPENVDB_VERSION 8.0.1)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 684ce40c2f74f3a0c9cac530e1c7b07e)
+set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
+set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
+set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
+set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
+set(NANOVDB_HASH_TYPE MD5)
+set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
+
 set(IDNA_VERSION 3.3)
 set(CHARSET_NORMALIZER_VERSION 2.0.10)
 set(URLLIB3_VERSION 1.26.8)
@@ -204,9 +208,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)
@@ -221,15 +222,15 @@ set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
 set(LAME_HASH_TYPE MD5)
 set(LAME_FILE lame-${LAME_VERSION}.tar.gz)
 
-set(OGG_VERSION 1.3.5)
+set(OGG_VERSION 1.3.4)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH 0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664)
+set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
 set(OGG_HASH_TYPE SHA256)
 set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
 
-set(VORBIS_VERSION 1.3.7)
+set(VORBIS_VERSION 1.3.6)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_HASH 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab)
+set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
 set(VORBIS_HASH_TYPE SHA256)
 set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)
 
@@ -239,15 +240,15 @@ set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
 set(THEORA_HASH_TYPE SHA256)
 set(THEORA_FILE libtheora-${THEORA_VERSION}.tar.bz2)
 
-set(FLAC_VERSION 1.3.4)
+set(FLAC_VERSION 1.3.3)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 )
+set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
 set(FLAC_HASH_TYPE SHA256)
 set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
 
-set(VPX_VERSION 1.11.0)
+set(VPX_VERSION 1.8.2)
 set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
-set(VPX_HASH 965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83)
+set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
 set(VPX_HASH_TYPE SHA256)
 set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
 
@@ -257,9 +258,9 @@ set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
 set(OPUS_HASH_TYPE SHA256)
 set(OPUS_FILE opus-${OPUS_VERSION}.tar.gz)
 
-set(X264_VERSION 35fe20d1ba49918ec739a5b068c208ca82f977f7)
+set(X264_VERSION 33f9e1474613f59392be5ab6a7e7abf60fa63622)
 set(X264_URI https://code.videolan.org/videolan/x264/-/archive/${X264_VERSION}/x264-${X264_VERSION}.tar.gz)
-set(X264_HASH bb4f7da03936b5a030ed5827133b58eb3f701d7e5dce32cca4ba6df93797d42e)
+set(X264_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
 set(X264_HASH_TYPE SHA256)
 set(X264_FILE x264-${X264_VERSION}.tar.gz)
 
@@ -269,22 +270,22 @@ set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce
 set(XVIDCORE_HASH_TYPE SHA256)
 set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
 
-set(OPENJPEG_VERSION 2.4.0)
-set(OPENJPEG_SHORT_VERSION 2.4)
+set(OPENJPEG_VERSION 2.3.1)
+set(OPENJPEG_SHORT_VERSION 2.3)
 set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d)
+set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
 set(OPENJPEG_HASH_TYPE SHA256)
 set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
 
-set(FFMPEG_VERSION 5.0)
+set(FFMPEG_VERSION 4.4)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH c0130b8db2c763430fd1c6905288d61bc44ee0548ad5fcd2dfd650b88432bed9)
+set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e)
 set(FFMPEG_HASH_TYPE SHA256)
 set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 
-set(FFTW_VERSION 3.3.10)
+set(FFTW_VERSION 3.3.8)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
-set(FFTW_HASH 8ccbf6a5ea78a16dbc3e1306e234cc5c)
+set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
 set(FFTW_HASH_TYPE MD5)
 set(FFTW_FILE fftw-${FFTW_VERSION}.tar.gz)
 
@@ -300,9 +301,9 @@ set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
 set(SNDFILE_HASH_TYPE MD5)
 set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
 
-set(WEBP_VERSION 1.2.2)
+set(WEBP_VERSION 0.6.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_HASH b5e2e414a8adee4c25fe56b18dd9c549)
+set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
 set(WEBP_HASH_TYPE MD5)
 set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
 
@@ -337,15 +338,9 @@ set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
 set(YAMLCPP_HASH_TYPE MD5)
 set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
 
-set(PYSTRING_VERSION v1.1.3)
-set(PYSTRING_URI https://codeload.github.com/imageworks/pystring/tar.gz/refs/tags/${PYSTRING_VERSION})
-set(PYSTRING_HASH f2c68786b359f5e4e62bed53bc4fb86d)
-set(PYSTRING_HASH_TYPE MD5)
-set(PYSTRING_FILE pystring-${PYSTRING_VERSION}.tar.gz)
-
-set(EXPAT_VERSION 2_4_4)
+set(EXPAT_VERSION 2_2_10)
 set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
-set(EXPAT_HASH 2d3e81dee94b452369dc6394ff0f8f98)
+set(EXPAT_HASH 7ca5f09959fcb9a57618368deb627b9f)
 set(EXPAT_HASH_TYPE MD5)
 set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
 
@@ -410,21 +405,22 @@ 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.10.0)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
+set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
+set(EMBREE_ARM_GIT https://github.com/brechtvl/embree.git)
 
-set(USD_VERSION 22.03)
+set(USD_VERSION 21.02)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH e0e441a05057692a83124a1195b09eed)
+set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.3)
+set(OIDN_VERSION 1.4.1)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 027093eaf5e8b4e45835b991137b38e6)
+set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -458,9 +454,9 @@ set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/
 set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
 set(WL_PROTOCOLS_HASH_TYPE MD5)
 
-set(ISPC_VERSION v1.17.0)
+set(ISPC_VERSION v1.16.0)
 set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-set(ISPC_HASH 4f476a3109332a77fe839a9014c60ca9)
+set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
 set(ISPC_HASH_TYPE MD5)
 set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
 
@@ -488,157 +484,11 @@ set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
 set(ZSTD_HASH_TYPE SHA256)
 set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
 
-set(SSE2NEON_VERSION fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
-set(SSE2NEON_URI https://github.com/DLTcollab/sse2neon/archive/${SSE2NEON_VERSION}.tar.gz)
-set(SSE2NEON_HASH 0780253525d299c31775ef95853698d03db9c7739942af8570000f4a25a5d605)
-set(SSE2NEON_HASH_TYPE SHA256)
-set(SSE2NEON_FILE sse2neon-${SSE2NEON_VERSION}.tar.gz)
+set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
+set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
 
 set(BROTLI_VERSION v1.0.9)
 set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/${BROTLI_VERSION}.tar.gz)
 set(BROTLI_HASH f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46)
 set(BROTLI_HASH_TYPE SHA256)
 set(BROTLI_FILE brotli-${BROTLI_VERSION}.tar.gz)
-
-set(LEVEL_ZERO_VERSION v1.7.15)
-set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
-set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
-set(LEVEL_ZERO_HASH_TYPE SHA256)
-set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
-
-set(DPCPP_VERSION 20220812)
-set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH 0e3c95346c295f5cf80f3a42d80b1c49481955898530242636ddc002627248d6)
-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)

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
 )
 

build_files/build_environment/cmake/webp.cmake

@@ -4,15 +4,9 @@
 # library itself does not depend on them, so should give no problems.
 
 set(WEBP_EXTRA_ARGS
-  -DWEBP_BUILD_ANIM_UTILS=OFF
-  -DWEBP_BUILD_CWEBP=OFF
-  -DWEBP_BUILD_DWEBP=OFF
-  -DWEBP_BUILD_GIF2WEBP=OFF
-  -DWEBP_BUILD_IMG2WEBP=OFF
-  -DWEBP_BUILD_VWEBP=OFF
-  -DWEBP_BUILD_WEBPINFO=OFF
-  -DWEBP_BUILD_WEBPMUX=OFF
-  -DWEBP_BUILD_EXTRAS=OFF
+  -DWEBP_HAVE_SSE2=ON
+  -DWEBP_HAVE_SSE41=OFF
+  -DWEBP_HAVE_AVX2=OFF
 )
 
 if(WIN32)

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;

build_files/build_environment/patches/cmakelists_glew.txt

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

build_files/build_environment/patches/cmakelists_pystring.txt

@@ -1,32 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright Contributors to the OpenColorIO Project.
-
-project(pystring)
-
-cmake_minimum_required(VERSION 3.10)
-
-set(HEADERS
-	pystring.h
-)
-
-set(SOURCES
-	pystring.cpp
-)
-
-add_library(${PROJECT_NAME} STATIC ${HEADERS} ${SOURCES})
-
-if(UNIX)
-	set(pystring_CXX_FLAGS "${pystring_CXX_FLAGS} -fPIC")
-endif()
-
-set_target_properties(${PROJECT_NAME} PROPERTIES 
-	COMPILE_FLAGS "${PLATFORM_COMPILE_FLAGS} ${pystring_CXX_FLAGS}"
-    PUBLIC_HEADER "${HEADERS}"
-)
-
-install(TARGETS ${PROJECT_NAME}
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	PUBLIC_HEADER DESTINATION include/pystring
-)

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

build_files/build_environment/patches/dpcpp.diff

@@ -1,36 +0,0 @@
-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)
- 

build_files/build_environment/patches/embree.diff

@@ -1,37 +1,14 @@
-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 

build_files/build_environment/patches/epoxy.diff

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

build_files/build_environment/patches/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)
- 
- #

build_files/build_environment/patches/ispc.diff

@@ -1,6 +1,43 @@
-diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
---- ispc-1.17.0.org/CMakeLists.txt	2022-01-15 01:35:15 -0700
-+++ ispc-1.17.0/CMakeLists.txt	2022-02-12 12:44:24 -0700
+diff -Naur external_ispc/CMakeLists.txt external_ispc_fixed/CMakeLists.txt
+--- external_ispc/CMakeLists.txt	2020-04-23 17:29:06 -0600
++++ external_ispc_fixed/CMakeLists.txt	2020-05-05 09:01:09 -0600
+@@ -389,7 +389,7 @@
+ 
+ # Link against Clang libraries
+ foreach(clangLib ${CLANG_LIBRARY_LIST})
+-    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
++    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIR})
+     list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+ endforeach()
+ target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
+diff -Naur orig/CMakeLists.txt external_ispc/CMakeLists.txt
+--- orig/CMakeLists.txt 2020-05-05 09:19:11 -0600
++++ external_ispc/CMakeLists.txt        2020-05-05 09:26:44 -0600
+@@ -333,7 +333,7 @@
+
+ # Include directories
+ target_include_directories(${PROJECT_NAME} PRIVATE
+-                           ${LLVM_INCLUDE_DIRS}
++                           ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}
+                            ${GENX_DEPS_DIR}/include
+                            ${CMAKE_CURRENT_SOURCE_DIR}/src
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+diff -Naur orig/cmake/GenerateBuiltins.cmake.txt external_ispc/cmake/GenerateBuiltins.cmake.txt
++++ orig/cmake/GenerateBuiltins.cmake	2020-05-25 13:32:40.830803821 +0200
++++ external_ispc/cmake/GenerateBuiltins.cmake	2020-05-25 13:32:40.830803821 +0200
+@@ -97,6 +97,8 @@
+ 
+     if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86")
+         set(target_arch "i686")
++        # Blender: disable 32bit due to build issues on Linux and being unnecessary.
++        set(SKIP ON)
+     elseif ("${bit}" STREQUAL "64" AND ${arch} STREQUAL "x86")
+         set(target_arch "x86_64")
+     elseif ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "arm")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46a8db8..f53beef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -36,8 +36,12 @@
  cmake_minimum_required(VERSION 3.13)
  
@@ -16,25 +53,7 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
  endif()
  
  set(PROJECT_NAME ispc)
-@@ -443,7 +447,7 @@
- 
- # Include directories
- target_include_directories(${PROJECT_NAME} PRIVATE
--                           ${LLVM_INCLUDE_DIRS}
-+                           ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}
-                            ${XE_DEPS_DIR}/include
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
-@@ -507,7 +511,7 @@
- 
- # Link against Clang libraries
- foreach(clangLib ${CLANG_LIBRARY_LIST})
--    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
-+    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIR})
-     list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
- endforeach()
- target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
-@@ -546,6 +550,29 @@
+@@ -412,6 +416,29 @@ else()
      endif()
  endif()
  
@@ -64,15 +83,3 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
  # Build target for utility checking host ISA
  if (ISPC_INCLUDE_UTILS)
      add_executable(check_isa "")
-diff -Naur ispc-1.17.0.org/cmake/GenerateBuiltins.cmake ispc-1.17.0/cmake/GenerateBuiltins.cmake
---- ispc-1.17.0.org/cmake/GenerateBuiltins.cmake	2022-01-15 01:35:15 -0700
-+++ ispc-1.17.0/cmake/GenerateBuiltins.cmake	2022-02-12 12:44:24 -0700
-@@ -124,6 +124,8 @@
- 
-     if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86")
-         set(target_arch "i686")
-+        # Blender: disable 32bit due to build issues on Linux and being unnecessary.
-+        set(SKIP ON)
-     elseif ("${bit}" STREQUAL "64" AND ${arch} STREQUAL "x86")
-         set(target_arch "x86_64")
-     elseif ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "arm")

build_files/build_environment/patches/level-zero.diff

@@ -1,13 +0,0 @@
-diff -Naur external_levelzero_org/CMakeLists.txt external_levelzero/CMakeLists.txt
---- external_levelzero_org/CMakeLists.txt       2022-03-07 13:22:11 -0700
-+++ external_levelzero/CMakeLists.txt   2022-03-29 13:22:15 -0600
-@@ -77,9 +77,6 @@
-     #enabling Control Flow Guard
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
--    # enable Spectre Mitigation
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
- endif()
-
- #CXX compiler support

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) {

build_files/build_environment/patches/openvdb.diff

@@ -1,16 +1,35 @@
-diff -ur openvdb-9.0.0/cmake/FindTBB.cmake openvdb/cmake/FindTBB.cmake
---- openvdb-9.0.0/cmake/FindTBB.cmake	2021-10-30 03:55:40.000000000 +0100
-+++ openvdb/cmake/FindTBB.cmake	2022-03-31 11:33:15.592329750 +0100
-@@ -252,7 +252,8 @@
-       set(_TBB_LIB_NAME "${_TBB_LIB_NAME}${TBB_DEBUG_SUFFIX}")
-     endif()
- 
--    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE} ${_TBB_LIB_NAME}
-+    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE}
-+      NAMES ${_TBB_LIB_NAME} ${_TBB_LIB_NAME}_static
-       ${_FIND_TBB_ADDITIONAL_OPTIONS}
-       PATHS ${_TBB_LIBRARYDIR_SEARCH_DIRS}
-       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib64 lib
+diff -Naur openvdb-8.0.0/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
+--- openvdb-8.0.0/cmake/FindIlmBase.cmake	2020-12-24 10:13:14 -0700
++++ openvdb/cmake/FindIlmBase.cmake	2021-02-05 12:07:49 -0700
+@@ -217,6 +217,12 @@
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+   endif()
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_IlmBase_Version_Suffix}.lib")
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s.lib"
++  )
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s_d.lib"
++  )
+ else()
+   if(ILMBASE_USE_STATIC_LIBS)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+diff -Naur openvdb-8.0.0/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
+--- openvdb-8.0.0/cmake/FindOpenEXR.cmake	2020-12-24 10:13:14 -0700
++++ openvdb/cmake/FindOpenEXR.cmake	2021-02-05 12:23:39 -0700
+@@ -210,6 +210,12 @@
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+   endif()
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_OpenEXR_Version_Suffix}.lib")
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s.lib"
++  )
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s_d.lib"
++  )
+ else()
+   if(OPENEXR_USE_STATIC_LIBS)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/CMakeLists.txt
 --- openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt	2020-12-24 10:13:14 -0700
 +++ openvdb/openvdb/openvdb/CMakeLists.txt	2021-02-05 11:18:33 -0700
@@ -99,321 +118,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) {
-

build_files/build_environment/patches/osl.diff

@@ -48,6 +48,25 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt
 
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 990f50d69..46ef7351d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+         FILE ${OSL_TARGETS_EXPORT_NAME}
+         NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++	osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+     include (packaging)
 diff -Naur external_osl_orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
 --- external_osl_orig/src/cmake/externalpackages.cmake  2021-06-01 13:44:18 -0600
 +++ external_osl/src/cmake/externalpackages.cmake       2021-06-28 07:44:32 -0600

build_files/build_environment/patches/python_windows.diff

@@ -1,24 +0,0 @@
-diff -Naur orig/PCbuild/get_externals.bat Python-3.10.2/PCbuild/get_externals.bat
---- orig/PCbuild/get_externals.bat      2022-01-13 11:52:14 -0700
-+++ Python-3.10.2/PCbuild/get_externals.bat     2022-08-17 11:24:42 -0600
-@@ -51,7 +51,7 @@
- echo.Fetching external libraries...
-
- set libraries=
--set libraries=%libraries%                                       bzip2-1.0.6
-+set libraries=%libraries%                                       bzip2-1.0.8
- if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
- if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1m
- set libraries=%libraries%                                       sqlite-3.35.5.0
- diff -Naur orig/PCbuild/python.props external_python/PCbuild/python.props
---- orig/PCbuild/python.props   2022-01-13 11:52:14 -0700
-+++ external_python/PCbuild/python.props        2022-08-17 11:38:38 -0600
-@@ -58,7 +58,7 @@
-     <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
-     <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
-     <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
--    <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
-+    <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
-     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
-     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>

build_files/build_environment/patches/usd.diff

@@ -10,22 +10,217 @@ diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defau
  add_definitions(${TBB_DEFINITIONS})
  
  # --math
-
-diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
---- usd_orig/cmake/defaults/msvcdefaults.cmake	2022-02-18 14:49:09 -0700
-+++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-03-14 11:41:50 -0600
-@@ -120,9 +120,6 @@
- # for all translation units.
- set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
+diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros/Public.cmake
+--- external_usd_base/cmake/macros/Public.cmake	2019-10-24 14:39:53 -0600
++++ external_usd/cmake/macros/Public.cmake	2020-01-11 13:33:29 -0700
+@@ -996,6 +996,12 @@
+     foreach(lib ${PXR_OBJECT_LIBS})
+         string(TOUPPER ${lib} uppercaseName)
+         list(APPEND exports "${uppercaseName}_EXPORTS=1")
++        # When building for blender, we do NOT want to export all symbols on windows.
++        # This is a dirty hack, but USD makes it impossible to do the right thing
++        # with the default options exposed.
++        if (WIN32)
++            list(APPEND exports "PXR_STATIC=1")
++        endif()
+     endforeach()
+     foreach(lib ${PXR_OBJECT_LIBS})
+         set(objects "${objects};\$<TARGET_OBJECTS:${lib}>")
+diff -ru USD-20.11/pxr/base/tf/pxrLZ4/lz4.cpp external_usd/pxr/base/tf/pxrLZ4/lz4.cpp
+--- USD-20.11/pxr/base/tf/pxrLZ4/lz4.cpp        2020-10-14 19:25:19.000000000 +0100
++++ external_usd/pxr/base/tf/pxrLZ4/lz4.cpp     2021-02-09 09:28:51.496190085 +0000
+@@ -614,6 +614,15 @@
+ /*-************************************
+ *  Internal Definitions used in Tests
+ **************************************/
++
++/*******************************************************************
++ * Disabled in Blender. The BLOSC library also exposes these
++ * functions, and this causes 'duplicate symbol' linker errors.
++ *
++ * This problem has been reported upstream at
++ * https://github.com/PixarAnimationStudios/USD/issues/1447
++ *
++ *******************************************************************
+ #if defined (__cplusplus)
+ extern "C" {
+ #endif
+@@ -627,6 +636,7 @@
+ #if defined (__cplusplus)
+ }
+ #endif
++********************************************************************/
  
--# Enable PDB generation.
--set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zi")
--
- # Enable multiprocessor builds.
- set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
- set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")
+ /*-******************************
+ *  Compression functions
+
+From 442d087962f762deeb8b6e49a0955753fcf9aeb9 Mon Sep 17 00:00:00 2001
+From: Tsahi Zidenberg <tsahee@amazon.com>
+Date: Sun, 15 Nov 2020 15:18:24 +0000
+Subject: [PATCH 1/2] stackTrace: support aarch64/linux
+
+stacktrace calls syscall directly via assembler. Create compatible
+aarch64 code.
+---
+ pxr/base/arch/stackTrace.cpp | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/pxr/base/arch/stackTrace.cpp b/pxr/base/arch/stackTrace.cpp
+index dcc1dfd46..c11aabeb1 100644
+--- a/pxr/base/arch/stackTrace.cpp
++++ b/pxr/base/arch/stackTrace.cpp
+@@ -583,7 +583,6 @@ nonLockingLinux__execve (const char *file,
+                          char *const argv[],
+                          char *const envp[])
+ {
+-#if defined(ARCH_BITS_64)
+     /*
+      * We make a direct system call here, because we can't find an
+      * execve which corresponds with the non-locking fork we call
+@@ -594,7 +593,27 @@ nonLockingLinux__execve (const char *file,
+      * hangs in a threaded app.  (We use the non-locking fork to get
+      * around problems with forking when we have had memory
+      * corruption.)  whew.
+-     *
++     */
++
++    unsigned long result;
++
++#if defined (__aarch64__)
++    {
++        register long __file_result asm ("x0") = (long)file;
++        register char* const* __argv asm ("x1") = argv;
++        register char* const* __envp asm ("x2") = envp;
++        register long __num_execve asm ("x8") = 221;
++        __asm__ __volatile__ (
++            "svc 0"
++            : "=r" (__file_result)
++            : "r"(__num_execve), "r" (__file_result), "r" (__argv), "r" (__envp)
++            : "memory"
++        );
++        result = __file_result;
++    }
++#elif defined(ARCH_CPU_INTEL) && defined(ARCH_BITS_64)
++
++    /*
+      * %rdi, %rsi, %rdx, %rcx, %r8, %r9 are args 0-5
+      * syscall clobbers %rcx and %r11
+      *
+@@ -603,7 +622,6 @@ nonLockingLinux__execve (const char *file,
+      * constraints to gcc.
+      */
+ 
+-    unsigned long result;
+     __asm__ __volatile__ (
+         "mov    %0, %%rdi    \n\t"
+         "mov    %%rcx, %%rsi \n\t"
+@@ -614,6 +632,9 @@ nonLockingLinux__execve (const char *file,
+         : "0" (file), "c" (argv), "d" (envp)
+         : "memory", "cc", "r11"
+     );
++#else
++#error Unknown architecture
++#endif
+ 
+     if (result >= 0xfffffffffffff000) {
+         errno = -result;
+@@ -621,9 +642,6 @@ nonLockingLinux__execve (const char *file,
+     }
+ 
+     return result;
+-#else
+-#error Unknown architecture
+-#endif
+ }
+ 
+ #endif
+
+From a1dffe02519bb3c6ccbbe8c6c58304da5db98995 Mon Sep 17 00:00:00 2001
+From: Tsahi Zidenberg <tsahee@amazon.com>
+Date: Sun, 15 Nov 2020 15:22:52 +0000
+Subject: [PATCH 2/2] timing: support aarch64/linux
+
+The aarch64 arch-timer is directly accessible to userspace via two
+registers:
+CNTVCT_EL0 - holds the current counter value
+CNTFRQ_EL0 - holds the counter frequency (in Hz)
+---
+ pxr/base/arch/timing.cpp | 6 ++++++
+ pxr/base/arch/timing.h   | 6 +++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/pxr/base/arch/timing.cpp b/pxr/base/arch/timing.cpp
+index 27ad58fed..9022950c1 100644
+--- a/pxr/base/arch/timing.cpp
++++ b/pxr/base/arch/timing.cpp
+@@ -59,6 +59,11 @@ ARCH_HIDDEN
+ void
+ Arch_InitTickTimer()
+ {
++#ifdef __aarch64__
++    uint64_t counter_hz;
++    __asm __volatile("mrs	%0, CNTFRQ_EL0" : "=&r" (counter_hz));
++    Arch_NanosecondsPerTick = double(1e9) / double(counter_hz);
++#else
+     // NOTE: Normally ifstream would be cleaner, but it causes crashes when
+     //       used in conjunction with DSOs and the Intel Compiler.
+     FILE *in;
+@@ -135,6 +140,7 @@ Arch_InitTickTimer()
+     }
+ 
+     Arch_NanosecondsPerTick = double(1e9) / double(cpuHz);
++#endif
+ }
+ #elif defined(ARCH_OS_WINDOWS)
+ 
+diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/arch/timing.h
++++ b/pxr/base/arch/timing.h
+@@ -36,7 +36,7 @@
+ /// \addtogroup group_arch_SystemFunctions
+ ///@{
+ 
+-#if defined(ARCH_OS_LINUX)
++#if defined(ARCH_OS_LINUX) && defined(ARCH_CPU_INTEL)
+ #include <x86intrin.h>
+ #elif defined(ARCH_OS_DARWIN)
+ #include <mach/mach_time.h>
+@@ -69,6 +69,10 @@ ArchGetTickTime()
+ #elif defined(ARCH_CPU_INTEL)
+     // On Intel we'll use the rdtsc instruction.
+     return __rdtsc();
++#elif defined (__aarch64__)
++    uint64_t result;
++    __asm __volatile("mrs	%0, CNTVCT_EL0" : "=&r" (result));
++    return result;
+ #else
+ #error Unknown architecture.
+ #endif
+
+diff --git a/pxr/base/arch/demangle.cpp b/pxr/base/arch/demangle.cpp
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/arch/demangle.cpp
++++ b/pxr/base/arch/demangle.cpp
+@@ -36,6 +36,7 @@
+ #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \
+     ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG)
+ #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG
++#include <cxxabi.h>
+ #endif
+ 
+ PXR_NAMESPACE_OPEN_SCOPE
+@@ -138,7 +139,6 @@
+ #endif
+ 
+ #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG)
+-#include <cxxabi.h>
+ 
+ /*
+  * This routine doesn't work when you get to gcc3.4.
 
 diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
+index 67ec0d15f..6dc3e85a0 100644
 --- a/pxr/base/work/singularTask.h
 +++ b/pxr/base/work/singularTask.h
 @@ -120,7 +120,7 @@
@@ -37,66 +232,3 @@ diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
                      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.

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="

build_files/build_environment/windows/build_deps.cmd

@@ -46,18 +46,6 @@ if "%3" == "debug" set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=Off
 set dobuild=1
 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
-  goto exit
-)
-
 set SOURCE_DIR=%~dp0\..
 set BUILD_DIR=%cd%\build
 set HARVEST_DIR=%BUILD_DIR%\output
@@ -110,8 +98,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 /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 +111,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 /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
 )

build_files/cmake/Modules/FindEpoxy.cmake

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

build_files/cmake/Modules/FindGLEW.cmake

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

build_files/cmake/Modules/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
-)

build_files/cmake/Modules/FindLibEpoxy.cmake

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

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -85,9 +85,9 @@ STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENE
 IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
   SET(_openexr_FIND_COMPONENTS
     Iex
+    IlmThread
     OpenEXR
     OpenEXRCore
-    IlmThread
   )
 ELSE()
   SET(_openexr_FIND_COMPONENTS

build_files/cmake/Modules/FindOpenGLES.cmake

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

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -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

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
-)

build_files/cmake/Modules/FindUSD.cmake

@@ -32,12 +32,9 @@ FIND_PATH(USD_INCLUDE_DIR
   DOC "Universal Scene Description (USD) header files"
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
-# See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
 FIND_LIBRARY(USD_LIBRARY
   NAMES
-    usd_usd_m usd_usd_ms usd_m usd_ms
-    ${PXR_LIB_PREFIX}usd
+    usd_m usd_ms
   NAMES_PER_DIR
   HINTS
     ${_usd_SEARCH_DIRS}
@@ -64,7 +61,6 @@ ENDIF()
 MARK_AS_ADVANCED(
   USD_INCLUDE_DIR
   USD_LIBRARY_DIR
-  USD_LIBRARY
 )
 
 UNSET(_usd_SEARCH_DIRS)

build_files/cmake/Modules/FindWebP.cmake

@@ -1,82 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# - Find WebP library
-# Find the native WebP includes and library
-# This module defines
-#  WEBP_INCLUDE_DIRS, where to find WebP headers, Set when WebP is found.
-#  WEBP_LIBRARIES, libraries to link against to use WebP.
-#  WEBP_ROOT_DIR, The base directory to search for WebP.
-#                 This can also be an environment variable.
-#  WEBP_FOUND, If false, do not try to use WebP.
-#
-# also defined, but not for general use are
-#  WEBP_LIBRARY, where to find the WEBP library.
-
-# If WEBP_ROOT_DIR was defined in the environment, use it.
-IF(NOT WEBP_ROOT_DIR AND NOT $ENV{WEBP_ROOT_DIR} STREQUAL "")
-  SET(WEBP_ROOT_DIR $ENV{WEBP_ROOT_DIR})
-ENDIF()
-
-SET(_webp_SEARCH_DIRS
-  ${WEBP_ROOT_DIR}
-  /opt/lib/webp
-)
-
-FIND_PATH(WEBP_INCLUDE_DIR
-  NAMES
-    webp/types.h
-  HINTS
-    ${_webp_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_webp_FIND_COMPONENTS
-  webp
-  webpmux
-  webpdemux
-)
-
-SET(_webp_LIBRARIES)
-FOREACH(COMPONENT ${_webp_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(WEBP_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    NAMES_PER_DIR
-    HINTS
-      ${_webp_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib lib/static
-    )
-  LIST(APPEND _webp_LIBRARIES "${WEBP_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-IF(${WEBP_WEBP_LIBRARY_NOTFOUND})
-  set(WEBP_FOUND FALSE)
-ELSE()
-  # handle the QUIETLY and REQUIRED arguments and set WEBP_FOUND to TRUE if
-  # all listed variables are TRUE
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WebP DEFAULT_MSG _webp_LIBRARIES WEBP_INCLUDE_DIR)
-
-  IF(WEBP_FOUND)
-    get_filename_component(WEBP_LIBRARY_DIR ${WEBP_WEBP_LIBRARY} DIRECTORY)
-    SET(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
-    SET(WEBP_LIBRARIES ${_webp_LIBRARIES})
-  ELSE()
-    SET(WEBPL_PUGIXML_FOUND FALSE)
-  ENDIF()
-ENDIF()
-
-MARK_AS_ADVANCED(
-  WEBP_INCLUDE_DIR
-  WEBP_LIBRARY_DIR
-
-  # Generated names.
-  WEBP_WEBPDEMUX_LIBRARY
-  WEBP_WEBPMUX_LIBRARY
-  WEBP_WEBP_LIBRARY
-)

build_files/cmake/clang_array_check.py

@@ -202,9 +202,9 @@ def parm_size(node_child):
 
     # NOT PERFECT CODE, EXTRACT SIZE FROM TOKENS
     if len(tokens) >= 3:  # foo [ 1 ]
-        if ((tokens[-3].kind == TokenKind.PUNCTUATION and tokens[-3].spelling == "[") and
-            (tokens[-2].kind == TokenKind.LITERAL and tokens[-2].spelling.isdigit()) and
-                (tokens[-1].kind == TokenKind.PUNCTUATION and tokens[-1].spelling == "]")):
+        if      ((tokens[-3].kind == TokenKind.PUNCTUATION and tokens[-3].spelling == "[") and
+                 (tokens[-2].kind == TokenKind.LITERAL and tokens[-2].spelling.isdigit()) and
+                 (tokens[-1].kind == TokenKind.PUNCTUATION and tokens[-1].spelling == "]")):
             # ---
             return int(tokens[-2].spelling)
     return -1

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

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

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

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

build_files/cmake/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",

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",

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",

build_files/cmake/config/blender_full.cmake

@@ -13,7 +13,7 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
@@ -30,7 +30,6 @@ set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -18,7 +18,7 @@ set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      OFF CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
@@ -34,13 +34,8 @@ set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
-set(WITH_IO_STL              OFF CACHE BOOL "" FORCE)
-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)

build_files/cmake/config/blender_release.cmake

@@ -14,7 +14,7 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
@@ -31,7 +31,6 @@ set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
@@ -70,7 +69,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,6 +85,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)
-  set(WITH_CYCLES_ONEAPI_BINARIES ON  CACHE BOOL "" FORCE)
 endif()

build_files/cmake/have_features.cmake

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

build_files/cmake/macros.cmake

@@ -879,7 +879,7 @@ function(delayed_install
   destination)
 
   foreach(f ${files})
-    if(IS_ABSOLUTE ${f} OR "${base}" STREQUAL "")
+    if(IS_ABSOLUTE ${f})
       set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${f})
     else()
       set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})

build_files/cmake/packaging.cmake

@@ -106,8 +106,8 @@ if(WIN32)
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
 endif()
 
-set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender")
-set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender")
+set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "blender")
+set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "blender")
 
 include(CPack)
 

build_files/cmake/platform/platform_apple.cmake

@@ -21,18 +21,6 @@ function(print_found_status
   endif()
 endfunction()
 
-# Utility to install precompiled shared libraries.
-macro(add_bundled_libraries library)
-  if(EXISTS ${LIBDIR})
-    set(_library_dir ${LIBDIR}/${library}/lib)
-    file(GLOB _all_library_versions ${_library_dir}/*\.dylib*)
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
-    unset(_all_library_versions)
-    unset(_library_dir)
- endif()
-endmacro()
-
 # ------------------------------------------------------------------------
 # Find system provided libraries.
 
@@ -83,7 +71,6 @@ set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
 # Find precompiled libraries, and avoid system or user-installed ones.
 
 if(EXISTS ${LIBDIR})
-  include(platform_old_libs_update)
   without_system_libs_begin()
 endif()
 
@@ -174,9 +161,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()
 
@@ -230,17 +214,9 @@ 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")
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-find_package(Epoxy REQUIRED)
-
 set(PNG_ROOT ${LIBDIR}/png)
 find_package(PNG REQUIRED)
 
@@ -256,15 +232,6 @@ if(WITH_IMAGE_TIFF)
   endif()
 endif()
 
-if(WITH_IMAGE_WEBP)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  find_package(WebP)
-  if(NOT WEBP_FOUND)
-    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
-    set(WITH_IMAGE_WEBP OFF)
-  endif()
-endif()
-
 if(WITH_BOOST)
   set(Boost_NO_BOOST_CMAKE ON)
   set(BOOST_ROOT ${LIBDIR}/boost)
@@ -427,7 +394,6 @@ if(WITH_OPENMP)
     set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
     set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
     set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
-    add_bundled_libraries(openmp)
   endif()
 endif()
 
@@ -486,9 +452,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++")
@@ -517,27 +482,17 @@ if(WITH_COMPILER_CCACHE)
   endif()
 endif()
 
-if(WITH_COMPILER_ASAN)
-  list(APPEND PLATFORM_BUNDLED_LIBRARIES ${COMPILER_ASAN_LIBRARY})
-endif()
+# For binaries that are built but not installed (also not distributed) (datatoc,
+# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
+# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
+#
+# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
+# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
 
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the location where install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  if(WITH_PYTHON_MODULE)
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/lib")
-  else()
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/lib")
-  endif()
-
-  # For binaries that are built but not installed (like makesdan or tests), we add
-  # the original directory of all shared libraries to the rpath. This is needed because
-  # these can be in different folders, and because the build and install folder may be
-  # different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH ${PLATFORM_BUNDLED_LIBRARY_DIRS})
-endif()
+set(CMAKE_SKIP_INSTALL_RPATH FALSE)
+list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")
 
 # Same as `CFBundleIdentifier` in Info.plist.
 set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.blenderfoundation.blender")

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -1,46 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
-
-# Auto update existing CMake caches for new libraries
-
-function(unset_cache_variables pattern)
-  get_cmake_property(_cache_variables CACHE_VARIABLES)
-  foreach (_cache_variable ${_cache_variables})
-    if("${_cache_variable}" MATCHES "${pattern}")
-      unset(${_cache_variable} CACHE)
-    endif()
-  endforeach()
-endfunction()
-
-# Detect update from 3.1 to 3.2 libs.
-if(UNIX AND
-   DEFINED OPENEXR_VERSION AND
-   OPENEXR_VERSION VERSION_LESS "3.0.0" AND
-   EXISTS ${LIBDIR}/imath)
-  message(STATUS "Auto updating CMake configuration for Blender 3.2 libraries")
-
-  unset_cache_variables("^OPENIMAGEIO")
-  unset_cache_variables("^OPENEXR")
-  unset_cache_variables("^IMATH")
-  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.
-if(EXISTS ${LIBDIR}/webp)
-  if(WITH_OPENIMAGEIO)
-    set(WITH_IMAGE_WEBP ON CACHE BOOL "" FORCE)
-  endif()
-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()

build_files/cmake/platform/platform_unix.cmake

@@ -38,22 +38,13 @@ 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.
   set(CMAKE_PREFIX_PATH ${LIBDIR}/zlib ${LIB_SUBDIRS})
-
-  include(platform_old_libs_update)
-
   set(WITH_STATIC_LIBS ON)
   # OpenMP usually can't be statically linked into shared libraries,
   # due to not being compiled with position independent code.
@@ -81,15 +72,6 @@ macro(find_package_wrapper)
   endif()
 endmacro()
 
-# Utility to install precompiled shared libraries.
-macro(add_bundled_libraries library)
-  if(EXISTS ${LIBDIR})
-    file(GLOB _all_library_versions ${LIBDIR}/${library}/lib/*\.so*)
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    unset(_all_library_versions)
- endif()
-endmacro()
-
 # ----------------------------------------------------------------------------
 # Precompiled Libraries
 #
@@ -104,19 +86,6 @@ find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
-find_package_wrapper(Epoxy REQUIRED)
-
-function(check_freetype_for_brotli)
-  include(CheckSymbolExists)
-  set(CMAKE_REQUIRED_INCLUDES ${FREETYPE_INCLUDE_DIRS})
-  check_symbol_exists(FT_CONFIG_OPTION_USE_BROTLI "freetype/config/ftconfig.h" HAVE_BROTLI)
-  unset(CMAKE_REQUIRED_INCLUDES)
-  if(NOT HAVE_BROTLI)
-    unset(HAVE_BROTLI CACHE)
-    message(FATAL_ERROR "Freetype needs to be compiled with brotli support!")
-  endif()
-  unset(HAVE_BROTLI CACHE)
-endfunction()
 
 if(NOT WITH_SYSTEM_FREETYPE)
   # FreeType compiled with Brotli compression for woff2.
@@ -132,7 +101,6 @@ if(NOT WITH_SYSTEM_FREETYPE)
     #   ${BROTLI_LIBRARIES}
     # )
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_PYTHON)
@@ -225,9 +193,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})
@@ -303,18 +268,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)
@@ -415,15 +368,6 @@ if(WITH_PUGIXML)
   endif()
 endif()
 
-if(WITH_IMAGE_WEBP)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  find_package_wrapper(WebP)
-  if(NOT WEBP_FOUND)
-    set(WITH_IMAGE_WEBP OFF)
-    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
-  endif()
-endif()
-
 if(WITH_OPENIMAGEIO)
   find_package_wrapper(OpenImageIO)
   set(OPENIMAGEIO_LIBRARIES
@@ -442,9 +386,6 @@ if(WITH_OPENIMAGEIO)
   if(WITH_IMAGE_OPENEXR)
     list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
   endif()
-  if(WITH_IMAGE_WEBP)
-    list(APPEND OPENIMAGEIO_LIBRARIES "${WEBP_LIBRARIES}")
-  endif()
 
   if(NOT OPENIMAGEIO_FOUND)
     set(WITH_OPENIMAGEIO OFF)
@@ -610,7 +551,6 @@ if(WITH_SYSTEM_FREETYPE)
   if(NOT FREETYPE_FOUND)
     message(FATAL_ERROR "Failed finding system FreeType version!")
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_LZO AND WITH_SYSTEM_LZO)
@@ -653,93 +593,22 @@ endif()
 
 if(WITH_GHOST_WAYLAND)
   find_package(PkgConfig)
-  pkg_check_modules(wayland-client wayland-client>=1.12)
-  pkg_check_modules(wayland-egl wayland-egl)
-  pkg_check_modules(wayland-scanner wayland-scanner)
-  pkg_check_modules(xkbcommon xkbcommon)
-  pkg_check_modules(wayland-cursor wayland-cursor)
-  pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
+  pkg_check_modules(wayland-client REQUIRED wayland-client>=1.12)
+  pkg_check_modules(wayland-egl REQUIRED wayland-egl)
+  pkg_check_modules(wayland-scanner REQUIRED wayland-scanner)
+  pkg_check_modules(xkbcommon REQUIRED xkbcommon)
+  pkg_check_modules(wayland-cursor REQUIRED wayland-cursor)
+  pkg_check_modules(dbus REQUIRED dbus-1)
 
-  if(${wayland-protocols_FOUND})
-    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-  else()
-    # CentOS 7 packages have too old a version, a newer version exist in the
-    # precompiled libraries.
-    find_path(WAYLAND_PROTOCOLS_DIR
-      NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-      PATH_SUFFIXES share/wayland-protocols
-      PATHS ${LIBDIR}/wayland-protocols
-    )
+  set(WITH_GL_EGL ON)
 
-    if(EXISTS ${WAYLAND_PROTOCOLS_DIR})
-      set(wayland-protocols_FOUND ON)
-    endif()
-  endif()
-
-  if (NOT ${wayland-client_FOUND})
-    message(STATUS "wayland-client not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-egl_FOUND})
-    message(STATUS "wayland-egl not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-scanner_FOUND})
-    message(STATUS "wayland-scanner not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-cursor_FOUND})
-    message(STATUS "wayland-cursor not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-protocols_FOUND})
-    message(STATUS "wayland-protocols not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${xkbcommon_FOUND})
-    message(STATUS "xkbcommon not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-
-  if(WITH_GHOST_WAYLAND)
-    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()
-
-    list(APPEND PLATFORM_LINKLIBS
-      ${xkbcommon_LINK_LIBRARIES}
-    )
-
-    if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
-      list(APPEND PLATFORM_LINKLIBS
-        ${wayland-client_LINK_LIBRARIES}
-        ${wayland-egl_LINK_LIBRARIES}
-        ${wayland-cursor_LINK_LIBRARIES}
-      )
-    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()
-
-    pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-  endif()
+  list(APPEND PLATFORM_LINKLIBS
+    ${wayland-client_LINK_LIBRARIES}
+    ${wayland-egl_LINK_LIBRARIES}
+    ${xkbcommon_LINK_LIBRARIES}
+    ${wayland-cursor_LINK_LIBRARIES}
+    ${dbus_LINK_LIBRARIES}
+  )
 endif()
 
 if(WITH_GHOST_X11)
@@ -859,8 +728,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
           "The mold linker could not find the directory containing the linker command "
           "(typically "
           "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
-          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker."
-        )
+          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
         set(WITH_LINKER_MOLD OFF)
       endif()
       unset(MOLD_PREFIX)
@@ -959,9 +827,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
@@ -999,8 +866,7 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
       int main(int argc, char **argv) {
         std::atomic<uint64_t> uint64; uint64++;
         return 0;
-      }"
-  )
+      }")
 
   include(CheckCXXSourceCompiles)
   check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITHOUT_LIBATOMIC)
@@ -1012,7 +878,6 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
 
     set(CMAKE_REQUIRED_LIBRARIES atomic)
     check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC)
-    unset(CMAKE_REQUIRED_LIBRARIES)
 
     if(ATOMIC_OPS_WITH_LIBATOMIC)
       set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE)
@@ -1026,16 +891,3 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
 endfunction()
 
 CONFIGURE_ATOMIC_LIB_IF_NEEDED()
-
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the relative path where the install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  list(APPEND CMAKE_INSTALL_RPATH $ORIGIN/lib)
-
-  # For executables that are built but not installed (mainly tests) we set an absolute
-  # rpath to the lib folder. This is needed because these can be in different folders,
-  # and because the build and install folder may be different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH $ORIGIN/lib ${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib)
-endif()

build_files/cmake/platform/platform_win32.cmake

@@ -39,12 +39,12 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(WITH_WINDOWS_STRIPPED_PDB OFF)
   endif()
 else()
-  if(WITH_BLENDER AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28.29921) # MSVC 2019 16.9.16
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28.29921) # MSVC 2019 16.9.16
     message(FATAL_ERROR "Compiler is unsupported, MSVC 2019 16.9.16 or newer is required for building blender.")
   endif()
 endif()
 
-if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE)
+if(NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
 
@@ -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)
@@ -146,7 +146,7 @@ endif()
 if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
   if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
     #set a flag so we don't have to do this comparison all the time
-    set(MSVC_ASAN ON)
+    SET(MSVC_ASAN ON)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
     set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /fsanitize=address")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
@@ -185,20 +185,20 @@ endif()
 
 
 if(WITH_WINDOWS_SCCACHE)
-  set(CMAKE_C_COMPILER_LAUNCHER sccache)
-  set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
-  set(SYMBOL_FORMAT /Z7)
-  set(SYMBOL_FORMAT_RELEASE /Z7)
-else()
-  unset(CMAKE_C_COMPILER_LAUNCHER)
-  unset(CMAKE_CXX_COMPILER_LAUNCHER)
-  if(MSVC_ASAN)
+    set(CMAKE_C_COMPILER_LAUNCHER sccache)
+    set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
     set(SYMBOL_FORMAT /Z7)
     set(SYMBOL_FORMAT_RELEASE /Z7)
-  else()
-    set(SYMBOL_FORMAT /ZI)
-    set(SYMBOL_FORMAT_RELEASE /Zi)
-  endif()
+else()
+    unset(CMAKE_C_COMPILER_LAUNCHER)
+    unset(CMAKE_CXX_COMPILER_LAUNCHER)
+    if(MSVC_ASAN)
+      set(SYMBOL_FORMAT /Z7)
+      set(SYMBOL_FORMAT_RELEASE /Z7)
+    else()
+      set(SYMBOL_FORMAT /ZI)
+      set(SYMBOL_FORMAT_RELEASE /Zi)
+    endif()
 endif()
 
 if(WITH_WINDOWS_PDB)
@@ -238,6 +238,7 @@ else()
 endif()
 
 if(NOT DEFINED LIBDIR)
+
   # Setup 64bit and 64bit windows systems
   if(CMAKE_CL_64)
     message(STATUS "64 bit compiler detected.")
@@ -251,9 +252,6 @@ if(NOT DEFINED LIBDIR)
   elseif(MSVC_VERSION GREATER 1919)
     message(STATUS "Visual Studio 2019 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
-  elseif(MSVC_VERSION GREATER 1909)
-    message(STATUS "Visual Studio 2017 detected.")
-    set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   endif()
 else()
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
@@ -262,8 +260,6 @@ if(NOT EXISTS "${LIBDIR}/")
   message(FATAL_ERROR "\n\nWindows requires pre-compiled libs at: '${LIBDIR}'. Please run `make update` in the blender source folder to obtain them.")
 endif()
 
-include(platform_old_libs_update)
-
 if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND # Only supported in the VS IDE
    MSVC_VERSION GREATER_EQUAL 1924            AND # Supported for 16.4+
    WITH_CLANG_TIDY                                # And Clang Tidy needs to be on
@@ -304,8 +300,9 @@ set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
 set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
 set(ZLIB_DIR ${LIBDIR}/zlib)
 
-windows_find_package(ZLIB) # we want to find before finding things that depend on it like png
-windows_find_package(PNG)
+windows_find_package(zlib) # we want to find before finding things that depend on it like png
+windows_find_package(png)
+
 if(NOT PNG_FOUND)
   warn_hardcoded_paths(libpng)
   set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
@@ -316,20 +313,13 @@ if(NOT PNG_FOUND)
 endif()
 
 set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
-windows_find_package(JPEG REQUIRED)
+windows_find_package(jpeg REQUIRED)
 if(NOT JPEG_FOUND)
-  warn_hardcoded_paths(libjpeg)
+  warn_hardcoded_paths(jpeg)
   set(JPEG_INCLUDE_DIR ${LIBDIR}/jpeg/include)
   set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-windows_find_package(Epoxy REQUIRED)
-if(NOT EPOXY_FOUND)
-  set(Epoxy_INCLUDE_DIRS ${LIBDIR}/epoxy/include)
-  set(Epoxy_LIBRARIES ${LIBDIR}/epoxy/lib/epoxy.lib)
-endif()
-
 set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
 set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib)
 
@@ -343,7 +333,7 @@ set(FREETYPE_LIBRARIES
   ${LIBDIR}/brotli/lib/brotlidec-static.lib
   ${LIBDIR}/brotli/lib/brotlicommon-static.lib
 )
-windows_find_package(Freetype REQUIRED)
+windows_find_package(freetype REQUIRED)
 
 if(WITH_FFTW3)
   set(FFTW3 ${LIBDIR}/fftw3)
@@ -352,21 +342,6 @@ if(WITH_FFTW3)
   set(FFTW3_LIBPATH ${FFTW3}/lib)
 endif()
 
-if(WITH_IMAGE_WEBP)
-  windows_find_package(WebP)
-  if(NOT WEBP_FOUND)
-    if(EXISTS ${LIBDIR}/webp)
-      set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
-      set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-      set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
-      set(WEBP_FOUND ON)
-    else()
-      message(STATUS "WITH_IMAGE_WEBP is ON but WEBP libraries are not found, setting WITH_IMAGE_WEBP=OFF")
-      set(WITH_IMAGE_WEBP OFF)
-    endif()
-  endif()
-endif()
-
 if(WITH_OPENCOLLADA)
   set(OPENCOLLADA ${LIBDIR}/opencollada)
 
@@ -414,74 +389,41 @@ if(WITH_CODEC_FFMPEG)
     ${LIBDIR}/ffmpeg/include
     ${LIBDIR}/ffmpeg/include/msvc
   )
-  windows_find_package(FFmpeg)
-  if(NOT FFmpeg_FOUND)
-    warn_hardcoded_paths(FFmpeg)
+  windows_find_package(FFMPEG)
+  if(NOT FFMPEG_FOUND)
+    warn_hardcoded_paths(ffmpeg)
     set(FFMPEG_LIBRARIES
       ${LIBDIR}/ffmpeg/lib/avcodec.lib
       ${LIBDIR}/ffmpeg/lib/avformat.lib
       ${LIBDIR}/ffmpeg/lib/avdevice.lib
       ${LIBDIR}/ffmpeg/lib/avutil.lib
       ${LIBDIR}/ffmpeg/lib/swscale.lib
-    )
+      )
   endif()
 endif()
 
 if(WITH_IMAGE_OPENEXR)
-  # Imath and OpenEXR have a single combined build option and include and library variables
-  # used by the rest of the build system.
-  set(IMATH_ROOT_DIR ${LIBDIR}/imath)
-  set(IMATH_VERSION "3.14")
-  windows_find_package(IMATH REQUIRED)
-  if(NOT IMATH_FOUND)
-    set(IMATH ${LIBDIR}/imath)
-    set(IMATH_INCLUDE_DIR ${IMATH}/include)
-    set(IMATH_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH}/include/Imath)
-    set(IMATH_LIBPATH ${IMATH}/lib)
-    set(IMATH_LIBRARIES
-      optimized ${IMATH_LIBPATH}/Imath_s.lib
-      debug ${IMATH_LIBPATH}/Imath_s_d.lib
-    )
-  endif()
   set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
-  set(OPENEXR_VERSION "3.14")
+  set(OPENEXR_VERSION "2.1")
   windows_find_package(OPENEXR REQUIRED)
-  if(NOT OpenEXR_FOUND)
+  if(NOT OPENEXR_FOUND)
     warn_hardcoded_paths(OpenEXR)
     set(OPENEXR ${LIBDIR}/openexr)
     set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR}/include/OpenEXR)
+    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
     set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-    # Check if the 3.x library name exists
-    # if not assume this is a 2.x library folder
-    if(EXISTS "${OPENEXR_LIBPATH}/OpenEXR_s.lib")
-      set(OPENEXR_LIBRARIES
-        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXR_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXRCore_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXRUtil_s.lib
-        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXR_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXRCore_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXRUtil_s_d.lib
-        ${IMATH_LIBRARIES}
-      )
-    else()
-      set(OPENEXR_LIBRARIES
-        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
-        optimized ${OPENEXR_LIBPATH}/Half_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
-        optimized ${OPENEXR_LIBPATH}/Imath_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
-        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
-        debug ${OPENEXR_LIBPATH}/Half_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
-        debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
-      )
-    endif()
+    set(OPENEXR_LIBRARIES
+      optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+      optimized ${OPENEXR_LIBPATH}/Half_s.lib
+      optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
+      optimized ${OPENEXR_LIBPATH}/Imath_s.lib
+      optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+      debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+      debug ${OPENEXR_LIBPATH}/Half_s_d.lib
+      debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
+      debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
+      debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+    )
   endif()
 endif()
 
@@ -547,14 +489,8 @@ if(WITH_BOOST)
     if(NOT BOOST_VERSION)
       message(FATAL_ERROR "Unable to determine Boost version")
     endif()
-    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib")
-    set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib")
-    if(NOT EXISTS ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX})
-      # If the new library names do not exist fall back to the old ones
-      # to ease the transition period between the libs.
-      set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
-      set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
-    endif()
+    set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
+    set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
     set(BOOST_LIBRARIES
       optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
       optimized ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_POSTFIX}
@@ -572,34 +508,30 @@ if(WITH_BOOST)
     if(WITH_CYCLES AND WITH_CYCLES_OSL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
         optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX}
-      )
+        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX})
     endif()
     if(WITH_INTERNATIONAL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
         optimized ${BOOST_LIBPATH}/libboost_locale-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX}
-      )
+        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX})
     endif()
   else() # we found boost using find_package
     set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
     set(BOOST_LIBRARIES ${Boost_LIBRARIES})
     set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
   endif()
-
   set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 endif()
 
 if(WITH_OPENIMAGEIO)
   windows_find_package(OpenImageIO)
-  if(NOT OpenImageIO_FOUND)
-    set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
-    set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-    set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
-    set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
-    set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-  endif()
+  set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
+  set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+  set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+  set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
+  set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
+  set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
+
   set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
   add_definitions(-DOIIO_STATIC_DEFINE)
@@ -633,49 +565,35 @@ if(WITH_LLVM)
 endif()
 
 if(WITH_OPENCOLORIO)
-  windows_find_package(OpenColorIO)
-  if(NOT OpenColorIO_FOUND)
-    set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
-    set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-    set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-    set(OPENCOLORIO_LIBRARIES
-      optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-      optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-      optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
-      optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
-      debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-      debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
-      debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
-      debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-    )
-  endif()
+  set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
+  set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+  set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+  set(OPENCOLORIO_LIBRARIES
+    optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+    optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
+    optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
+    optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
+    debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+    debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
+    debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
+    debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
+  )
   set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
 if(WITH_OPENVDB)
-  windows_find_package(OpenVDB)
-  if(NOT OpenVDB_FOUND)
-    set(OPENVDB ${LIBDIR}/openVDB)
-    set(OPENVDB_LIBPATH ${OPENVDB}/lib)
-    set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-    set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib )
-  endif()
+  set(OPENVDB ${LIBDIR}/openVDB)
+  set(OPENVDB_LIBPATH ${OPENVDB}/lib)
+  set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
+  set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib )
   set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
 endif()
 
 if(WITH_NANOVDB)
-  set(NANOVDB ${LIBDIR}/openvdb)
+  set(NANOVDB ${LIBDIR}/nanoVDB)
   set(NANOVDB_INCLUDE_DIR ${NANOVDB}/include)
-  if(NOT EXISTS "${NANOVDB_INCLUDE_DIR}/nanovdb")
-    # When not found, could be an older lib folder with where nanovdb
-    # had its own lib folder, to ease the transition period, fall back
-    # to that copy if the copy in openvdb is not found.
-    set(NANOVDB ${LIBDIR}/nanoVDB)
-    set(NANOVDB_INCLUDE_DIR ${NANOVDB}/include)
-  endif()
 endif()
 
-
 if(WITH_OPENIMAGEDENOISE)
   set(OPENIMAGEDENOISE ${LIBDIR}/OpenImageDenoise)
   set(OPENIMAGEDENOISE_LIBPATH ${LIBDIR}/OpenImageDenoise/lib)
@@ -686,8 +604,7 @@ if(WITH_OPENIMAGEDENOISE)
     optimized ${OPENIMAGEDENOISE_LIBPATH}/dnnl.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/common_d.lib
-    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib
-  )
+    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib)
   set(OPENIMAGEDENOISE_DEFINITIONS)
 endif()
 
@@ -702,34 +619,26 @@ endif()
 
 if(WITH_IMAGE_OPENJPEG)
   set(OPENJPEG ${LIBDIR}/openjpeg)
-  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.4)
-  if(NOT EXISTS "${OPENJPEG_INCLUDE_DIRS}")
-    # when not found, could be an older lib folder with openjpeg 2.3
-    # to ease the transition period, fall back if 2.4 is not found.
-    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
-  endif()
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
   set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
 endif()
 
 if(WITH_OPENSUBDIV)
+  set(OPENSUBDIV_INCLUDE_DIRS ${LIBDIR}/opensubdiv/include)
+  set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
+  set(OPENSUBDIV_LIBRARIES
+    optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
+    optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
+    debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
+    debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
+  )
+  set(OPENSUBDIV_HAS_OPENMP TRUE)
+  set(OPENSUBDIV_HAS_TBB FALSE)
+  set(OPENSUBDIV_HAS_OPENCL TRUE)
+  set(OPENSUBDIV_HAS_CUDA FALSE)
+  set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
+  set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
   windows_find_package(OpenSubdiv)
-  if(NOT OpenSubdiv_FOUND)
-    set(OPENSUBDIV ${LIBDIR}/opensubdiv)
-    set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV}/include)
-    set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
-    set(OPENSUBDIV_LIBRARIES
-      optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
-      optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
-      debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
-      debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
-    )
-    set(OPENSUBDIV_HAS_OPENMP TRUE)
-    set(OPENSUBDIV_HAS_TBB FALSE)
-    set(OPENSUBDIV_HAS_OPENCL TRUE)
-    set(OPENSUBDIV_HAS_CUDA FALSE)
-    set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
-    set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
-  endif()
 endif()
 
 if(WITH_SDL)
@@ -750,15 +659,12 @@ if(WITH_SYSTEM_AUDASPACE)
 endif()
 
 if(WITH_TBB)
-  windows_find_package(TBB)
-  if(NOT TBB_FOUND)
-    set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
-    set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
-    set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
-    if(WITH_TBB_MALLOC_PROXY)
-      set(TBB_MALLOC_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbbmalloc.lib debug ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib)
-      add_definitions(-DWITH_TBB_MALLOC)
-    endif()
+  set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
+  set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
+  set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
+  if(WITH_TBB_MALLOC_PROXY)
+    set(TBB_MALLOC_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbbmalloc.lib debug ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib)
+    add_definitions(-DWITH_TBB_MALLOC)
   endif()
 endif()
 
@@ -777,6 +683,7 @@ if(WITH_OPENAL)
   else()
     set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib)
   endif()
+
 endif()
 
 if(WITH_CODEC_SNDFILE)
@@ -821,7 +728,7 @@ endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   windows_find_package(Embree)
-  if(NOT Embree_FOUND)
+  if(NOT EMBREE_FOUND)
     set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
     set(EMBREE_LIBRARIES
       optimized ${LIBDIR}/embree/lib/embree3.lib
@@ -842,25 +749,18 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
       debug ${LIBDIR}/embree/lib/math_d.lib
       debug ${LIBDIR}/embree/lib/simd_d.lib
       debug ${LIBDIR}/embree/lib/sys_d.lib
-      debug ${LIBDIR}/embree/lib/tasking_d.lib
-    )
+      debug ${LIBDIR}/embree/lib/tasking_d.lib)
   endif()
 endif()
 
 if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
+    set(USD_FOUND ON)
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
-    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
-    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
+    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
+    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
     set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
-    # Older USD had different filenames, if the new ones are
-    # not found see if the older ones exist, to ease the
-    # transition period while landing libs.
-    if(NOT EXISTS "${USD_RELEASE_LIB}")
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
-    endif()
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
       optimized ${USD_RELEASE_LIB}
@@ -961,6 +861,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)

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