Add custom property support for assets

I didn't do this earlier because I was afraid it would make reading of asset
data (and asset data only!) difficult. Mainly because custom properties could
store pointers to other data, that would have to be read too then (e.g. an
object). But turns out, we can easily disable custom pointers to other
data-blocks, so reading stays simple :).

.clang-format

@@ -2,7 +2,7 @@
 # Configuration of clang-format
 # =============================
 #
-# Tested to work with versions: 8 to 11.
+# Tested to work with versions: 6 to 8.
 
 # This causes parameters on continuations to align to the opening brace.
 #
@@ -161,7 +161,6 @@ PenaltyBreakString: 1000000
 # "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
 ForEachMacros:
   - BEGIN_ANIMFILTER_SUBCHANNELS
-  - BKE_pbvh_vertex_iter_begin
   - BLI_FOREACH_SPARSE_RANGE
   - BLI_SMALLSTACK_ITER_BEGIN
   - BMO_ITER
@@ -255,6 +254,7 @@ ForEachMacros:
   - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
   - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
   - SEQ_ALL_BEGIN
+  - SEQ_CURRENT_BEGIN
   - SURFACE_QUAD_ITER_BEGIN
   - foreach
   - ED_screen_areas_iter
@@ -263,5 +263,8 @@ ForEachMacros:
   - MAP_SLOT_PROBING_BEGIN
   - VECTOR_SET_SLOT_PROBING_BEGIN
 
-StatementMacros:
-  - PyObject_VAR_HEAD
+# Use once we bump the minimum version to version 8.
+# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
+# StatementMacros:
+#   - PyObject_VAR_HEAD
+#   - STRINGIFY

.clang-tidy

@@ -34,14 +34,17 @@ Checks:  >
   modernize-*,
   -modernize-use-auto,
   -modernize-use-trailing-return-type,
+  -modernize-deprecated-headers,
   -modernize-avoid-c-arrays,
+  -modernize-use-equals-default,
   -modernize-use-nodiscard,
+  -modernize-use-using,
   -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-use-default-member-init,
+  -modernize-raw-string-literal,
+  -modernize-avoid-bind,
+  -modernize-use-override,
+  -modernize-use-transparent-functors,
 
-CheckOptions:
-  - key: modernize-use-default-member-init.UseAssignment
-    value: 1
+WarningsAsErrors: '*'

.git-blame-ignore-revs

@@ -10,9 +10,8 @@
 # Changes that belong here:
 # - Massive comment, doxy-sections, or spelling corrections.
 # - Clang-format, PEP8 or other automated changes which are *strictly* "no functional change".
-# - Several commits should be added to this list at once, because adding
-#   one extra commit (to edit this file) after every cleanup is noisy.
-# - No clang-tidy changes.
+# - Several smaller commits should be added to this list at once, because adding
+#   one extra commit (to edit this file) after every small cleanup is noisy.
 #
 # Note:
 # - The comment above the SHA should be the first line of the commit.
@@ -92,13 +91,3 @@ c42a6b77b52560d257279de2cb624b4ef2c0d24c
 
 # Cleanup: use doxy sections for imbuf
 c207f7c22e1439e0b285fba5d2c072bdae23f981
-
-# Cleanup: clang-format
-c4d8f6a4a8ddc29ed27311ed7578b3c8c31399d2
-b5d310b569e07a937798a2d38539cfd290149f1c
-8c846cccd6bdfd3e90a695fabbf05f53e5466a57
-4eac03d821fa17546f562485f7d073813a5e5943
-1166110a9d66af9c5a47cee2be591f50fdc445e8
-
-# Cleanup: clang-format.
-40d4a4cb1a6b4c3c2a486e8f2868f547530e0811

.gitignore

@@ -46,6 +46,3 @@ Desktop.ini
 
 # smoke simulation noise tile (generated)
 waveletNoiseTile.bin
-
-# testing environment
-/Testing

CMakeLists.txt

@@ -63,9 +63,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/platform")
 # avoid having empty buildtype
 if(NOT DEFINED CMAKE_BUILD_TYPE_INIT)
   set(CMAKE_BUILD_TYPE_INIT "Release")
-  # Internal logic caches this variable, avoid showing it by default
-  # since it's easy to accidentally set instead of the build type.
-  mark_as_advanced(CMAKE_BUILD_TYPE_INIT)
 endif()
 
 # Omit superfluous "Up-to-date" messages.
@@ -167,6 +164,10 @@ if(APPLE)
 endif()
 
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
+if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
+  # add_library OBJECT arg unsupported
+  set(WITH_BUILDINFO OFF)
+endif()
 set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date for reproducible builds (empty string disables this option)")
 set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time for reproducible builds (empty string disables this option)")
 set(CPACK_OVERRIDE_PACKAGENAME "" CACHE STRING "Use instead of the standard packagename (empty string disables this option)")
@@ -177,7 +178,6 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ON)
-option(WITH_PUGIXML       "Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)" ON)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
@@ -204,7 +204,6 @@ option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if
 option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF)
 mark_as_advanced(WITH_OPENVDB_3_ABI_COMPATIBLE)
 option(WITH_NANOVDB       "Enable usage of NanoVDB data structure for rendering on the GPU" ON)
-option(WITH_HARU          "Enable features relying on Libharu (Grease pencil PDF export)" ON)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -236,7 +235,9 @@ option(WITH_SYSTEM_AUDASPACE "Build with external audaspace library installed on
 mark_as_advanced(WITH_AUDASPACE)
 mark_as_advanced(WITH_SYSTEM_AUDASPACE)
 
-set_and_warn_dependency(WITH_AUDASPACE WITH_SYSTEM_AUDASPACE OFF)
+if(NOT WITH_AUDASPACE)
+  set(WITH_SYSTEM_AUDASPACE OFF)
+endif()
 
 option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
 if(UNIX AND NOT APPLE)
@@ -298,33 +299,15 @@ option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.or
 # Sound output
 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)
-else()
-  set(WITH_COREAUDIO OFF)
-endif()
 if(NOT WIN32)
   option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ON)
   if(UNIX AND NOT APPLE)
     option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
   endif()
-else()
-  set(WITH_JACK OFF)
 endif()
 if(UNIX AND NOT APPLE)
   option(WITH_SDL_DYNLOAD  "Enable runtime dynamic SDL libraries loading" OFF)
 endif()
-if(UNIX AND NOT APPLE)
-  option(WITH_PULSEAUDIO   "Enable PulseAudio for audio support on Linux" ON)
-  option(WITH_PULSEAUDIO_DYNLOAD  "Enable runtime dynamic PulseAudio libraries loading" OFF)
-else()
-  set(WITH_PULSEAUDIO OFF)
-endif()
-if(WIN32)
-  option(WITH_WASAPI      "Enable Windows Audio Sessions API for audio support on Windows" ON)
-else()
-  set(WITH_WASAPI OFF)
-endif()
 
 # Compression
 option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
@@ -363,21 +346,16 @@ if(UNIX AND NOT APPLE)
 endif()
 
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-
-if((WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) OR WITH_MOD_FLUID)
-  option(WITH_PYTHON_NUMPY "Include NumPy in Blender (used by Audaspace and Mantaflow)"  ON)
-endif()
-
 if(WIN32 OR APPLE)
   # Windows and macOS have this bundled with Python libraries.
-elseif(WITH_PYTHON_INSTALL OR WITH_PYTHON_NUMPY)
+elseif(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
   set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
   mark_as_advanced(PYTHON_NUMPY_PATH)
-  set(PYTHON_NUMPY_INCLUDE_DIRS    "" CACHE PATH "Path to the include directory of the NumPy module")
+  set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
   mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
 endif()
 if(WITH_PYTHON_INSTALL)
-  option(WITH_PYTHON_INSTALL_NUMPY "Copy system NumPy into the blender install folder"  ON)
+  option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
 
   if(UNIX AND NOT APPLE)
     option(WITH_PYTHON_INSTALL_REQUESTS "Copy system requests into the blender install folder" ON)
@@ -386,8 +364,8 @@ if(WITH_PYTHON_INSTALL)
   endif()
 endif()
 
-option(WITH_CPU_SIMD              "Enable SIMD instruction if they're detected on the host machine" ON)
-mark_as_advanced(WITH_CPU_SIMD)
+option(WITH_CPU_SSE              "Enable SIMD instruction if they're detected on the host machine" ON)
+mark_as_advanced(WITH_CPU_SSE)
 
 # Cycles
 option(WITH_CYCLES                  "Enable Cycles Render Engine" ON)
@@ -399,7 +377,6 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER   "Build cubins with nvrtc based compiler instead of nvcc" OFF)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
 mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified device types (CPU CUDA OPTIX OPENCL)" )
 set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
@@ -432,7 +409,6 @@ else()
   option(LLVM_STATIC                  "Link with LLVM static libraries" OFF)
 endif()
 mark_as_advanced(LLVM_STATIC)
-option(WITH_CLANG                   "Use Clang" OFF)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" ON)
@@ -449,8 +425,8 @@ mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" ON)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
-if((UNIX AND NOT APPLE) OR (CMAKE_GENERATOR MATCHES "^Visual Studio.+"))
-  option(WITH_CLANG_TIDY "Use Clang Tidy to analyze the source code (only enable for development on Linux using Clang, or Windows using the Visual Studio IDE)" OFF)
+if(UNIX AND NOT APPLE)
+  option(WITH_CLANG_TIDY "Use Clang Tidy to analyze the source code (only enable for development on Linux using Clang)" OFF)
   mark_as_advanced(WITH_CLANG_TIDY)
 endif()
 
@@ -520,10 +496,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
   mark_as_advanced(WITH_LINKER_LLD)
 endif()
 
-option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
-mark_as_advanced(WITH_COMPILER_ASAN)
-
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
+  mark_as_advanced(WITH_COMPILER_ASAN)
+
   if(WITH_COMPILER_ASAN)
     set(_asan_defaults "\
 -fsanitize=address \
@@ -627,12 +603,6 @@ if(WIN32)
 
 endif()
 
-if(UNIX)
-  # See WITH_WINDOWS_SCCACHE for Windows.
-  option(WITH_COMPILER_CCACHE "Use ccache to improve rebuild times (Works with Ninja, Makefiles and Xcode)" OFF)
-  mark_as_advanced(WITH_COMPILER_CCACHE)
-endif()
-
 # The following only works with the Ninja generator in CMake >= 3.0.
 if("${CMAKE_GENERATOR}" MATCHES "Ninja")
   option(WITH_NINJA_POOL_JOBS
@@ -687,11 +657,16 @@ if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
   )
 endif()
 
-set_and_warn_dependency(WITH_AUDASPACE WITH_OPENAL OFF)
-set_and_warn_dependency(WITH_AUDASPACE WITH_COREAUDIO OFF)
-set_and_warn_dependency(WITH_AUDASPACE WITH_JACK OFF)
-set_and_warn_dependency(WITH_AUDASPACE WITH_PULSEAUDIO OFF)
-set_and_warn_dependency(WITH_AUDASPACE WITH_WASAPI OFF)
+if(NOT WITH_AUDASPACE)
+  if(WITH_OPENAL)
+    message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled")
+    set(WITH_OPENAL OFF)
+  endif()
+  if(WITH_JACK)
+    message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled")
+    set(WITH_JACK OFF)
+  endif()
+endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
   message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
@@ -702,8 +677,10 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
   message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
-set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
-set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
+if(NOT WITH_PYTHON)
+  set(WITH_CYCLES OFF)
+  set(WITH_DRACO OFF)
+endif()
 
 if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
   message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
@@ -720,8 +697,6 @@ 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)
-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
    WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC))
@@ -738,12 +713,8 @@ set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
 # NanoVDB requires OpenVDB to convert the data structure
 set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB       OFF)
 
-# OpenVDB and OpenColorIO uses 'half' type from OpenEXR
+# OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
 set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF)
-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)
 
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
@@ -752,7 +723,6 @@ if(WITH_CYCLES)
   # auto enable llvm for cycles_osl
   if(WITH_CYCLES_OSL)
     set(WITH_LLVM ON CACHE BOOL "" FORCE)
-    set(WITH_CLANG ON CACHE BOOL "" FORCE)
   endif()
 else()
   set(WITH_CYCLES_OSL OFF)
@@ -775,7 +745,6 @@ if(WITH_INSTALL_PORTABLE)
 endif()
 
 if(WITH_GHOST_SDL OR WITH_HEADLESS)
-  message(STATUS "Disabling Ghost Wayland, X11, Input IME, and OpenXR")
   set(WITH_GHOST_WAYLAND OFF)
   set(WITH_GHOST_X11     OFF)
   set(WITH_X11_XINPUT    OFF)
@@ -787,6 +756,14 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
   set(WITH_XR_OPENXR     OFF)
 endif()
 
+if(WITH_CPU_SSE)
+  TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
+else()
+  message(STATUS "SSE and SSE2 optimizations are DISABLED!")
+  set(COMPILER_SSE_FLAG)
+  set(COMPILER_SSE2_FLAG)
+endif()
+
 if(WITH_BUILDINFO)
   find_package(Git)
   if(NOT GIT_FOUND)
@@ -806,7 +783,7 @@ endif()
 if(NOT WITH_CUDA_DYNLOAD)
   find_package(CUDA)
   if(NOT CUDA_FOUND)
-    message(STATUS "CUDA toolkit not found, using dynamic runtime loading of libraries (WITH_CUDA_DYNLOAD) instead")
+    message("CUDA toolkit not found, using dynamic runtime loading of libraries instead")
     set(WITH_CUDA_DYNLOAD ON)
   endif()
 endif()
@@ -835,8 +812,8 @@ if(WITH_PYTHON)
   # Do this before main 'platform_*' checks,
   # because UNIX will search for the old Python paths which may not exist.
   # giving errors about missing paths before this case is met.
-  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.9")
-    message(FATAL_ERROR "At least Python 3.9 is required to build")
+  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.7")
+    message(FATAL_ERROR "At least Python 3.7 is required to build")
   endif()
 
   file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")
@@ -898,11 +875,9 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
 
     if(APPLE AND COMPILER_ASAN_LIBRARY)
       string(REPLACE " " ";" _list_COMPILER_ASAN_CFLAGS ${COMPILER_ASAN_CFLAGS})
-      set(_is_CONFIG_DEBUG "$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>")
-      add_compile_options("$<${_is_CONFIG_DEBUG}:${_list_COMPILER_ASAN_CFLAGS}>")
-      add_link_options("$<${_is_CONFIG_DEBUG}:-fno-omit-frame-pointer;-fsanitize=address>")
+      add_compile_options("$<$<NOT:$<CONFIG:Release>>:${_list_COMPILER_ASAN_CFLAGS}>")
+      add_link_options("$<$<NOT:$<CONFIG:Release>>:-fno-omit-frame-pointer;-fsanitize=address>")
       unset(_list_COMPILER_ASAN_CFLAGS)
-      unset(_is_CONFIG_DEBUG)
     elseif(COMPILER_ASAN_LIBRARY)
       set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
       set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
@@ -911,18 +886,6 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
   endif()
 endif()
 
-# Test SIMD support, before platform includes to determine if sse2neon is needed.
-if(WITH_CPU_SIMD)
-  set(COMPILER_SSE_FLAG)
-  set(COMPILER_SSE2_FLAG)
-
-  # Test Neon first since macOS Arm can compile and run x86-64 SSE binaries.
-  TEST_NEON_SUPPORT()
-  if(NOT SUPPORT_NEON_BUILD)
-    TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
-  endif()
-endif()
-
 # ----------------------------------------------------------------------------
 # Main Platform Checks
 #
@@ -978,49 +941,22 @@ if(WITH_INTERNATIONAL)
   endif()
 endif()
 
-# Enable SIMD support if detected by TEST_SSE_SUPPORT() or TEST_NEON_SUPPORT().
-#
-# This is done globally, so that all modules can use it if available, and
-# because these are used in headers used by many modules.
-if(WITH_CPU_SIMD)
-  if(SUPPORT_NEON_BUILD)
-    # Neon
-    if(SSE2NEON_FOUND)
-      blender_include_dirs_sys("${SSE2NEON_INCLUDE_DIRS}")
-      add_definitions(-DWITH_SSE2NEON)
-    endif()
-  else()
-    # SSE
-    if(SUPPORT_SSE_BUILD)
-      string(PREPEND PLATFORM_CFLAGS "${COMPILER_SSE_FLAG} ")
-      add_definitions(-D__SSE__ -D__MMX__)
-    endif()
-    if(SUPPORT_SSE2_BUILD)
-      string(APPEND PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG}")
-      add_definitions(-D__SSE2__)
-      if(NOT SUPPORT_SSE_BUILD) # don't double up
-        add_definitions(-D__MMX__)
-      endif()
-    endif()
-  endif()
+# See TEST_SSE_SUPPORT() for how this is defined.
 
-  # Print instructions used
-  if(SUPPORT_NEON_BUILD)
-    if(SSE2NEON_FOUND)
-      message(STATUS "Neon SIMD instructions enabled")
-    else()
-      message(STATUS "Neon SIMD instructions detected but unused, requires sse2neon")
-    endif()
-  elseif(SUPPORT_SSE2_BUILD)
-    message(STATUS "SSE2 SIMD instructions enabled")
-  elseif(SUPPORT_SSE_BUILD)
-    message(STATUS "SSE SIMD instructions enabled")
-  else()
-    message(STATUS "No SIMD instructions detected")
-  endif()
-else()
-  message(STATUS "SIMD instructions disabled")
+# Do it globally, SSE2 is required for quite some time now.
+# Doing it now allows to use SSE/SSE2 in inline headers.
+if(SUPPORT_SSE_BUILD)
+  string(PREPEND PLATFORM_CFLAGS "${COMPILER_SSE_FLAG} ")
+  add_definitions(-D__SSE__ -D__MMX__)
 endif()
+if(SUPPORT_SSE2_BUILD)
+  string(APPEND PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG}")
+  add_definitions(-D__SSE2__)
+  if(NOT SUPPORT_SSE_BUILD) # don't double up
+    add_definitions(-D__MMX__)
+  endif()
+endif()
+
 
 # set the endian define
 if(MSVC)
@@ -1066,9 +1002,6 @@ if(WITH_OPENVDB)
     list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE)
   endif()
 
-  # OpenVDB headers use deprecated TBB headers, silence warning.
-  list(APPEND OPENVDB_DEFINITIONS -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
-
   list(APPEND OPENVDB_INCLUDE_DIRS
     ${BOOST_INCLUDE_DIR}
     ${TBB_INCLUDE_DIRS}
@@ -1231,8 +1164,6 @@ if(WITH_OPENMP)
     if(NOT WITH_OPENMP_STATIC)
       string(APPEND CMAKE_C_FLAGS " ${OpenMP_C_FLAGS}")
       string(APPEND CMAKE_CXX_FLAGS " ${OpenMP_CXX_FLAGS}")
-      string(APPEND CMAKE_EXE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
     else()
       # Typically avoid adding flags as defines but we can't
       # pass OpenMP flags to the linker for static builds, meaning
@@ -1243,7 +1174,6 @@ if(WITH_OPENMP)
       find_library_static(OpenMP_LIBRARIES gomp ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
     endif()
   else()
-    message(STATUS "OpenMP not found, disabling WITH_OPENMP")
     set(WITH_OPENMP OFF)
   endif()
 
@@ -1319,7 +1249,6 @@ list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
 if(WITH_BULLET AND WITH_SYSTEM_BULLET)
   find_package(Bullet)
   if(NOT BULLET_FOUND)
-    message(STATUS "Bullet not found, disabling WITH_BULLET")
     set(WITH_BULLET OFF)
   endif()
 else()
@@ -1488,7 +1417,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
   # gcc 4.2 gives annoying warnings on every file with this
   if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
     ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized)
-    ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized)
   endif()
 
   # versions before gcc4.6 give many BLI_math warnings
@@ -1526,7 +1454,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_RESTRICT -Wrestrict)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE  -Wno-suggest-override)
 
   # gcc 4.2 gives annoying warnings on every file with this
   if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1554,13 +1481,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT                  -Wno-format)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH                  -Wno-switch)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE         -Wno-unused-variable)
-  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE         -Wno-uninitialized)
 
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS     -Wno-class-memaccess)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT             -Wno-comment)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS     -Wno-unused-local-typedefs)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE     -Wno-unused-variable)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_VARIABLE     -Wno-uninitialized)
 
   if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
     ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
@@ -1590,8 +1515,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL  -Wno-overloaded-virtual)  # we get a lot of these, if its a problem a dev needs to look into it.
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE        -Wno-sign-compare)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF    -Wno-invalid-offsetof)
-  # Apple Clang (tested on version 12) doesn't support this flag while LLVM Clang 11 does.
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE    -Wno-suggest-override)
 
   # gives too many unfixable warnings
   # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
@@ -1692,16 +1615,19 @@ if(WITH_PYTHON)
 
   if(WIN32 OR APPLE)
     # Windows and macOS have this bundled with Python libraries.
-  elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR WITH_PYTHON_NUMPY)
+  elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
     if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
-      find_python_package(numpy "core/include")
+      find_python_package(numpy)
+      unset(PYTHON_NUMPY_INCLUDE_DIRS CACHE)
+      set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
+      mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
     endif()
   endif()
 
   if(WIN32 OR APPLE)
     # pass, we have this in lib/python/site-packages
   elseif(WITH_PYTHON_INSTALL_REQUESTS)
-    find_python_package(requests "")
+    find_python_package(requests)
   endif()
 endif()
 
@@ -1824,20 +1750,8 @@ if(WITH_BLENDER)
   # internal and external library information first, for test linking
   add_subdirectory(source)
 elseif(WITH_CYCLES_STANDALONE)
-  add_subdirectory(intern/glew-mx)
-  add_subdirectory(intern/guardedalloc)
-  add_subdirectory(intern/libc_compat)
-  add_subdirectory(intern/numaapi)
-  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)
-    endif()
-    add_subdirectory(extern/glog)
-  endif()
   if(WITH_CUDA_DYNLOAD)
     add_subdirectory(extern/cuew)
   endif()
@@ -1846,10 +1760,6 @@ elseif(WITH_CYCLES_STANDALONE)
   endif()
 endif()
 
-#-----------------------------------------------------------------------------
-# Testing
-add_subdirectory(tests)
-
 #-----------------------------------------------------------------------------
 # Blender Application
 if(WITH_BLENDER)
@@ -1857,6 +1767,11 @@ if(WITH_BLENDER)
 endif()
 
 
+#-----------------------------------------------------------------------------
+# Testing
+add_subdirectory(tests)
+
+
 #-----------------------------------------------------------------------------
 # Define 'heavy' submodules (for Ninja builder when using pools).
 setup_heavy_lib_pool()
@@ -1906,12 +1821,10 @@ if(FIRST_RUN)
   info_cfg_text("Build Options:")
   info_cfg_option(WITH_ALEMBIC)
   info_cfg_option(WITH_BULLET)
-  info_cfg_option(WITH_CLANG)
   info_cfg_option(WITH_CYCLES)
   info_cfg_option(WITH_FFTW3)
   info_cfg_option(WITH_FREESTYLE)
   info_cfg_option(WITH_GMP)
-  info_cfg_option(WITH_HARU)
   info_cfg_option(WITH_IK_ITASC)
   info_cfg_option(WITH_IK_SOLVER)
   info_cfg_option(WITH_INPUT_NDOF)
@@ -1920,8 +1833,6 @@ if(FIRST_RUN)
   info_cfg_option(WITH_OPENCOLORIO)
   info_cfg_option(WITH_OPENIMAGEDENOISE)
   info_cfg_option(WITH_OPENVDB)
-  info_cfg_option(WITH_POTRACE)
-  info_cfg_option(WITH_PUGIXML)
   info_cfg_option(WITH_QUADRIFLOW)
   info_cfg_option(WITH_TBB)
   info_cfg_option(WITH_USD)
@@ -1954,15 +1865,11 @@ if(FIRST_RUN)
   info_cfg_option(WITH_CODEC_AVI)
   info_cfg_option(WITH_CODEC_FFMPEG)
   info_cfg_option(WITH_CODEC_SNDFILE)
-  info_cfg_option(WITH_COREAUDIO)
   info_cfg_option(WITH_JACK)
   info_cfg_option(WITH_JACK_DYNLOAD)
   info_cfg_option(WITH_OPENAL)
-  info_cfg_option(WITH_PULSEAUDIO)
-  info_cfg_option(WITH_PULSEAUDIO_DYNLOAD)
   info_cfg_option(WITH_SDL)
   info_cfg_option(WITH_SDL_DYNLOAD)
-  info_cfg_option(WITH_WASAPI)
 
   info_cfg_text("Compression:")
   info_cfg_option(WITH_LZMA)

GNUmakefile

@@ -26,31 +26,25 @@
 
 define HELP_TEXT
 
-Blender Convenience Targets
+Convenience Targets
    Provided for building Blender, (multiple at once can be used).
 
    * debug:         Build a debug binary.
    * full:          Enable all supported dependencies & options.
    * lite:          Disable non essential features for a smaller binary and faster build.
-   * release:       Complete build with all options enabled including CUDA and Optix, matching the releases on blender.org
+   * release        Complete build with all options enabled including CUDA and Optix, matching the releases on blender.org
    * headless:      Build without an interface (renderfarm or server automation).
    * cycles:        Build Cycles standalone only, without Blender.
    * bpy:           Build as a python module which can be loaded from python directly.
+   * deps:          Build library dependencies (intended only for platform maintainers).
+
    * developer:     Enable faster builds, error checking and tests, recommended for developers.
+   * config:        Run cmake configuration tool to set build options.
    * ninja:         Use ninja build tool for faster builds.
-   * ccache:        Use ccache for faster rebuilds.
 
    Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
    Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
 
-Other Convenience Targets
-   Provided for other building operations.
-
-   * config:        Run cmake configuration tool to set build options.
-   * deps:          Build library dependencies (intended only for platform maintainers).
-
-                    The existance of locally build dependancies overrides the pre-built dependencies from subversion.
-                    These must be manually removed from '../lib/' to go back to using the pre-compiled libraries.
 
 Project Files
    Generate project files for development environments.
@@ -90,15 +84,12 @@ Static Source Code Checking
    * check_descriptions:    Check for duplicate/invalid descriptions.
 
 Spell Checkers
-   This runs the spell checker from the developer tools repositor.
 
    * check_spelling_c:      Check for spelling errors (C/C++ only),
    * check_spelling_osl:    Check for spelling errors (OSL only).
    * check_spelling_py:     Check for spelling errors (Python only).
 
-   Note: an additional word-list is maintained at: 'source/tools/check_source/check_spelling_c_config.py'
-
-   Note: that spell checkers can take a 'CHECK_SPELLING_CACHE' filepath argument,
+   Note that spell checkers can take a 'CHECK_SPELLING_CACHE' filepath argument,
    so re-running does not need to re-check unchanged files.
 
    Example:
@@ -128,16 +119,10 @@ Utilities
    * source_archive:
      Create a compressed archive of the source code.
 
-   * source_archive_complete:
-     Create a compressed archive of the source code and all the libraries of dependencies.
-
    * update:
-     Updates git and all submodules and svn.
+     updates git and all submodules
 
-   * update_code:
-     Updates git and all submodules but not svn.
-
-   * format:
+   * format
      Format source code using clang (uses PATHS if passed in). For example::
 
         make format PATHS="source/blender/blenlib source/blender/blenkernel"
@@ -197,13 +182,8 @@ endif
 ifndef DEPS_INSTALL_DIR
 	DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
 
-	# Add processor type to directory name, except for darwin x86_64
-	# which by convention does not have it.
-	ifeq ($(OS_NCASE),darwin)
-		ifneq ($(CPU),x86_64)
-			DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
-		endif
-	else
+	ifneq ($(OS_NCASE),darwin)
+		# Add processor type to directory name
 		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
 	endif
 endif
@@ -217,7 +197,7 @@ endif
 # in libraries, or python 2 for running make update to get it.
 ifeq ($(OS_NCASE),darwin)
 	ifeq (, $(shell command -v $(PYTHON)))
-		PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.7m
+		PYTHON:=../lib/darwin/python/bin/python3.7m
 		ifeq (, $(shell command -v $(PYTHON)))
 			PYTHON:=python
 		endif
@@ -261,10 +241,6 @@ ifneq "$(findstring developer, $(MAKECMDGOALS))" ""
 	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS)
 endif
 
-ifneq "$(findstring ccache, $(MAKECMDGOALS))" ""
-	CMAKE_CONFIG_ARGS:=-DWITH_COMPILER_CCACHE=YES $(CMAKE_CONFIG_ARGS)
-endif
-
 # -----------------------------------------------------------------------------
 # build tool
 
@@ -364,7 +340,6 @@ headless: all
 bpy: all
 developer: all
 ninja: all
-ccache: all
 
 # -----------------------------------------------------------------------------
 # Build dependencies
@@ -480,9 +455,6 @@ check_smatch: .FORCE
 	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
 
-check_mypy: .FORCE
-	$(PYTHON) "$(BLENDER_DIR)/source/tools/check_source/check_mypy.py"
-
 check_spelling_py: .FORCE
 	cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
@@ -515,14 +487,7 @@ check_descriptions: .FORCE
 #
 
 source_archive: .FORCE
-	python3 ./build_files/utils/make_source_archive.py
-
-source_archive_complete: .FORCE
-	cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-		-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
-# This assumes CMake is still using a default `PACKAGE_DIR` variable:
-	python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
-
+	./build_files/utils/make_source_archive.sh
 
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
@@ -538,9 +503,6 @@ icons_geom: .FORCE
 update: .FORCE
 	$(PYTHON) ./build_files/utils/make_update.py
 
-update_code: .FORCE
-	$(PYTHON) ./build_files/utils/make_update.py --no-libraries
-
 format: .FORCE
 	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)
@@ -552,7 +514,7 @@ format: .FORCE
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
+	ASAN_OPTIONS=halt_on_error=0 \
 	$(BLENDER_BIN) --background -noaudio --factory-startup \
 		--python doc/python_api/sphinx_doc_gen.py
 	sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out

build_files/build_environment/CMakeLists.txt

@@ -31,7 +31,6 @@
 #
 # MAC OS X USAGE:
 #   Install with homebrew: brew install autoconf automake bison cmake libtool pkg-config yasm
-#   Additional requirements for macOS arm64: brew install flex
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
@@ -47,7 +46,6 @@ include(ExternalProject)
 include(cmake/check_software.cmake)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
-include(cmake/download.cmake)
 
 if(ENABLE_MINGW64)
   include(cmake/setup_mingw64.cmake)
@@ -72,7 +70,9 @@ include(cmake/cuew.cmake)
 include(cmake/opensubdiv.cmake)
 include(cmake/sdl.cmake)
 include(cmake/opencollada.cmake)
+include(cmake/opencolorio.cmake)
 include(cmake/llvm.cmake)
+include(cmake/clang.cmake)
 if(APPLE)
   include(cmake/openmp.cmake)
 endif()
@@ -87,42 +87,39 @@ include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/nanovdb.cmake)
 include(cmake/python.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)
-else()
-  include(cmake/numpy.cmake)
-endif()
 include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
+include(cmake/numpy.cmake)
 include(cmake/usd.cmake)
 include(cmake/potrace.cmake)
-include(cmake/haru.cmake)
 # Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed.
 include(cmake/boost.cmake)
-include(cmake/pugixml.cmake)
-include(cmake/ispc.cmake)
-include(cmake/openimagedenoise.cmake)
-include(cmake/embree.cmake)
-include(cmake/xml2.cmake)
-
+if(UNIX)
+  # Rely on PugiXML compiled with OpenImageIO
+else()
+  include(cmake/pugixml.cmake)
+endif()
+if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
+  include(cmake/ispc.cmake)
+  include(cmake/openimagedenoise.cmake)
+  include(cmake/embree.cmake)
+endif()
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
 endif()
 
-# OpenColorIO and dependencies.
-include(cmake/expat.cmake)
-include(cmake/yamlcpp.cmake)
-include(cmake/opencolorio.cmake)
-
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  include(cmake/sse2neon.cmake)
-endif()
-
 if(WITH_WEBP)
   include(cmake/webp.cmake)
 endif()
 
+if(WIN32)
+  # OCIO deps
+  include(cmake/tinyxml.cmake)
+  include(cmake/yamlcpp.cmake)
+  # LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
+  # include(cmake/lcms.cmake)
+endif()
+
 if(NOT WIN32 OR ENABLE_MINGW64)
   include(cmake/gmp.cmake)
   include(cmake/openjpeg.cmake)
@@ -146,6 +143,7 @@ if(NOT WIN32 OR ENABLE_MINGW64)
     endif()
     if(UNIX)
       include(cmake/flac.cmake)
+      include(cmake/xml2.cmake)
       if(NOT APPLE)
         include(cmake/spnav.cmake)
         include(cmake/jemalloc.cmake)
@@ -168,4 +166,3 @@ if(UNIX AND NOT APPLE)
 endif()
 
 include(cmake/harvest.cmake)
-include(cmake/cve_check.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -19,6 +19,16 @@
 set(ALEMBIC_EXTRA_ARGS
   -DBUILDSTATIC=ON
   -DLINKSTATIC=ON
+  -DALEMBIC_LIB_USES_BOOST=ON
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DUSE_STATIC_BOOST=On
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBoost_DEBUG=ON
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=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}
@@ -44,9 +54,9 @@ set(ALEMBIC_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_alembic
-  URL file://${PACKAGE_DIR}/${ALEMBIC_FILE}
+  URL ${ALEMBIC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
+  URL_HASH MD5=${ALEMBIC_MD5}
   PREFIX ${BUILD_DIR}/alembic
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/alembic
@@ -71,6 +81,7 @@ endif()
 
 add_dependencies(
   external_alembic
+  external_boost
   external_zlib
   external_openexr
 )

build_files/build_environment/cmake/blosc.cmake

@@ -36,9 +36,9 @@ set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
 )
 
 ExternalProject_Add(external_blosc
-  URL file://${PACKAGE_DIR}/${BLOSC_FILE}
+  URL ${BLOSC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
+  URL_HASH MD5=${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}

build_files/build_environment/cmake/boost.cmake

@@ -23,7 +23,7 @@ if(WIN32)
   set(BOOST_COMPILER_STRING -vc141)
 
   set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
-  set(BOOST_BUILD_COMMAND b2)
+  set(BOOST_BUILD_COMMAND bjam)
   set(BOOST_BUILD_OPTIONS runtime-link=shared )
   set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
   if(BUILD_MODE STREQUAL Release)
@@ -86,9 +86,9 @@ set(BOOST_OPTIONS
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost
-  URL file://${PACKAGE_DIR}/${BOOST_FILE}
+  URL ${BOOST_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
+  URL_HASH MD5=${BOOST_HASH}
   PREFIX ${BUILD_DIR}/boost
   UPDATE_COMMAND  ""
   PATCH_COMMAND ${BOOST_PATCH_COMMAND}

build_files/build_environment/cmake/bzip2.cmake

@@ -30,9 +30,9 @@ else()
 endif()
 
 ExternalProject_Add(external_bzip2
-  URL file://${PACKAGE_DIR}/${BZIP2_FILE}
+  URL ${BZIP2_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BZIP2_HASH_TYPE}=${BZIP2_HASH}
+  URL_HASH SHA256=${BZIP2_HASH}
   PREFIX ${BUILD_DIR}/bzip2
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}

build_files/build_environment/cmake/check_software.cmake

@@ -33,16 +33,6 @@ if(UNIX)
     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)
@@ -52,13 +42,7 @@ if(UNIX)
   endforeach()
 
   if(APPLE)
-    # Homebrew has different default locations for ARM and Intel macOS.
-    if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-      set(HOMEBREW_LOCATION "/opt/homebrew")
-    else()
-      set(HOMEBREW_LOCATION "/usr/local")
-    endif()
-    if(NOT EXISTS "${HOMEBREW_LOCATION}/opt/bison/bin/bison")
+    if(NOT EXISTS "/usr/local/opt/bison/bin/bison")
       string(APPEND _software_missing " bison")
     endif()
   endif()
@@ -70,14 +54,11 @@ if(UNIX)
       "  ${_software_missing}\n"
       "\n"
       "On Debian and Ubuntu:\n"
-      "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
+      "  apt install autoconf automake libtool yasm tcl\n"
       "\n"
-      "On macOS Intel (with homebrew):\n"
+      "On macOS (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")
     message(FATAL_ERROR "Install missing software before continuing")

build_files/build_environment/cmake/clang.cmake

@@ -0,0 +1,74 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(CLANG_EXTRA_ARGS
+  -DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
+  -DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
+  -DLLVM_USE_CRT_RELEASE=MD
+  -DLLVM_USE_CRT_DEBUG=MDd
+  -DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
+)
+
+if(WIN32)
+  set(CLANG_GENERATOR "Ninja")
+else()
+  set(CLANG_GENERATOR "Unix Makefiles")
+endif()
+
+if(APPLE)
+  set(CLANG_EXTRA_ARGS ${CLANG_EXTRA_ARGS}
+    -DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
+  )
+endif()
+
+ExternalProject_Add(external_clang
+  URL ${CLANG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${CLANG_HASH}
+  PREFIX ${BUILD_DIR}/clang
+  CMAKE_GENERATOR ${CLANG_GENERATOR}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/clang
+)
+
+if(MSVC)
+  if(BUILD_MODE STREQUAL Release)
+    set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
+  else()
+    set(CLANG_HARVEST_COMMAND
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/
+    )
+  endif()
+  ExternalProject_Add_Step(external_clang after_install
+    COMMAND ${CLANG_HARVEST_COMMAND}
+    DEPENDEES mkdir update patch download configure build install
+  )
+endif()
+
+add_dependencies(
+  external_clang
+  ll
+)
+
+# We currently do not build libxml2 on Windows.
+if(NOT WIN32)
+  add_dependencies(
+    external_clang
+    external_xml2
+  )
+endif()

build_files/build_environment/cmake/clew.cmake

@@ -19,9 +19,9 @@
 set(CLEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_clew
-  URL file://${PACKAGE_DIR}/${CLEW_FILE}
+  URL ${CLEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${CLEW_HASH_TYPE}=${CLEW_HASH}
+  URL_HASH MD5=${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

@@ -19,9 +19,9 @@
 set(CUEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_cuew
-  URL file://${PACKAGE_DIR}/${CUEW_FILE}
+  URL ${CUEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${CUEW_HASH_TYPE}=${CUEW_HASH}
+  URL_HASH MD5=${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}

build_files/build_environment/cmake/cve_check.cmake

@@ -1,75 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# CVE Check requirements
-#
-# - A working installation of intels cve-bin-tool [1] has to be available in
-#   your path
-#
-# - Not strictly required, but highly recommended is obtaining a NVD key from
-#   nist since it significantly speeds up downloading/updating the required
-#   databases one can request a key on the following website:
-#   https://nvd.nist.gov/developers/request-an-api-key
-
-# Bill of Materials construction
-#
-# This constructs a CSV cve-bin-tool [1] can read and process. Sadly
-# cve-bin-tool at this point does not take a list of CPE's and output a check
-# based on that list. so we need to pick apart the CPE retrieve the vendor,
-# product and version tokens and generate a CSV.
-#
-# [1] https://github.com/intel/cve-bin-tool
-
-# Because not all deps are downloaded (ie python packages) but can still have a
-# xxx_CPE declared loop over all variables and look for variables ending in CPE.
-
-set(SBOMCONTENTS)
-get_cmake_property(_variableNames VARIABLES)
-foreach (_variableName ${_variableNames})
-  if(_variableName MATCHES "CPE$")
-      string(REPLACE ":" ";" CPE_LIST ${${_variableName}})
-      string(REPLACE "_CPE" "_ID" CPE_DEPNAME ${_variableName})
-      list(GET CPE_LIST 3 CPE_VENDOR)
-      list(GET CPE_LIST 4 CPE_NAME)
-      list(GET CPE_LIST 5 CPE_VERSION)
-      set(${CPE_DEPNAME} "${CPE_VENDOR},${CPE_NAME},${CPE_VERSION}")
-      set(SBOMCONTENTS "${SBOMCONTENTS}${CPE_VENDOR},${CPE_NAME},${CPE_VERSION},,,\n")
-  endif()
-endforeach()
-configure_file(${CMAKE_SOURCE_DIR}/cmake/cve_check.csv.in ${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv @ONLY)
-
-# Custom Targets
-#
-# This defines two new custom targets one could run in the build folder
-# `cve_check` which will output the report to the console, and `cve_check_html`
-# which will write out blender_dependencies.html in the build folder that one
-# could share with other people or be used to get more information on the
-# reported CVE's.
-#
-# cve-bin-tool takes data from the nist nvd database which rate limits
-# unauthenticated requests to 1 requests per 6 seconds making the database
-# download take "quite a bit" of time.
-#
-# When adding -DCVE_CHECK_NVD_KEY=your_api_key_here to your cmake invocation
-# this key will be passed on to cve-bin-tool speeding up the process.
-#
-if(DEFINED CVE_CHECK_NVD_KEY)
-  set(NVD_ARGS --nvd-api-key ${CVE_CHECK_NVD_KEY})
-endif()
-
-# This will just report to the console
-add_custom_target(cve_check
-  COMMAND cve-bin-tool
-    ${NVD_ARGS}
-    -i ${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv
-    --affected-versions
-  SOURCES ${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv
-)
-
-# This will write out blender_dependencies.html
-add_custom_target(cve_check_html
-  COMMAND cve-bin-tool
-    ${NVD_ARGS}
-    -i ${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv
-    -f html
-  SOURCES ${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv
-)

build_files/build_environment/cmake/cve_check.csv.in

@@ -1,29 +0,0 @@
-vendor,product,version,cve_number,remarks,comment
-@OPENJPEG_ID@,CVE-2016-9675,Ignored,issue in convert command line tool not used by blender
-@PYTHON_ID@,CVE-2009-2940,Ignored,issue in pygresql not used by blender
-@PYTHON_ID@,CVE-2020-29396,Ignored,issue in odoo not used by blender
-@PYTHON_ID@,CVE-2021-32052,Ignored,issue in django not used by blender
-@PYTHON_ID@,CVE-2009-3720,Ignored,already fixed in libexpat version used
-@SSL_ID@,CVE-2009-1390,Ignored,issue in mutt not used by blender
-@SSL_ID@,CVE-2009-3765,Ignored,issue in mutt not used by blender
-@SSL_ID@,CVE-2009-3766,Ignored,issue in mutt not used by blender
-@SSL_ID@,CVE-2009-3767,Ignored,issue in ldap not used by blender
-@SSL_ID@,CVE-2019-0190,Ignored,issue in apache not used by blender
-@TIFF_ID@,CVE-2022-2056,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2057,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2058,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2519,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2520,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2521,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-2953,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-34526,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3570,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3597,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3598,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3599,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3626,Ignored,issue in tiff command line tool not used by blender
-@TIFF_ID@,CVE-2022-3627,Ignored,issue in tiff command line tool not used by blender
-@XML2_ID@,CVE-2016-3709,Ignored,not affecting blender and not considered a security issue upstream
-@GMP_ID@,CVE-2021-43618,Mitigated,patched using upstream commit 561a9c25298e
-@SQLITE_ID@,CVE-2022-35737,Ignored,only affects SQLITE_ENABLE_STAT4 compile option not used by blender or python
-@SBOMCONTENTS@

build_files/build_environment/cmake/download.cmake

@@ -1,135 +0,0 @@
-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})
-  else()
-    set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
-  endif()
-  # Validate all required variables are set and give an explicit error message
-  # rather than CMake erroring out later on with a more ambigious error.
-  if (NOT DEFINED TARGET_FILE)
-    message(FATAL_ERROR "${dep}_FILE variable not set")
-  endif()
-  if (NOT DEFINED TARGET_HASH)
-    message(FATAL_ERROR "${dep}_HASH variable not set")
-  endif()
-  if (NOT DEFINED TARGET_HASH_TYPE)
-    message(FATAL_ERROR "${dep}_HASH_TYPE variable not set")
-  endif()
-  if (NOT DEFINED TARGET_URI)
-    message(FATAL_ERROR "${dep}_URI variable not set")
-  endif()
-  set(TARGET_FILE ${PACKAGE_DIR}/${TARGET_FILE})
-  message("Checking source : ${dep} (${TARGET_FILE})")
-  if(NOT EXISTS ${TARGET_FILE})
-    message("Checking source : ${dep} - source not found downloading from ${TARGET_URI}")
-    file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
-         TIMEOUT 1800  # seconds
-         EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
-         TLS_VERIFY ON
-         SHOW_PROGRESS
-        )
-  endif()
-  if(EXISTS ${TARGET_FILE})
-    # Sometimes the download fails, but that is not a
-    # fail condition for "file(DOWNLOAD" it will warn about
-    # a crc mismatch and just carry on, we need to explicitly
-    # catch this and remove the bogus 0 byte file so we can
-    # retry without having to go find the file and manually
-    # delete it.
-    file (SIZE ${TARGET_FILE} TARGET_SIZE)
-    if(${TARGET_SIZE} EQUAL 0)
-      file(REMOVE ${TARGET_FILE})
-      message(FATAL_ERROR "for ${TARGET_FILE} file size 0, download likely failed, deleted...")
-    endif()
-
-    # If we are using sources from the blender repo also
-    # validate that the hashes match, this takes a
-    # little more time, but protects us when we are
-    # building a release package and one of the packages
-    # is missing or incorrect.
-    #
-    # For regular platform maintenaince this is not needed
-    # since the actual build of the dep will notify the
-    # platform maintainer if there is a problem with the
-    # source package and refuse to build.
-    if(NOT PACKAGE_USE_UPSTREAM_SOURCES OR FORCE_CHECK_HASH)
-      file(${TARGET_HASH_TYPE} ${TARGET_FILE} LOCAL_HASH)
-      if(NOT ${TARGET_HASH} STREQUAL ${LOCAL_HASH})
-        message(FATAL_ERROR "${TARGET_FILE} ${TARGET_HASH_TYPE} mismatch\nExpected\t: ${TARGET_HASH}\nActual\t: ${LOCAL_HASH}")
-      endif()
-    endif()
-  endif()
-endfunction(download_source)
-
-download_source(ZLIB)
-download_source(OPENAL)
-download_source(PNG)
-download_source(JPEG)
-download_source(BOOST)
-download_source(BLOSC)
-download_source(PTHREADS)
-download_source(OPENEXR)
-download_source(FREETYPE)
-download_source(GLEW)
-download_source(FREEGLUT)
-download_source(ALEMBIC)
-download_source(GLFW)
-download_source(CLEW)
-download_source(GLFW)
-download_source(CUEW)
-download_source(OPENSUBDIV)
-download_source(SDL)
-download_source(OPENCOLLADA)
-download_source(OPENCOLORIO)
-download_source(LLVM)
-download_source(OPENMP)
-download_source(OPENIMAGEIO)
-download_source(TIFF)
-download_source(OSL)
-download_source(PYTHON)
-download_source(TBB)
-download_source(OPENVDB)
-download_source(NUMPY)
-download_source(LAME)
-download_source(OGG)
-download_source(VORBIS)
-download_source(THEORA)
-download_source(FLAC)
-download_source(VPX)
-download_source(OPUS)
-download_source(X264)
-download_source(XVIDCORE)
-download_source(OPENJPEG)
-download_source(FFMPEG)
-download_source(FFTW)
-download_source(ICONV)
-download_source(SNDFILE)
-if(WITH_WEBP)
-  download_source(WEBP)
-endif()
-download_source(SPNAV)
-download_source(JEMALLOC)
-download_source(XML2)
-download_source(YAMLCPP)
-download_source(EXPAT)
-download_source(PUGIXML)
-download_source(FLEXBISON)
-download_source(BZIP2)
-download_source(FFI)
-download_source(LZMA)
-download_source(SSL)
-download_source(SQLITE)
-download_source(EMBREE)
-download_source(USD)
-download_source(OIDN)
-download_source(LIBGLU)
-download_source(MESA)
-download_source(NASM)
-download_source(XR_OPENXR_SDK)
-download_source(ISPC)
-download_source(GMP)
-download_source(POTRACE)
-download_source(HARU)

build_files/build_environment/cmake/embree.cmake

@@ -29,7 +29,6 @@ set(EMBREE_EXTRA_ARGS
   -DEMBREE_MAX_ISA=AVX2
   -DEMBREE_TASKING_SYSTEM=TBB
   -DEMBREE_TBB_ROOT=${LIBDIR}/tbb
-  -DTBB_ROOT=${LIBDIR}/tbb
   -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
 )
 
@@ -47,26 +46,15 @@ else()
   set(EMBREE_BUILD_DIR)
 endif()
 
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  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()
+ExternalProject_Add(external_embree
+  URL ${EMBREE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${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
+)
 
 add_dependencies(
   external_embree

build_files/build_environment/cmake/ffi.cmake

@@ -17,8 +17,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ffi
-  URL file://${PACKAGE_DIR}/${FFI_FILE}
-  URL_HASH ${FFI_HASH_TYPE}=${FFI_HASH}
+  URL ${FFI_URI}
+  URL_HASH SHA256=${FFI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/ffi
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi

build_files/build_environment/cmake/ffmpeg.cmake

@@ -31,6 +31,12 @@ if(WIN32)
     --disable-pthreads
     --enable-libopenjpeg
   )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(FFMPEG_EXTRA_FLAGS
+      ${FFMPEG_EXTRA_FLAGS}
+      --x86asmexe=yasm
+    )
+  endif()
 else()
   set(FFMPEG_EXTRA_FLAGS
     ${FFMPEG_EXTRA_FLAGS}
@@ -54,9 +60,9 @@ elseif(UNIX)
 endif()
 
 ExternalProject_Add(external_ffmpeg
-  URL file://${PACKAGE_DIR}/${FFMPEG_FILE}
+  URL ${FFMPEG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FFMPEG_HASH_TYPE}=${FFMPEG_HASH}
+  URL_HASH MD5=${FFMPEG_HASH}
   # OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
   # want for maximum runtime performance, but due to static nature of that library we
   # need to force ffmpeg to link against pthread, otherwise test program used by autoconf

build_files/build_environment/cmake/fftw.cmake

@@ -28,9 +28,9 @@ else()
 endif()
 
 ExternalProject_Add(external_fftw3
-  URL file://${PACKAGE_DIR}/${FFTW_FILE}
+  URL ${FFTW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FFTW_HASH_TYPE}=${FFTW_HASH}
+  URL_HASH MD5=${FFTW_HASH}
   PREFIX ${BUILD_DIR}/fftw3
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} ${FFTW_EXTRA_ARGS} --prefix=${mingw_LIBDIR}/fftw3
   PATCH_COMMAND ${FFTW3_PATCH_COMMAND}

build_files/build_environment/cmake/flac.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_flac
-  URL file://${PACKAGE_DIR}/${FLAC_FILE}
+  URL ${FLAC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FLAC_HASH_TYPE}=${FLAC_HASH}
+  URL_HASH SHA256=${FLAC_HASH}
   PREFIX ${BUILD_DIR}/flac
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/flexbison.cmake

@@ -19,9 +19,9 @@
 set(FLEXBISON_EXTRA_ARGS)
 
 ExternalProject_Add(external_flexbison
-  URL file://${PACKAGE_DIR}/${FLEXBISON_FILE}
+  URL ${FLEXBISON_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FLEXBISON_HASH_TYPE}=${FLEXBISON_HASH}
+  URL_HASH MD5=${FLEXBISON_HASH}
   PREFIX ${BUILD_DIR}/flexbison
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
   CONFIGURE_COMMAND echo .

build_files/build_environment/cmake/freeglut.cmake

@@ -24,9 +24,9 @@ if(WIN32)
     )
 
     ExternalProject_Add(external_freeglut
-      URL file://${PACKAGE_DIR}/${FREEGLUT_FILE}
+      URL ${FREEGLUT_URI}
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH ${FREEGLUT_HASH_TYPE}=${FREEGLUT_HASH}
+      URL_HASH MD5=${FREEGLUT_HASH}
       PREFIX ${BUILD_DIR}/freeglut
       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
       INSTALL_DIR ${LIBDIR}/freeglut

build_files/build_environment/cmake/freetype.cmake

@@ -19,29 +19,23 @@
 set(FREETYPE_EXTRA_ARGS
   -DCMAKE_RELEASE_POSTFIX:STRING=2ST
   -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
-  -DFT_DISABLE_BZIP2=ON
-  -DFT_DISABLE_HARFBUZZ=ON
-  -DFT_DISABLE_PNG=ON
-  -DFT_REQUIRE_BROTLI=OFF
-  -DFT_REQUIRE_ZLIB=ON
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-  )
+  -DWITH_BZip2=OFF
+  -DWITH_HarfBuzz=OFF
+  -DFT_WITH_HARFBUZZ=OFF
+  -DFT_WITH_BZIP2=OFF
+  -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
+  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
+  -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)
 
 ExternalProject_Add(external_freetype
-  URL file://${PACKAGE_DIR}/${FREETYPE_FILE}
+  URL ${FREETYPE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FREETYPE_HASH_TYPE}=${FREETYPE_HASH}
+  URL_HASH MD5=${FREETYPE_HASH}
   PREFIX ${BUILD_DIR}/freetype
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/freetype
 )
 
-add_dependencies(
-  external_freetype
-  external_zlib
-)
-
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_freetype after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype

build_files/build_environment/cmake/glew.cmake

@@ -22,9 +22,9 @@ set(GLEW_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_glew
-  URL file://${PACKAGE_DIR}/${GLEW_FILE}
+  URL ${GLEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GLEW_HASH_TYPE}=${GLEW_HASH}
+  URL_HASH MD5=${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}

build_files/build_environment/cmake/glfw.cmake

@@ -19,9 +19,9 @@
 set(GLFW_EXTRA_ARGS)
 
 ExternalProject_Add(external_glfw
-  URL file://${PACKAGE_DIR}/${GLFW_FILE}
+  URL ${GLFW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GLFW_HASH_TYPE}=${GLFW_HASH}
+  URL_HASH MD5=${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/gmp.cmake

@@ -46,11 +46,10 @@ elseif(UNIX)
 endif()
 
 ExternalProject_Add(external_gmp
-  URL file://${PACKAGE_DIR}/${GMP_FILE}
+  URL ${GMP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
+  URL_HASH MD5=${GMP_HASH}
   PREFIX ${BUILD_DIR}/gmp
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/gmp/src/external_gmp < ${PATCH_DIR}/gmp.diff
   CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/gmp ${GMP_OPTIONS} ${GMP_EXTRA_ARGS}
   BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make install
@@ -85,9 +84,9 @@ if(WIN32)
   # given the C++ ABI between MSVC and mingw is not compatible, we need to build the bindings
   # with MSVC, while GMP can only be build with mingw.
   ExternalProject_Add(external_gmpxx
-    URL file://${PACKAGE_DIR}/${GMP_FILE}
+    URL ${GMP_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
+    URL_HASH MD5=${GMP_HASH}
     PREFIX ${BUILD_DIR}/gmpxx
     PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_gmpxx.txt ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
                           ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/config_gmpxx.h ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h

build_files/build_environment/cmake/haru.cmake

@@ -1,46 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(HARU_EXTRA_ARGS
-  -DLIBHPDF_SHARED=OFF
-  -DLIBHPDF_STATIC=ON
-  -DLIBHPDF_EXAMPLES=OFF
-  -DLIBHPDF_ENABLE_EXCEPTIONS=ON
-)
-
-ExternalProject_Add(external_haru
-  URL file://${PACKAGE_DIR}/${HARU_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${HARU_HASH_TYPE}=${HARU_HASH}
-  PREFIX ${BUILD_DIR}/haru
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/haru/src/external_haru < ${PATCH_DIR}/haru.diff
-  CMAKE_ARGS
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/haru
-    ${DEFAULT_CMAKE_FLAGS} ${HARU_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/haru
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_haru after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/haru/include ${HARVEST_TARGET}/haru/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/haru/lib/libhpdfs.lib ${HARVEST_TARGET}/haru/lib/libhpdfs.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/harvest.cmake

@@ -26,172 +26,165 @@ endif()
 message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    add_custom_target(Harvest_Release_Results
-      COMMAND # jpeg rename libfile + copy include
-          ${CMAKE_COMMAND} -E copy ${LIBDIR}/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()
 
-else()
+if(BUILD_MODE STREQUAL Release)
+  add_custom_target(Harvest_Release_Results
+    COMMAND # jpeg rename libfile + copy include
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+        # 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()
 
-  function(harvest from to)
-    set(pattern "")
-    foreach(f ${ARGN})
-      set(pattern ${f})
-    endforeach()
+else(WIN32)
 
-    if(pattern STREQUAL "")
-      get_filename_component(dirpath ${to} DIRECTORY)
-      get_filename_component(filename ${to} NAME)
-      install(
-        FILES ${LIBDIR}/${from}
-        DESTINATION ${HARVEST_TARGET}/${dirpath}
-        RENAME ${filename})
-    else()
-      install(
-        DIRECTORY ${LIBDIR}/${from}/
-        DESTINATION ${HARVEST_TARGET}/${to}
-        USE_SOURCE_PERMISSIONS
-        FILES_MATCHING PATTERN ${pattern}
-        PATTERN "pkgconfig" EXCLUDE
-        PATTERN "cmake" EXCLUDE
-        PATTERN "__pycache__" EXCLUDE
-        PATTERN "tests" EXCLUDE)
-    endif()
-  endfunction()
+function(harvest from to)
+  set(pattern "")
+  foreach(f ${ARGN})
+    set(pattern ${f})
+  endforeach()
 
-  harvest(alembic/include alembic/include "*.h")
-  harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-  harvest(alembic/bin alembic/bin "*")
-  harvest(boost/include boost/include "*")
-  harvest(boost/lib boost/lib "*.a")
-  harvest(ffmpeg/include ffmpeg/include "*.h")
-  harvest(ffmpeg/lib ffmpeg/lib "*.a")
-  harvest(fftw3/include fftw3/include "*.h")
-  harvest(fftw3/lib fftw3/lib "*.a")
-  harvest(flac/lib sndfile/lib "libFLAC.a")
-  harvest(freetype/include freetype/include "*.h")
-  harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
-  harvest(glew/include glew/include "*.h")
-  harvest(glew/lib glew/lib "*.a")
-  harvest(gmp/include gmp/include "*.h")
-  harvest(gmp/lib gmp/lib "*.a")
-  harvest(jemalloc/include jemalloc/include "*.h")
-  harvest(jemalloc/lib jemalloc/lib "*.a")
-  harvest(jpg/include jpeg/include "*.h")
-  harvest(jpg/lib jpeg/lib "libjpeg.a")
-  harvest(lame/lib ffmpeg/lib "*.a")
-  harvest(llvm/bin llvm/bin "clang-format")
-  if(BUILD_CLANG_TOOLS)
-    harvest(llvm/bin llvm/bin "clang-tidy")
-    harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
-  endif()
-  harvest(llvm/include llvm/include "*")
-  harvest(llvm/bin llvm/bin "llvm-config")
-  harvest(llvm/lib llvm/lib "libLLVM*.a")
-  harvest(llvm/lib llvm/lib "libclang*.a")
-  if(APPLE)
-    harvest(openmp/lib openmp/lib "*")
-    harvest(openmp/include openmp/include "*.h")
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      harvest(sse2neon sse2neon "*.h")
-    endif()
-  endif()
-  harvest(ogg/lib ffmpeg/lib "*.a")
-  harvest(openal/include openal/include "*.h")
-  if(UNIX AND NOT APPLE)
-    harvest(openal/lib openal/lib "*.a")
-
-    harvest(blosc/include blosc/include "*.h")
-    harvest(blosc/lib blosc/lib "*.a")
-
-    harvest(zlib/include zlib/include "*.h")
-    harvest(zlib/lib zlib/lib "*.a")
-
-    harvest(xml2/include xml2/include "*.h")
-    harvest(xml2/lib xml2/lib "*.a")
+  if(pattern STREQUAL "")
+    get_filename_component(dirpath ${to} DIRECTORY)
+    get_filename_component(filename ${to} NAME)
+    install(
+      FILES ${LIBDIR}/${from}
+      DESTINATION ${HARVEST_TARGET}/${dirpath}
+      RENAME ${filename})
   else()
-    harvest(blosc/lib openvdb/lib "*.a")
-    harvest(xml2/lib opencollada/lib "*.a")
+    install(
+      DIRECTORY ${LIBDIR}/${from}/
+      DESTINATION ${HARVEST_TARGET}/${to}
+      USE_SOURCE_PERMISSIONS
+      FILES_MATCHING PATTERN ${pattern}
+      PATTERN "pkgconfig" EXCLUDE
+      PATTERN "cmake" EXCLUDE
+      PATTERN "__pycache__" EXCLUDE
+      PATTERN "tests" EXCLUDE)
   endif()
-  harvest(opencollada/include/opencollada opencollada/include "*.h")
-  harvest(opencollada/lib/opencollada opencollada/lib "*.a")
-  harvest(opencolorio/include opencolorio/include "*.h")
-  harvest(opencolorio/lib opencolorio/lib "*.a")
-  harvest(opencolorio/lib/static opencolorio/lib "*.a")
-  harvest(openexr/include openexr/include "*.h")
-  harvest(openexr/lib openexr/lib "*.a")
-  harvest(openimageio/bin openimageio/bin "idiff")
-  harvest(openimageio/bin openimageio/bin "maketx")
-  harvest(openimageio/bin openimageio/bin "oiiotool")
-  harvest(openimageio/include openimageio/include "*")
-  harvest(openimageio/lib openimageio/lib "*.a")
+endfunction()
+
+harvest(alembic/include alembic/include "*.h")
+harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
+harvest(alembic/bin alembic/bin "*")
+harvest(boost/include boost/include "*")
+harvest(boost/lib boost/lib "*.a")
+harvest(ffmpeg/include ffmpeg/include "*.h")
+harvest(ffmpeg/lib ffmpeg/lib "*.a")
+harvest(fftw3/include fftw3/include "*.h")
+harvest(fftw3/lib fftw3/lib "*.a")
+harvest(flac/lib sndfile/lib "libFLAC.a")
+harvest(freetype/include freetype/include "*.h")
+harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
+harvest(glew/include glew/include "*.h")
+harvest(glew/lib glew/lib "*.a")
+harvest(gmp/include gmp/include "*.h")
+harvest(gmp/lib gmp/lib "*.a")
+harvest(jemalloc/include jemalloc/include "*.h")
+harvest(jemalloc/lib jemalloc/lib "*.a")
+harvest(jpg/include jpeg/include "*.h")
+harvest(jpg/lib jpeg/lib "libjpeg.a")
+harvest(lame/lib ffmpeg/lib "*.a")
+harvest(clang/bin llvm/bin "clang-format")
+harvest(clang/include llvm/include "*")
+harvest(llvm/include llvm/include "*")
+harvest(llvm/bin llvm/bin "llvm-config")
+harvest(llvm/lib llvm/lib "libLLVM*.a")
+if(APPLE)
+  harvest(openmp/lib openmp/lib "*")
+  harvest(openmp/include openmp/include "*.h")
+endif()
+harvest(ogg/lib ffmpeg/lib "*.a")
+harvest(openal/include openal/include "*.h")
+if(UNIX AND NOT APPLE)
+  harvest(openal/lib openal/lib "*.a")
+
+  harvest(blosc/include blosc/include "*.h")
+  harvest(blosc/lib blosc/lib "*.a")
+
+  harvest(zlib/include zlib/include "*.h")
+  harvest(zlib/lib zlib/lib "*.a")
+
+  harvest(xml2/include xml2/include "*.h")
+  harvest(xml2/lib xml2/lib "*.a")
+else()
+  harvest(blosc/lib openvdb/lib "*.a")
+  harvest(xml2/lib opencollada/lib "*.a")
+endif()
+harvest(opencollada/include/opencollada opencollada/include "*.h")
+harvest(opencollada/lib/opencollada opencollada/lib "*.a")
+harvest(opencolorio/include opencolorio/include "*.h")
+harvest(opencolorio/lib opencolorio/lib "*.a")
+harvest(opencolorio/lib/static opencolorio/lib "*.a")
+harvest(openexr/include openexr/include "*.h")
+harvest(openexr/lib openexr/lib "*.a")
+harvest(openimageio/bin openimageio/bin "idiff")
+harvest(openimageio/bin openimageio/bin "maketx")
+harvest(openimageio/bin openimageio/bin "oiiotool")
+harvest(openimageio/include openimageio/include "*")
+harvest(openimageio/lib openimageio/lib "*.a")
+if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   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-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/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")
-  harvest(osl/include osl/include "*.h")
-  harvest(osl/lib osl/lib "*.a")
-  harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
-  harvest(png/include png/include "*.h")
-  harvest(png/lib png/lib "*.a")
-  harvest(pugixml/include pugixml/include "*.hpp")
-  harvest(pugixml/lib pugixml/lib "*.a")
-  harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
-  harvest(python/include python/include "*h")
-  harvest(python/lib python/lib "*")
-  harvest(sdl/include/SDL2 sdl/include "*.h")
-  harvest(sdl/lib sdl/lib "libSDL2.a")
-  harvest(sndfile/include sndfile/include "*.h")
-  harvest(sndfile/lib sndfile/lib "*.a")
-  harvest(spnav/include spnav/include "*.h")
-  harvest(spnav/lib spnav/lib "*.a")
-  harvest(tbb/include tbb/include "*.h")
-  harvest(tbb/lib/libtbb_static.a tbb/lib/libtbb.a)
-  harvest(theora/lib ffmpeg/lib "*.a")
-  harvest(tiff/include tiff/include "*.h")
-  harvest(tiff/lib tiff/lib "*.a")
-  harvest(vorbis/lib ffmpeg/lib "*.a")
-  harvest(opus/lib ffmpeg/lib "*.a")
-  harvest(vpx/lib ffmpeg/lib "*.a")
-  harvest(webp/lib ffmpeg/lib "*.a")
-  harvest(x264/lib ffmpeg/lib "*.a")
-  harvest(xvidcore/lib ffmpeg/lib "*.a")
-  harvest(usd/include usd/include "*.h")
-  harvest(usd/lib/usd usd/lib/usd "*")
-  harvest(usd/plugin usd/plugin "*")
-  harvest(potrace/include potrace/include "*.h")
-  harvest(potrace/lib potrace/lib "*.a")
-  harvest(haru/include haru/include "*.h")
-  harvest(haru/lib haru/lib "*.a")
-
-  if(UNIX AND NOT APPLE)
-    harvest(libglu/lib mesa/lib "*.so*")
-    harvest(mesa/lib64 mesa/lib "*.so*")
-  endif()
+endif()
+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/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")
+harvest(osl/include osl/include "*.h")
+harvest(osl/lib osl/lib "*.a")
+harvest(osl/shaders osl/shaders "*.h")
+harvest(png/include png/include "*.h")
+harvest(png/lib png/lib "*.a")
+harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
+harvest(python/include python/include "*h")
+harvest(python/lib python/lib "*")
+harvest(sdl/include/SDL2 sdl/include "*.h")
+harvest(sdl/lib sdl/lib "libSDL2.a")
+harvest(sndfile/include sndfile/include "*.h")
+harvest(sndfile/lib sndfile/lib "*.a")
+harvest(spnav/include spnav/include "*.h")
+harvest(spnav/lib spnav/lib "*.a")
+harvest(tbb/include tbb/include "*.h")
+harvest(tbb/lib/libtbb_static.a tbb/lib/libtbb.a)
+harvest(theora/lib ffmpeg/lib "*.a")
+harvest(tiff/include tiff/include "*.h")
+harvest(tiff/lib tiff/lib "*.a")
+harvest(vorbis/lib ffmpeg/lib "*.a")
+harvest(opus/lib ffmpeg/lib "*.a")
+harvest(vpx/lib ffmpeg/lib "*.a")
+harvest(webp/lib ffmpeg/lib "*.a")
+harvest(x264/lib ffmpeg/lib "*.a")
+harvest(xvidcore/lib ffmpeg/lib "*.a")
+harvest(usd/include usd/include "*.h")
+harvest(usd/lib/usd usd/lib/usd "*")
+harvest(usd/plugin usd/plugin "*")
+harvest(potrace/include potrace/include "*.h")
+harvest(potrace/lib potrace/lib "*.a")
+
+if(UNIX AND NOT APPLE)
+  harvest(libglu/lib mesa/lib "*.so*")
+  harvest(mesa/lib mesa/lib "*.so*")
+endif()
+
 endif()

build_files/build_environment/cmake/iconv.cmake

@@ -19,9 +19,9 @@
 set(ICONV_EXTRA_ARGS)
 
 ExternalProject_Add(external_iconv
-  URL file://${PACKAGE_DIR}/${ICONV_FILE}
+  URL ${ICONV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ICONV_HASH_TYPE}=${ICONV_HASH}
+  URL_HASH MD5=${ICONV_HASH}
   PREFIX ${BUILD_DIR}/iconv
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/ispc.cmake

@@ -21,51 +21,41 @@ if(WIN32)
     -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe
     -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe
     -DM4_EXECUTABLE=${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe
-    -DARM_ENABLED=Off
   )
 elseif(APPLE)
-  # Use bison and flex installed via Homebrew.
-  # The ones that come with Xcode toolset are too old.
-  if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-    set(ISPC_EXTRA_ARGS_APPLE
-      -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex
-      -DARM_ENABLED=On
-    )
-  else()
-    set(ISPC_EXTRA_ARGS_APPLE
-      -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-      -DARM_ENABLED=Off
-    )
-  endif()
+  # Use bison installed via Homebrew.
+  # The one which comes which Xcode toolset is too old.
+  set(ISPC_EXTRA_ARGS_APPLE
+    -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
+  )
 elseif(UNIX)
   set(ISPC_EXTRA_ARGS_UNIX
-    -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
-    -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-    -DARM_ENABLED=Off
+    -DCMAKE_C_COMPILER=${LIBDIR}/clang/bin/clang
+    -DCMAKE_CXX_COMPILER=${LIBDIR}/clang/bin/clang++
   )
 endif()
 
 set(ISPC_EXTRA_ARGS
+    -DARM_ENABLED=Off
     -DISPC_NO_DUMPS=On
     -DISPC_INCLUDE_EXAMPLES=Off
     -DISPC_INCLUDE_TESTS=Off
     -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
     -DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
-    -DCLANG_EXECUTABLE=${LIBDIR}/llvm/bin/clang
-    -DCLANGPP_EXECUTABLE=${LIBDIR}/llvm/bin/clang++
+    -DCLANG_EXECUTABLE=${LIBDIR}/clang/bin/clang
+    -DCLANGPP_EXECUTABLE=${LIBDIR}/clang/bin/clang++
     -DISPC_INCLUDE_TESTS=Off
-    -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
-    -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
+    -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib
+    -DCLANG_INCLUDE_DIRS=${LIBDIR}/clang/include
     ${ISPC_EXTRA_ARGS_WIN}
     ${ISPC_EXTRA_ARGS_APPLE}
     ${ISPC_EXTRA_ARGS_UNIX}
 )
 
 ExternalProject_Add(external_ispc
-  URL file://${PACKAGE_DIR}/${ISPC_FILE}
+  URL ${ISPC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ISPC_HASH_TYPE}=${ISPC_HASH}
+  URL_HASH MD5=${ISPC_HASH}
   PREFIX ${BUILD_DIR}/ispc
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ISPC_EXTRA_ARGS} ${BUILD_DIR}/ispc/src/external_ispc
@@ -75,6 +65,7 @@ ExternalProject_Add(external_ispc
 add_dependencies(
   external_ispc
   ll
+  external_clang
 )
 
 if(WIN32)

build_files/build_environment/cmake/jemalloc.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_jemalloc
-  URL file://${PACKAGE_DIR}/${JEMALLOC_FILE}
+  URL ${JEMALLOC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${JEMALLOC_HASH_TYPE}=${JEMALLOC_HASH}
+  URL_HASH MD5=${JEMALLOC_HASH}
   PREFIX ${BUILD_DIR}/jemalloc
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/jpeg.cmake

@@ -21,9 +21,9 @@ if(WIN32)
   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}
+    URL ${JPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
+    URL_HASH MD5=${JPEG_HASH}
     PREFIX ${BUILD_DIR}/jpg
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/jpg
@@ -41,7 +41,7 @@ if(WIN32)
   else()
     set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
   endif()
-else()
+else(WIN32)
   # cmake for unix
   set(JPEG_EXTRA_ARGS
     -DWITH_JPEG8=ON
@@ -50,9 +50,9 @@ else()
     -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
 
   ExternalProject_Add(external_jpeg
-    URL file://${PACKAGE_DIR}/${JPEG_FILE}
+    URL ${JPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
+    URL_HASH MD5=${JPEG_HASH}
     PREFIX ${BUILD_DIR}/jpg
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/jpg

build_files/build_environment/cmake/lame.cmake

@@ -24,9 +24,9 @@ if(MSVC)
 endif()
 
 ExternalProject_Add(external_lame
-  URL file://${PACKAGE_DIR}/${LAME_FILE}
+  URL ${LAME_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LAME_HASH_TYPE}=${LAME_HASH}
+  URL_HASH MD5=${LAME_HASH}
   PREFIX ${BUILD_DIR}/lame
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
     --enable-export=full

build_files/build_environment/cmake/lcms.cmake

@@ -16,20 +16,16 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(EXPAT_EXTRA_ARGS
-  -DEXPAT_BUILD_DOCS=OFF
-  -DEXPAT_BUILD_EXAMPLES=OFF
-  -DEXPAT_BUILD_TESTS=OFF
-  -DEXPAT_BUILD_TOOLS=OFF
-  -DEXPAT_SHARED_LIBS=OFF
+set(LCMS_EXTRA_ARGS
 )
 
-ExternalProject_Add(external_expat
-  URL file://${PACKAGE_DIR}/${EXPAT_FILE}
+ExternalProject_Add(external_lcms
+  URL ${LCMS_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EXPAT_HASH_TYPE}=${EXPAT_HASH}
-  PREFIX ${BUILD_DIR}/expat
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/expat ${DEFAULT_CMAKE_FLAGS} ${EXPAT_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/expat
-  SOURCE_SUBDIR expat
+  URL_HASH MD5=${LCMS_HASH}
+  PREFIX ${BUILD_DIR}/lcms
+  # Patch taken from ocio.
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/lcms
 )

build_files/build_environment/cmake/libglu.cmake

@@ -27,9 +27,9 @@ set(LIBGLU_EXTRA_FLAGS
 )
 
 ExternalProject_Add(external_libglu
-  URL file://${PACKAGE_DIR}/${LIBGLU_FILE}
+  URL ${LIBGLU_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LIBGLU_HASH_TYPE}=${LIBGLU_HASH}
+  URL_HASH MD5=${LIBGLU_HASH}
   PREFIX ${BUILD_DIR}/libglu
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/libglu/src/external_libglu/ &&

build_files/build_environment/cmake/llvm.cmake

@@ -17,21 +17,11 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  set(LLVM_TARGETS AArch64$<SEMICOLON>ARM)
+  set(LLVM_TARGETS AArch64)
 else()
   set(LLVM_TARGETS X86)
 endif()
 
-if(APPLE)
-  set(LLVM_XML2_ARGS
-    -DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
-    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
-  )
-  set(LLVM_BUILD_CLANG_TOOLS_EXTRA ^^clang-tools-extra)
-  set(BUILD_CLANG_TOOLS ON)
-endif()
-
-
 set(LLVM_EXTRA_ARGS
   -DLLVM_USE_CRT_RELEASE=MD
   -DLLVM_USE_CRT_DEBUG=MDd
@@ -41,8 +31,6 @@ set(LLVM_EXTRA_ARGS
   -DLLVM_ENABLE_TERMINFO=OFF
   -DLLVM_BUILD_LLVM_C_DYLIB=OFF
   -DLLVM_ENABLE_UNWIND_TABLES=OFF
-  -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
-  ${LLVM_XML2_ARGS}
 )
 
 if(WIN32)
@@ -53,13 +41,11 @@ endif()
 
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
-  URL file://${PACKAGE_DIR}/${LLVM_FILE}
+  URL ${LLVM_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LLVM_HASH_TYPE}=${LLVM_HASH}
+  URL_HASH MD5=${LLVM_HASH}
   CMAKE_GENERATOR ${LLVM_GENERATOR}
-  LIST_SEPARATOR ^^
   PREFIX ${BUILD_DIR}/ll
-  SOURCE_SUBDIR llvm
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/llvm
@@ -79,11 +65,3 @@ if(MSVC)
     DEPENDEES mkdir update patch download configure build install
   )
 endif()
-
-# We currently do not build libxml2 on Windows.
-if(APPLE)
-  add_dependencies(
-    ll
-    external_xml2
-  )
-endif()

build_files/build_environment/cmake/lzma.cmake

@@ -19,9 +19,9 @@
 set(LZMA_PATCH_CMD echo .)
 
 ExternalProject_Add(external_lzma
-  URL file://${PACKAGE_DIR}/${LZMA_FILE}
+  URL ${LZMA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LZMA_HASH_TYPE}=${LZMA_HASH}
+  URL_HASH SHA256=${LZMA_HASH}
   PREFIX ${BUILD_DIR}/lzma
   PATCH_COMMAND ${LZMA_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma

build_files/build_environment/cmake/mesa.cmake

@@ -20,48 +20,31 @@ set(MESA_CFLAGS "-static-libgcc")
 set(MESA_CXXFLAGS "-static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a")
 set(MESA_LDFLAGS "-L${LIBDIR}/zlib/lib -pthread -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a -l:libz_pic.a")
 
-# The 'native-file', used for overrides with the meson build system.
-# meson does not provide a way to do this using command line arguments.
-#
-# Note that we can't output to "${BUILD_DIR}/mesa/src/external_mesa" as
-# it doesn't exist when CMake first executes.
-file(WRITE ${BUILD_DIR}/mesa/tmp/native-file.ini "\
-[binaries]
-llvm-config = '${LIBDIR}/llvm/bin/llvm-config'"
-)
-
 set(MESA_EXTRA_FLAGS
-  -Dbuildtype=release
-  -Dc_args=${MESA_CFLAGS}
-  -Dcpp_args=${MESA_CXXFLAGS}
-  -Dc_link_args=${MESA_LDFLAGS}
-  -Dcpp_link_args=${MESA_LDFLAGS}
-  -Dglx=gallium-xlib
-  -Dgallium-drivers=swrast
-  -Ddri-drivers=
-  -Dvulkan-drivers=
-  -Dgbm=disabled
-  -Degl=disabled
-  -Dgles1=disabled
-  -Dgles2=disabled
-  -Dshared-llvm=disabled
-  # Without this, the build fails when: `wayland-scanner` is not found.
-  # At some point we will likely want to support Wayland.
-  # Disable for now since it's not officially supported.
-  -Dplatforms=x11
-  --native-file ${BUILD_DIR}/mesa/tmp/native-file.ini
+  CFLAGS=${MESA_CFLAGS}
+  CXXFLAGS=${MESA_CXXFLAGS}
+  LDFLAGS=${MESA_LDFLAGS}
+  --enable-glx=gallium-xlib
+  --with-gallium-drivers=swrast
+  --disable-dri
+  --disable-gbm
+  --disable-egl
+  --disable-gles1
+  --disable-gles2
+  --disable-llvm-shared-libs
+  --with-llvm-prefix=${LIBDIR}/llvm
 )
 
 ExternalProject_Add(external_mesa
-  URL file://${PACKAGE_DIR}/${MESA_FILE}
+  URL ${MESA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MESA_HASH_TYPE}=${MESA_HASH}
+  URL_HASH MD5=${MESA_HASH}
   PREFIX ${BUILD_DIR}/mesa
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
-    meson ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja install
+    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make install
   INSTALL_DIR ${LIBDIR}/mesa
 )
 

build_files/build_environment/cmake/nanovdb.cmake

@@ -37,9 +37,9 @@ set(NANOVDB_EXTRA_ARGS
 )
 
 ExternalProject_Add(nanovdb
-  URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
+  URL ${NANOVDB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
+  URL_HASH MD5=${NANOVDB_HASH}
   PREFIX ${BUILD_DIR}/nanovdb
   SOURCE_SUBDIR nanovdb
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}

build_files/build_environment/cmake/nasm.cmake

@@ -17,22 +17,13 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_nasm
-  URL file://${PACKAGE_DIR}/${NASM_FILE}
+  URL ${NASM_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NASM_HASH_TYPE}=${NASM_HASH}
+  URL_HASH SHA256=${NASM_HASH}
   PREFIX ${BUILD_DIR}/nasm
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/nasm/src/external_nasm < ${PATCH_DIR}/nasm.diff
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && ./autogen.sh && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make -j${MAKE_THREADS} && make manpages
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make install
   INSTALL_DIR ${LIBDIR}/nasm
 )
-
-if(UNIX)
-  # `touch nasm.1 ndisasm.1` helps to create the manual pages files, even when
-  # local `asciidoc` and `xmlto` packages are not installed.
-  ExternalProject_Add_Step(external_nasm after_configure
-    COMMAND  ${CMAKE_COMMAND} -E touch ${BUILD_DIR}/nasm/src/external_nasm/nasm.1 ${BUILD_DIR}/nasm/src/external_nasm/ndisasm.1
-    DEPENDEES configure
-  )
-endif()

build_files/build_environment/cmake/numpy.cmake

@@ -32,9 +32,9 @@ endif()
 set(NUMPY_POSTFIX)
 
 ExternalProject_Add(external_numpy
-  URL file://${PACKAGE_DIR}/${NUMPY_FILE}
+  URL ${NUMPY_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NUMPY_HASH_TYPE}=${NUMPY_HASH}
+  URL_HASH MD5=${NUMPY_HASH}
   PREFIX ${BUILD_DIR}/numpy
   PATCH_COMMAND ${NUMPY_PATCH}
   CONFIGURE_COMMAND ""
@@ -47,5 +47,4 @@ ExternalProject_Add(external_numpy
 add_dependencies(
   external_numpy
   external_python
-  external_python_site_packages
 )

build_files/build_environment/cmake/ogg.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ogg
-  URL file://${PACKAGE_DIR}/${OGG_FILE}
+  URL ${OGG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
+  URL_HASH SHA256=${OGG_HASH}
   PREFIX ${BUILD_DIR}/ogg
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ogg/src/external_ogg < ${PATCH_DIR}/ogg.diff
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static

build_files/build_environment/cmake/openal.cmake

@@ -46,9 +46,9 @@ if(BUILD_MODE STREQUAL Release)
   endif()
 
   ExternalProject_Add(external_openal
-    URL file://${PACKAGE_DIR}/${OPENAL_FILE}
+    URL ${OPENAL_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OPENAL_HASH_TYPE}=${OPENAL_HASH}
+    URL_HASH MD5=${OPENAL_HASH}
     PREFIX ${BUILD_DIR}/openal
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/openal

build_files/build_environment/cmake/opencollada.cmake

@@ -20,49 +20,24 @@ if(UNIX)
   set(OPENCOLLADA_EXTRA_ARGS
     -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
     -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
-
-  # WARNING: the patch contains mixed UNIX and DOS line endings
-  # as does the OPENCOLLADA package, if this can be corrected upstream that would be better.
-  # For now use `sed` to force UNIX line endings so the patch applies.
-  # Needed as neither ignoring white-space or applying as a binary resolve this problem.
-  set(PATCH_MAYBE_DOS2UNIX_CMD
-    sed -i "s/\\r//"
-    ${PATCH_DIR}/opencollada.diff
-    ${BUILD_DIR}/opencollada/src/external_opencollada/CMakeLists.txt
-    ${BUILD_DIR}/opencollada/src/external_opencollada/Externals/LibXML/CMakeLists.txt &&
-  )
-
-else()
-  set(OPENCOLLADA_EXTRA_ARGS
-    -DCMAKE_DEBUG_POSTFIX=_d
-    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
-  )
-  if(BUILD_MODE STREQUAL Release)
-    list(APPEND  OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2s.lib)
-  else()
-    list(APPEND  OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2sd.lib)
-  endif()
-  set(PATCH_MAYBE_DOS2UNIX_CMD)
 endif()
 
 ExternalProject_Add(external_opencollada
-  URL file://${PACKAGE_DIR}/${OPENCOLLADA_FILE}
+  URL ${OPENCOLLADA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENCOLLADA_HASH_TYPE}=${OPENCOLLADA_HASH}
+  URL_HASH MD5=${OPENCOLLADA_HASH}
   PREFIX ${BUILD_DIR}/opencollada
-  PATCH_COMMAND
-    ${PATCH_MAYBE_DOS2UNIX_CMD}
-    ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/opencollada
 )
 
-unset(PATCH_MAYBE_DOS2UNIX_CMD)
-
-add_dependencies(
-  external_opencollada
-  external_xml2
-)
+if(UNIX)
+  add_dependencies(
+    external_opencollada
+    external_xml2
+  )
+endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
@@ -73,7 +48,17 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/lib ${HARVEST_TARGET}/opencollada/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opencolorio.cmake

@@ -18,84 +18,102 @@
 
 set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_BUILD_APPS=OFF
-  -DOCIO_BUILD_PYTHON=OFF
+  -DOCIO_BUILD_PYGLUE=OFF
   -DOCIO_BUILD_NUKE=OFF
-  -DOCIO_BUILD_JAVA=OFF
-  -DBUILD_SHARED_LIBS=OFF
+  -DOCIO_USE_BOOST_PTR=OFF
+  -DOCIO_BUILD_STATIC=ON
+  -DOCIO_BUILD_SHARED=OFF
+  -DOCIO_BUILD_TRUELIGHT=OFF
   -DOCIO_BUILD_DOCS=OFF
-  -DOCIO_BUILD_TESTS=OFF
-  -DOCIO_BUILD_GPU_TESTS=OFF
-  -DOCIO_USE_SSE=ON
-
-  # 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
+  -DOCIO_BUILD_PYGLUE=OFF
+  -DOCIO_BUILD_JNIGLUE=OFF
+  -DOCIO_STATIC_JNIGLUE=OFF
 )
 
 if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
-    -DOCIO_USE_SSE=OFF
+     ${OPENCOLORIO_EXTRA_ARGS}
+     -DOCIO_USE_SSE=OFF
   )
 endif()
 
 if(WIN32)
+  set(OCIO_PATCH opencolorio_win.diff)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
+    -DOCIO_BUILD_TESTS=OFF
+    -DOCIO_USE_SSE=ON
     -DOCIO_INLINES_HIDDEN=OFF
+    -DOCIO_PYGLUE_LINK=OFF
+    -DOCIO_PYGLUE_RESPECT_ABI=OFF
+    -DOCIO_PYGLUE_SONAME=OFF
+    -DOCIO_PYGLUE_LIB_PREFIX=OFF
+    -DUSE_EXTERNAL_TINYXML=ON
+    -DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
+    -DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
+    -DUSE_EXTERNAL_YAML=ON
+    -DYAML_CPP_FOUND=ON
+    -DYAML_CPP_VERSION=${YAMLCPP_VERSION}
+    -DUSE_EXTERNAL_LCMS=ON
+    -DINC_1=${LIBDIR}/tinyxml/include
+    -DINC_2=${LIBDIR}/yamlcpp/include
+    # Lie because ocio cmake is demanding boost even though it is not needed.
+    -DYAML_CPP_VERSION=0.5.0
   )
 else()
+  set(OCIO_PATCH opencolorio.diff)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
   )
 endif()
 
 ExternalProject_Add(external_opencolorio
-  URL file://${PACKAGE_DIR}/${OPENCOLORIO_FILE}
+  URL ${OPENCOLORIO_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
+  URL_HASH MD5=${OPENCOLORIO_HASH}
   PREFIX ${BUILD_DIR}/opencolorio
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/opencolorio
 )
 
+if(NOT WIN32)
+  add_custom_command(
+    OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
+    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
+    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
+  )
+  add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
+endif()
+
 add_dependencies(
   external_opencolorio
-  external_yamlcpp
-  external_expat
-  external_openexr
+  external_boost
 )
 
 if(WIN32)
+  add_dependencies(
+    external_opencolorio
+    external_tinyxml
+    external_yamlcpp
+
+  )
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opencolorio after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${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 ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/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 ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
       DEPENDEES install
     )
   endif()
-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 ${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

@@ -42,9 +42,9 @@ set(OPENEXR_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_openexr
-  URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
+  URL ${OPENEXR_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
+  URL_HASH MD5=${OPENEXR_HASH}
   PREFIX ${BUILD_DIR}/openexr
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openexr

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -41,11 +41,10 @@ else()
 endif()
 
 ExternalProject_Add(external_openimagedenoise
-  URL file://${PACKAGE_DIR}/${OIDN_FILE}
+  URL ${OIDN_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
+  URL_HASH MD5=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

build_files/build_environment/cmake/openimageio.cmake

@@ -68,6 +68,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
   -DBoost_NO_SYSTEM_PATHS=ON
   -DBoost_NO_BOOST_CMAKE=ON
+  -OIIO_BUILD_CPP11=ON
   -DUSE_LIBSQUISH=OFF
   -DUSE_QT5=OFF
   -DUSE_NUKE=OFF
@@ -111,17 +112,14 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DSTOP_ON_WARNING=OFF
-  -DUSE_EXTERNAL_PUGIXML=ON
-  -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
-  -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
   ${WEBP_FLAGS}
   ${OIIO_SIMD_FLAGS}
 )
 
 ExternalProject_Add(external_openimageio
-  URL file://${PACKAGE_DIR}/${OPENIMAGEIO_FILE}
+  URL ${OPENIMAGEIO_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
+  URL_HASH MD5=${OPENIMAGEIO_HASH}
   PREFIX ${BUILD_DIR}/openimageio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
@@ -136,7 +134,6 @@ add_dependencies(
   external_jpeg
   external_boost
   external_tiff
-  external_pugixml
   external_openjpeg${OPENJPEG_POSTFIX}
   ${WEBP_DEP}
 )

build_files/build_environment/cmake/openjpeg.cmake

@@ -28,9 +28,9 @@ else()
 endif()
 
 ExternalProject_Add(external_openjpeg
-  URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
+  URL ${OPENJPEG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
+  URL_HASH SHA256=${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 -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}
@@ -42,9 +42,9 @@ ExternalProject_Add(external_openjpeg
 if(MSVC)
   set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
   ExternalProject_Add(external_openjpeg_msvc
-    URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
+    URL ${OPENJPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
+    URL_HASH SHA256=${OPENJPEG_HASH}
     PREFIX ${BUILD_DIR}/openjpeg_msvc
     CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
     INSTALL_DIR ${LIBDIR}/openjpeg_msvc

build_files/build_environment/cmake/openmp.cmake

@@ -18,9 +18,9 @@
 
 
 ExternalProject_Add(external_openmp
-  URL file://${PACKAGE_DIR}/${OPENMP_FILE}
+  URL ${OPENMP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
+  URL_HASH MD5=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
@@ -30,5 +30,5 @@ ExternalProject_Add(external_openmp
 
 add_dependencies(
   external_openmp
-  ll
+  external_clang
 )

build_files/build_environment/cmake/opensubdiv.cmake

@@ -65,9 +65,9 @@ else()
 endif()
 
 ExternalProject_Add(external_opensubdiv
-  URL file://${PACKAGE_DIR}/${OPENSUBDIV_FILE}
+  URL ${OPENSUBDIV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENSUBDIV_HASH_TYPE}=${OPENSUBDIV_HASH}
+  URL_HASH MD5=${OPENSUBDIV_HASH}
   PREFIX ${BUILD_DIR}/opensubdiv
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/opensubdiv

build_files/build_environment/cmake/openvdb.cmake

@@ -54,8 +54,6 @@ set(OPENVDB_EXTRA_ARGS
   -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
   -DOPENVDB_BUILD_BINARIES=Off
   -DCMAKE_DEBUG_POSTFIX=_d
-  -DILMBASE_USE_STATIC_LIBS=On
-  -DOPENEXR_USE_STATIC_LIBS=On
 )
 
 if(WIN32)
@@ -77,9 +75,9 @@ else()
 endif()
 
 ExternalProject_Add(openvdb
-  URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
+  URL ${OPENVDB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
+  URL_HASH MD5=${OPENVDB_HASH}
   PREFIX ${BUILD_DIR}/openvdb
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}

build_files/build_environment/cmake/options.cmake

@@ -21,8 +21,7 @@ if(WIN32)
 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")
+set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 
 if(NOT BUILD_MODE)
   set(BUILD_MODE "Release")
@@ -32,23 +31,17 @@ message("BuildMode = ${BUILD_MODE}")
 
 if(BUILD_MODE STREQUAL "Debug")
   set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-else()
+else(BUILD_MODE STREQUAL "Debug")
   set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
 endif()
 
-set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
-# This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py:
-set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages")
-option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON)
-
+option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
-file(TO_CMAKE_PATH ${PACKAGE_DIR} PACKAGE_DIR)
 set(PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/build)
 
 message("LIBDIR = ${LIBDIR}")
 message("DOWNLOAD_DIR = ${DOWNLOAD_DIR}")
-message("PACKAGE_DIR = ${PACKAGE_DIR}")
 message("PATCH_DIR = ${PATCH_DIR}")
 message("BUILD_DIR = ${BUILD_DIR}")
 
@@ -116,16 +109,30 @@ else()
   set(LIBPREFIX "lib")
 
   if(APPLE)
-    # Use same Xcode detection as Blender itself.
-    include(../cmake/platform/platform_apple_xcode.cmake)
+    # Let's get the current Xcode dir, to support xcode-select
+    execute_process(
+      COMMAND xcode-select --print-path
+      OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    execute_process(
+      COMMAND xcodebuild -version -sdk macosx SDKVersion
+      OUTPUT_VARIABLE MACOSX_SDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      set(BLENDER_PLATFORM_ARM ON)
+    if(NOT CMAKE_OSX_ARCHITECTURES)
+      execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+      message(STATUS "Detected native architecture ${ARCHITECTURE}.")
+      set(CMAKE_OSX_ARCHITECTURES "${ARCHITECTURE}")
     endif()
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
+      set(OSX_DEPLOYMENT_TARGET 10.13)
+    else()
+      set(OSX_DEPLOYMENT_TARGET 11.00)
+    endif()
+    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
 
-    set(PLATFORM_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
     else()
@@ -133,8 +140,8 @@ else()
     endif()
     set(PLATFORM_CMAKE_FLAGS
       -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
-      -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
     )
   else()
     set(PLATFORM_CFLAGS "-fPIC")
@@ -164,8 +171,8 @@ else()
   set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
 
   set(CONFIGURE_ENV
-    export MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} &&
-    export MACOSX_SDK_VERSION=${CMAKE_OSX_DEPLOYMENT_TARGET} &&
+    export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
+    export MACOSX_SDK_VERSION=${OSX_DEPLOYMENT_TARGET} &&
     export CFLAGS=${PLATFORM_CFLAGS} &&
     export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
     export LDFLAGS=${PLATFORM_LDFLAGS}

build_files/build_environment/cmake/opus.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_opus
-  URL file://${PACKAGE_DIR}/${OPUS_FILE}
+  URL ${OPUS_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPUS_HASH_TYPE}=${OPUS_HASH}
+  URL_HASH SHA256=${OPUS_HASH}
   PREFIX ${BUILD_DIR}/opus
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/opus
     --disable-shared

build_files/build_environment/cmake/osl.cmake

@@ -19,7 +19,12 @@
 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)
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
+  else()
+    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+  endif()
   SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
@@ -29,6 +34,7 @@ else()
 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_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
 
 set(OSL_EXTRA_ARGS
   -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
@@ -39,8 +45,13 @@ set(OSL_EXTRA_ARGS
   -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
   -DBoost_NO_SYSTEM_PATHS=ON
   -DBoost_NO_BOOST_CMAKE=ON
-  -DOpenEXR_ROOT=${LIBDIR}/openexr/
-  -DIlmBase_ROOT=${LIBDIR}/openexr/
+  -DLLVM_DIRECTORY=${LIBDIR}/llvm
+  -DLLVM_INCLUDES=${LIBDIR}/llvm/include
+  -DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
+  -DLLVM_VERSION=3.4
+  -DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
+  -DOPENEXR_HOME=${LIBDIR}/openexr/
+  -DILMBASE_HOME=${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}
@@ -48,41 +59,46 @@ set(OSL_EXTRA_ARGS
   -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
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  -DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
+  -DOPENIMAGEIO_INCLUDE_DIR=${LIBDIR}/openimageio/include
+  -DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
-  -DBUILD_SHARED_LIBS=OFF
+  -DBUILDSTATIC=ON
   ${OSL_PLATFORM_FLAGS}
-  -DOSL_BUILD_PLUGINS=OFF
+  -DOSL_BUILD_PLUGINS=Off
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
-  -DLLVM_ROOT=${LIBDIR}/llvm/
-  -DLLVM_DIRECTORY=${LIBDIR}/llvm/
   -DUSE_PARTIO=OFF
   -DUSE_QT=OFF
-  -DUSE_Qt5=OFF
   -DINSTALL_DOCS=OFF
   ${OSL_SIMD_FLAGS}
-  -Dpugixml_ROOT=${LIBDIR}/pugixml
-  -DTIFF_ROOT=${LIBDIR}/tiff
-  -DJPEG_ROOT=${LIBDIR}/jpeg
-  -DUSE_PYTHON=OFF
+  -DPARTIO_LIBRARIES=
 )
 
-# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14
-if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14)
+if(WIN32)
+  set(OSL_EXTRA_ARGS
+    ${OSL_EXTRA_ARGS}
+    -DPUGIXML_HOME=${LIBDIR}/pugixml
+  )
+elseif(APPLE)
+  # Make symbol hiding consistent with OIIO which defaults to OFF,
+  # avoids linker warnings on macOS
+  set(OSL_EXTRA_ARGS
+    ${OSL_EXTRA_ARGS}
+    -DHIDE_SYMBOLS=OFF
+  )
 endif()
 
 ExternalProject_Add(external_osl
-  URL file://${PACKAGE_DIR}/${OSL_FILE}
+  URL ${OSL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   LIST_SEPARATOR ^^
-  URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
+  URL_HASH MD5=${OSL_HASH}
   PREFIX ${BUILD_DIR}/osl
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
@@ -93,13 +109,22 @@ add_dependencies(
   external_osl
   external_boost
   ll
+  external_clang
   external_openexr
   external_zlib
   external_flexbison
   external_openimageio
-  external_pugixml
 )
 
+if(UNIX)
+  # Rely on PugiXML compiled with OpenImageIO
+else()
+  add_dependencies(
+    external_osl
+    external_pugixml
+  )
+endif()
+
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_osl after_install

build_files/build_environment/cmake/png.cmake

@@ -27,9 +27,9 @@ if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
 endif()
 
 ExternalProject_Add(external_png
-  URL file://${PACKAGE_DIR}/${PNG_FILE}
+  URL ${PNG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PNG_HASH_TYPE}=${PNG_HASH}
+  URL_HASH SHA256=${PNG_HASH}
   PREFIX ${BUILD_DIR}/png
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/png
@@ -40,14 +40,6 @@ add_dependencies(
   external_zlib
 )
 
-if(WIN32 AND BUILD_MODE STREQUAL Release)
-  ExternalProject_Add_Step(external_png after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static${LIBEXT} ${HARVEST_TARGET}/png/lib/libpng${LIBEXT}
-    DEPENDEES install
-  )
-endif()
-
 if(WIN32 AND BUILD_MODE STREQUAL Debug)
   ExternalProject_Add_Step(external_png after_install
     COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}

build_files/build_environment/cmake/potrace.cmake

@@ -21,9 +21,9 @@ set(POTRACE_EXTRA_ARGS
 
 if((WIN32 AND BUILD_MODE STREQUAL Release) OR UNIX)
   ExternalProject_Add(external_potrace
-    URL file://${PACKAGE_DIR}/${POTRACE_FILE}
+    URL ${POTRACE_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${POTRACE_HASH_TYPE}=${POTRACE_HASH}
+    URL_HASH MD5=${POTRACE_HASH}
     PREFIX ${BUILD_DIR}/potrace
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_potrace.txt ${BUILD_DIR}/potrace/src/external_potrace/CMakeLists.txt
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/potrace ${DEFAULT_CMAKE_FLAGS} ${POTRACE_EXTRA_ARGS}

build_files/build_environment/cmake/pthreads.cmake

@@ -27,9 +27,9 @@ if(WIN32)
     set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS})
 
     ExternalProject_Add(external_pthreads
-      URL file://${PACKAGE_DIR}/${PTHREADS_FILE}
+      URL ${PTHREADS_URI}
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH ${PTHREADS_HASH_TYPE}=${PTHREADS_HASH}
+      URL_HASH MD5=${PTHREADS_HASH}
       PREFIX ${BUILD_DIR}/pthreads
       CONFIGURE_COMMAND echo .
       PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff

build_files/build_environment/cmake/pugixml.cmake

@@ -20,9 +20,9 @@ set(PUGIXML_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_pugixml
-  URL file://${PACKAGE_DIR}/${PUGIXML_FILE}
+  URL ${PUGIXML_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PUGIXML_HASH_TYPE}=${PUGIXML_HASH}
+  URL_HASH MD5=${PUGIXML_HASH}
   PREFIX ${BUILD_DIR}/pugixml
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/pugixml
@@ -30,13 +30,13 @@ ExternalProject_Add(external_pugixml
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pugixml ${HARVEST_TARGET}/pugixml
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/pugixml/lib/pugixml_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/python.cmake

@@ -31,33 +31,21 @@ if(WIN32)
   endmacro()
 
   set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
-  set(ZLIB_SOURCE_FOLDER ${BUILD_DIR}/zlib/src/external_zlib)
   set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
 
   cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
-  cmake_to_dos_path(${ZLIB_SOURCE_FOLDER} ZLIB_SOURCE_FOLDER_DOS)
   cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
   ExternalProject_Add(external_python
-    URL file://${PACKAGE_DIR}/${PYTHON_FILE}
+    URL ${PYTHON_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
+    URL_HASH MD5=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
-    # Python will download its own deps and there's very little we can do about
-    # that beyond placing some code in their externals dir before it tries.
-    # the foldernames *HAVE* to match the ones inside pythons get_externals.cmd.
-    # python 3.10.8 still ships zlib 1.2.12, replace it with our 1.2.13
-    # copy until they update.
-    CONFIGURE_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.12 ${ZLIB_SOURCE_FOLDER_DOS} &&
-      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.12/zconf.h
+    CONFIGURE_COMMAND ""
     BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
-    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
-  )
-  add_dependencies(
-    external_python
-    external_zlib
+    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/  --include-underpth --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
+
 else()
   if(APPLE)
     # Disable functions that can be in 10.13 sdk but aren't available on 10.9 target.
@@ -86,15 +74,16 @@ else()
     endif()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
     set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
+    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_macos.diff)
   else()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
     set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-  endif()
-  # Link against zlib statically (Unix). Avoid rpath issues (macOS).
-  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
+    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
+ endif()
+
   set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
-  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include ${PLATFORM_CFLAGS}")
-  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib ${PLATFORM_LDFLAGS}")
+  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
+  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
   set(PYTHON_CONFIGURE_EXTRA_ENV
     export CFLAGS=${PYTHON_CFLAGS} &&
     export CPPFLAGS=${PYTHON_CFLAGS} &&
@@ -102,9 +91,9 @@ else()
     export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
 
   ExternalProject_Add(external_python
-    URL file://${PACKAGE_DIR}/${PYTHON_FILE}
+    URL ${PYTHON_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
+    URL_HASH MD5=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
     PATCH_COMMAND ${PYTHON_PATCH}
     CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}

build_files/build_environment/cmake/python_site_packages.cmake

@@ -16,27 +16,14 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
-  set(SITE_PACKAGES_EXTRA --global-option build --global-option --debug)
-endif()
-
 ExternalProject_Add(external_python_site_packages
   DOWNLOAD_COMMAND ""
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
 )
 
-if(USE_PIP_NUMPY)
-  # Use only wheel (and not build from source) to stop NumPy from linking against buggy
-  # Accelerate framework backend on macOS. Official wheels are built with OpenBLAS.
-  ExternalProject_Add_Step(external_python_site_packages after_install
-    COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir numpy==${NUMPY_VERSION} --only-binary :all:
-    DEPENDEES install
-  )
-endif()
-
 add_dependencies(
   external_python_site_packages
   external_python

build_files/build_environment/cmake/sdl.cmake

@@ -30,9 +30,9 @@ else()
 endif()
 
 ExternalProject_Add(external_sdl
-  URL file://${PACKAGE_DIR}/${SDL_FILE}
+  URL ${SDL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SDL_HASH_TYPE}=${SDL_HASH}
+  URL_HASH MD5=${SDL_HASH}
   PREFIX ${BUILD_DIR}/sdl
   PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}

build_files/build_environment/cmake/sndfile.cmake

@@ -27,11 +27,18 @@ else()
   set(SNDFILE_OPTIONS --enable-static --disable-shared )
 endif()
 
+if(UNIX)
+  set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
+else()
+  set(SNDFILE_PATCH_CMD)
+endif()
+
 ExternalProject_Add(external_sndfile
-  URL file://${PACKAGE_DIR}/${SNDFILE_FILE}
+  URL ${SNDFILE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SNDFILE_HASH_TYPE}=${SNDFILE_HASH}
+  URL_HASH MD5=${SNDFILE_HASH}
   PREFIX ${BUILD_DIR}/sndfile
+  PATCH_COMMAND ${SNDFILE_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install

build_files/build_environment/cmake/spnav.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_spnav
-  URL file://${PACKAGE_DIR}/${SPNAV_FILE}
+  URL ${SPNAV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
+  URL_HASH MD5=${SPNAV_HASH}
   PREFIX ${BUILD_DIR}/spnav
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/sqlite.cmake

@@ -42,28 +42,16 @@ if(UNIX)
     -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
     -fPIC")
   set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
-  set(SQLITE_CONFIGURATION_ARGS
-    ${SQLITE_CONFIGURATION_ARGS}
-    --enable-threadsafe
-    --enable-load-extension
-    --enable-json1
-    --enable-fts4
-    --enable-fts5
-    # While building `tcl` is harmless, it causes problems when the install step
-    # tries to copy the files into the system path.
-    # Since this isn't required by Python or Blender this can be disabled.
-    # Note that Debian (for example), splits this off into a separate package,
-    # so it's safe to turn off.
-    --disable-tcl
-    --enable-shared=no
-  )
+  set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
+      --enable-shared=no)
 endif()
 
 ExternalProject_Add(external_sqlite
-  URL file://${PACKAGE_DIR}/${SQLITE_FILE}
+  URL ${SQLITE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH}
+  URL_HASH SHA1=${SQLITE_HASH}
   PREFIX ${BUILD_DIR}/sqlite
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/sqlite/src/external_sqlite < ${PATCH_DIR}/sqlite.diff
   CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install

build_files/build_environment/cmake/sse2neon.cmake

@@ -1,30 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  ExternalProject_Add(external_sse2neon
-    GIT_REPOSITORY  ${SSE2NEON_GIT}
-    GIT_TAG ${SSE2NEON_GIT_HASH}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    PREFIX ${BUILD_DIR}/sse2neon
-    CONFIGURE_COMMAND echo sse2neon - Nothing to configure
-    BUILD_COMMAND echo sse2neon - nothing to build
-    INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon && cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
-    INSTALL_DIR ${LIBDIR}/sse2neon
-  )
-endif()

build_files/build_environment/cmake/ssl.cmake

@@ -20,8 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
 if(APPLE)
-  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
-  set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
+   set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
 else()
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
@@ -32,9 +31,9 @@ else()
 endif()
 
 ExternalProject_Add(external_ssl
-  URL file://${PACKAGE_DIR}/${SSL_FILE}
+  URL ${SSL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
+  URL_HASH SHA256=${SSL_HASH}
   PREFIX ${BUILD_DIR}/ssl
   PATCH_COMMAND ${SSL_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl

build_files/build_environment/cmake/tbb.cmake

@@ -37,13 +37,12 @@ endif()
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
-  URL file://${PACKAGE_DIR}/${TBB_FILE}
+  URL ${TBB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${TBB_HASH_TYPE}=${TBB_HASH}
+  URL_HASH MD5=${TBB_HASH}
   PREFIX ${BUILD_DIR}/tbb
   PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver &&
-  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/tbb/src/external_tbb < ${PATCH_DIR}/tbb.diff
+  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tbb
 )

build_files/build_environment/cmake/theora.cmake

@@ -23,9 +23,9 @@ else()
 endif()
 
 ExternalProject_Add(external_theora
-  URL file://${PACKAGE_DIR}/${THEORA_FILE}
+  URL ${THEORA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${THEORA_HASH_TYPE}=${THEORA_HASH}
+  URL_HASH SHA256=${THEORA_HASH}
   PREFIX ${BUILD_DIR}/theora
   PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/theora/src/external_theora < ${PATCH_DIR}/theora.diff
   CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora

build_files/build_environment/cmake/tiff.cmake

@@ -34,9 +34,9 @@ set(TIFF_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_tiff
-  URL file://${PACKAGE_DIR}/${TIFF_FILE}
+  URL ${TIFF_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${TIFF_HASH_TYPE}=${TIFF_HASH}
+  URL_HASH MD5=${TIFF_HASH}
   PREFIX ${BUILD_DIR}/tiff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tiff
@@ -45,7 +45,6 @@ ExternalProject_Add(external_tiff
 add_dependencies(
   external_tiff
   external_zlib
-  external_jpeg
 )
 
 if(WIN32 AND BUILD_MODE STREQUAL Debug)

build_files/build_environment/cmake/tinyxml.cmake

@@ -14,13 +14,18 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# The Original Code is Copyright (C) 2017, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): IRIE Shinsuke
-#
 # ***** END GPL LICENSE BLOCK *****
 
-add_executable(smaa_areatex smaa_areatex.cpp)
+set(TINYXML_EXTRA_ARGS
+)
+
+ExternalProject_Add(external_tinyxml
+  URL ${TINYXML_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${TINYXML_HASH}
+  PREFIX ${BUILD_DIR}/tinyxml
+  # patch taken from ocio
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/tinyxml
+)

build_files/build_environment/cmake/usd.cmake

@@ -53,9 +53,9 @@ set(USD_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_usd
-  URL file://${PACKAGE_DIR}/${USD_FILE}
+  URL ${USD_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${USD_HASH_TYPE}=${USD_HASH}
+  URL_HASH MD5=${USD_HASH}
   PREFIX ${BUILD_DIR}/usd
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}

build_files/build_environment/cmake/versions.cmake

@@ -16,71 +16,40 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-# CPE's are used to identify dependencies, for more information on what they
-# are please see https://nvd.nist.gov/products/cpe
-#
-# We use them in combination with cve-bin-tool to scan for known security issues.
-#
-# Not all of our dependencies are currently in the nvd database so not all
-# dependencies have one assigned.
-
-set(ZLIB_VERSION 1.2.13)
+set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 9b8aa094c4e5765dabf4da391f00d15c)
-set(ZLIB_HASH_TYPE MD5)
-set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_CPE "cpe:2.3:a:zlib:zlib:${ZLIB_VERSION}:*:*:*:*:*:*:*")
+set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
 
 set(OPENAL_VERSION 1.20.1)
 set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
 set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
-set(OPENAL_HASH_TYPE MD5)
-set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2)
 
 set(PNG_VERSION 1.6.37)
 set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
 set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca)
-set(PNG_HASH_TYPE SHA256)
-set(PNG_FILE libpng-${PNG_VERSION}.tar.xz)
-set(PNG_CPE "cpe:2.3:a:libpng:libpng:${PNG_VERSION}:*:*:*:*:*:*:*")
 
 set(JPEG_VERSION 2.0.4)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
 set(JPEG_HASH 44c43e4a9fb352f47090804529317c88)
-set(JPEG_HASH_TYPE MD5)
-set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
-set(JPEG_CPE "cpe:2.3:a:d.r.commander:libjpeg-turbo:${JPEG_VERSION}:*:*:*:*:*:*:*")
 
-set(BOOST_VERSION 1.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 4036cd27ef7548b8d29c30ea10956196)
-set(BOOST_HASH_TYPE MD5)
-set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_CPE "cpe:2.3:a:boost:boost:${BOOST_VERSION}:*:*:*:*:*:*:*")
+set(BOOST_VERSION 1.70.0)
+set(BOOST_VERSION_NODOTS 1_70_0)
+set(BOOST_VERSION_NODOTS_SHORT 1_70)
+set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
+set(BOOST_HASH fea771fe8176828fabf9c09242ee8c26)
 
 # 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 6e4a49c8c06f05aa543f3312cfce3d55)
-set(BLOSC_HASH_TYPE MD5)
-set(BLOSC_FILE blosc-${BLOSC_VERSION}.tar.gz)
-set(BLOSC_CPE "cpe:2.3:a:c-blosc2_project:c-blosc2:${BLOSC_VERSION}:*:*:*:*:*:*:*")
 
 set(PTHREADS_VERSION 3.0.0)
-set(PTHREADS_URI http://prdownloads.sourceforge.net/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
+set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
 set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
-set(PTHREADS_HASH_TYPE MD5)
-set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)
 
-set(OPENEXR_VERSION 2.5.8)
+set(OPENEXR_VERSION 2.4.0)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH 85e8a979092c9055d10ed103062d31a0)
-set(OPENEXR_HASH_TYPE MD5)
-set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_CPE "cpe:2.3:a:openexr:openexr:${OPENEXR_VERSION}:*:*:*:*:*:*:*")
-
+set(OPENEXR_HASH 9e4d69cf2a12c6fb19b98af7c5e0eaee)
 if(WIN32)
   # Openexr started appending _d on its own so now
   # we need to tell the build the postfix is _s while
@@ -97,445 +66,265 @@ else()
   set(OPENEXR_VERSION_POSTFIX)
 endif()
 
-set(FREETYPE_VERSION 2.12.1)
+set(FREETYPE_VERSION 2.10.2)
 set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH 8bc5c9c9df7ac12c504f8918552a7cf2)
-set(FREETYPE_HASH_TYPE MD5)
-set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
-SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
+set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
 
 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)
+set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
 set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)
-set(FREEGLUT_HASH_TYPE MD5)
-set(FREEGLUT_FILE freeglut-${FREEGLUT_VERSION}.tar.gz)
 
-set(ALEMBIC_VERSION 1.7.16)
+set(ALEMBIC_VERSION 1.7.12)
 set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
-set(ALEMBIC_HASH effcc86e42fe6605588e3de57bde6677)
-set(ALEMBIC_HASH_TYPE MD5)
-set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
-SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
+set(ALEMBIC_MD5 e2b3777f23c5c09481a008cc6f0f8a40)
 
 # 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 7bbfa275d021fb829e521df749160edb)
-set(OPENSUBDIV_HASH_TYPE MD5)
-set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
 set(SDL_VERSION 2.0.12)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
 set(SDL_HASH 783b6f2df8ff02b19bb5ce492b99c8ff)
-set(SDL_HASH_TYPE MD5)
-set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_CPE "cpe:2.3:a:libsdl:sdl:${SDL_VERSION}:*:*:*:*:*:*:*")
 
 set(OPENCOLLADA_VERSION v1.6.68)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
 set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
-set(OPENCOLLADA_HASH_TYPE MD5)
-set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
-set(OPENCOLORIO_VERSION 2.0.0)
+set(OPENCOLORIO_VERSION 1.1.1)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
-set(OPENCOLORIO_HASH_TYPE MD5)
-set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
+set(OPENCOLORIO_HASH 23d8b9ac81599305539a5a8674b94a3d)
 
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  # Newer version required by ISPC with arm support.
-  set(LLVM_VERSION 11.0.1)
-  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
-  set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_VERSION 9.0.1)
+set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc)
 
-  set(OPENMP_VERSION 9.0.1)
-  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
-  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
-else()
-  set(LLVM_VERSION 9.0.1)
-  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
-  set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
+set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz)
+set(CLANG_HASH 13468e4a44940efef1b75e8641752f90)
 
-  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
-  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
-endif()
-set(LLVM_CPE "cpe:2.3:a:llvm:compiler:${LLVM_VERSION}:*:*:*:*:*:*:*")
+set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
 
 set(OPENIMAGEIO_VERSION 2.1.15.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
 set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
-set(OPENIMAGEIO_HASH_TYPE MD5)
-set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_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_TYPE MD5)
-set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
+set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 
-set(OSL_VERSION 1.11.10.0)
+set(OSL_VERSION 1.10.10)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH dfdc23597aeef083832cbada62211756)
-set(OSL_HASH_TYPE MD5)
-set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
+set(OSL_HASH 00dec08a93c8084e53848b9ad047889f)
 
-set(PYTHON_VERSION 3.9.15)
-set(PYTHON_SHORT_VERSION 3.9)
-set(PYTHON_SHORT_VERSION_NO_DOTS 39)
+set(PYTHON_VERSION 3.7.7)
+set(PYTHON_SHORT_VERSION 3.7)
+set(PYTHON_SHORT_VERSION_NO_DOTS 37)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH f0dc9000312abeb16de4eccce9a870ab)
-set(PYTHON_HASH_TYPE MD5)
-set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_CPE "cpe:2.3:a:python:python:${PYTHON_VERSION}:-:*:*:*:*:*:*")
+set(PYTHON_HASH 172c650156f7bea68ce31b2fd01fa766)
 
-set(TBB_YEAR 2020)
-set(TBB_VERSION ${TBB_YEAR}_U2)
+set(TBB_VERSION 2019_U9)
 set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
-set(TBB_HASH_TYPE MD5)
-set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
-set(TBB_CPE "cpe:2.3:a:intel:threading_building_blocks:${TBB_YEAR}:*:*:*:*:*:*:*")
+set(TBB_HASH 26263622e9187212ec240dcf01b66207)
 
-set(OPENVDB_VERSION 8.0.1)
+set(OPENVDB_VERSION 7.0.0)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
-set(OPENVDB_HASH_TYPE MD5)
-set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
+set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8)
 
 set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f)
 set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
 set(NANOVDB_HASH 90919510bc6ccd630fedc56f748cb199)
-set(NANOVDB_HASH_TYPE MD5)
-set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
 
-set(IDNA_VERSION 2.10)
-set(CHARDET_VERSION 4.0.0)
-set(URLLIB3_VERSION 1.26.3)
-set(URLLIB3_CPE "cpe:2.3:a:urllib3:urllib3:${URLLIB3_VERSION}:*:*:*:*:*:*:*")
-set(CERTIFI_VERSION 2020.12.5)
-set(REQUESTS_VERSION 2.25.1)
-set(CYTHON_VERSION 0.29.21)
+set(IDNA_VERSION 2.9)
+set(CHARDET_VERSION 3.0.4)
+set(URLLIB3_VERSION 1.25.9)
+set(CERTIFI_VERSION 2020.4.5.2)
+set(REQUESTS_VERSION 2.23.0)
 
-set(NUMPY_VERSION 1.22.0)
-set(NUMPY_SHORT_VERSION 1.22)
+set(NUMPY_VERSION 1.17.5)
+set(NUMPY_SHORT_VERSION 1.17)
 set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
-set(NUMPY_HASH 252de134862a27bd66705d29622edbfe)
-set(NUMPY_HASH_TYPE MD5)
-set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
-set(NUMPY_CPE "cpe:2.3:a:numpy:numpy:${NUMPY_VERSION}:*:*:*:*:*:*:*")
+set(NUMPY_HASH 763a5646fa6eef7a22f4895bca0524f2)
 
 set(LAME_VERSION 3.100)
 set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
 set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
-set(LAME_HASH_TYPE MD5)
-set(LAME_FILE lame-${LAME_VERSION}.tar.gz)
-set(LAME_CPE "cpe:2.3:a:lame_project:lame:${LAME_VERSION}:*:*:*:*:*:*:*")
 
-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_TYPE SHA256)
-set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
+set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
 
-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_TYPE SHA256)
-set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_CPE "cpe:2.3:a:xiph.org:libvorbis:${VORBIS_VERSION}:*:*:*:*:*:*:*")
+set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
 
 set(THEORA_VERSION 1.1.1)
 set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2)
 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_TYPE SHA256)
-set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_CPE "cpe:2.3:a:flac_project:flac:${FLAC_VERSION}:*:*:*:*:*:*:*")
+set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
 
-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_TYPE SHA256)
-set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
-set(VPX_CPE "cpe:2.3:a:webmproject:libvpx:${VPX_VERSION}:*:*:*:*:*:*:*")
+set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
 
 set(OPUS_VERSION 1.3.1)
 set(OPUS_URI https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz)
 set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
-set(OPUS_HASH_TYPE SHA256)
-set(OPUS_FILE opus-${OPUS_VERSION}.tar.gz)
 
-set(X264_VERSION 33f9e1474613f59392be5ab6a7e7abf60fa63622)
-set(X264_URI https://code.videolan.org/videolan/x264/-/archive/${X264_VERSION}/x264-${X264_VERSION}.tar.gz)
+set(X264_URI https://code.videolan.org/videolan/x264/-/archive/33f9e1474613f59392be5ab6a7e7abf60fa63622/x264-33f9e1474613f59392be5ab6a7e7abf60fa63622.tar.gz)
 set(X264_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
-set(X264_HASH_TYPE SHA256)
-set(X264_FILE x264-${X264_VERSION}.tar.gz)
 
 set(XVIDCORE_VERSION 1.3.7)
 set(XVIDCORE_URI https://downloads.xvid.com/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
 set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d)
-set(XVIDCORE_HASH_TYPE SHA256)
-set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
 
-set(OPENJPEG_VERSION 2.5.0)
-set(OPENJPEG_SHORT_VERSION 2.5)
+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 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a)
-set(OPENJPEG_HASH_TYPE SHA256)
-set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_CPE "cpe:2.3:a:uclouvain:openjpeg:${OPENJPEG_VERSION}:*:*:*:*:*:*:*")
+set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
 
-set(FFMPEG_VERSION 4.4.3)
+set(FFMPEG_VERSION 4.2.3)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 set(FFMPEG_HASH 695fad11f3baf27784e24cb0e977b65a)
-set(FFMPEG_HASH_TYPE MD5)
-set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_CPE "cpe:2.3:a:ffmpeg:ffmpeg:${FFMPEG_VERSION}:*:*:*:*:*:*:*")
 
 set(FFTW_VERSION 3.3.8)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
 set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
-set(FFTW_HASH_TYPE MD5)
-set(FFTW_FILE fftw-${FFTW_VERSION}.tar.gz)
 
 set(ICONV_VERSION 1.16)
 set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)
 set(ICONV_HASH 7d2a800b952942bb2880efb00cfd524c)
-set(ICONV_HASH_TYPE MD5)
-set(ICONV_FILE libiconv-${ICONV_VERSION}.tar.gz)
 
-set(SNDFILE_VERSION 1.1.0)
-set(SNDFILE_URI https://github.com/libsndfile/libsndfile/releases/download/1.1.0/libsndfile-${SNDFILE_VERSION}.tar.xz)
-set(SNDFILE_HASH e63dead2b4f0aaf323687619d007ee6a)
-set(SNDFILE_HASH_TYPE MD5)
-set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
-set(SNDFILE_CPE "cpe:2.3:a:libsndfile_project:libsndfile:${SNDFILE_VERSION}:*:*:*:*:*:*:*")
+set(SNDFILE_VERSION 1.0.28)
+set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
+set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
 
-set(WEBP_VERSION 1.2.2)
+# set(HIDAPI_VERSION 0.8.0-rc1)
+# set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
+# set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
+
+set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
+set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
+set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)
+
+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_TYPE MD5)
-set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_CPE "cpe:2.3:a:webmproject:libwebp:${WEBP_VERSION}:*:*:*:*:*:*:*")
+set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
 
 set(SPNAV_VERSION 0.2.3)
 set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
 set(SPNAV_HASH 44d840540d53326d4a119c0f1aa7bf0a)
-set(SPNAV_HASH_TYPE MD5)
-set(SPNAV_FILE libspnav-${SPNAV_VERSION}.tar.gz)
 
 set(JEMALLOC_VERSION 5.2.1)
 set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2)
 set(JEMALLOC_HASH 3d41fbf006e6ebffd489bdb304d009ae)
-set(JEMALLOC_HASH_TYPE MD5)
-set(JEMALLOC_FILE jemalloc-${JEMALLOC_VERSION}.tar.bz2)
 
-set(XML2_VERSION 2.10.3)
-set(XML2_URI https://download.gnome.org/sources/libxml2/2.10/libxml2-${XML2_VERSION}.tar.xz)
-set(XML2_HASH f9edac7fac232b3657a003fd9a5bbe42)
-set(XML2_HASH_TYPE MD5)
-set(XML2_FILE libxml2-${XML2_VERSION}.tar.xz)
-set(XML2_CPE "cpe:2.3:a:xmlsoft:libxml2:${XML2_VERSION}:*:*:*:*:*:*:*")
+set(XML2_VERSION 2.9.10)
+set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
+set(XML2_HASH 10942a1dc23137a8aa07f0639cbfece5)
+
+set(TINYXML_VERSION 2_6_2)
+set(TINYXML_VERSION_DOTS 2.6.2)
+set(TINYXML_URI https://nchc.dl.sourceforge.net/project/tinyxml/tinyxml/${TINYXML_VERSION_DOTS}/tinyxml_${TINYXML_VERSION}.tar.gz)
+set(TINYXML_HASH c1b864c96804a10526540c664ade67f0)
 
 set(YAMLCPP_VERSION 0.6.3)
 set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
 set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
-set(YAMLCPP_HASH_TYPE MD5)
-set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
-set(YAMLCPP "cpe:2.3:a:yaml-cpp_project:yaml-cpp:${YAMLCPP_VERSION}:*:*:*:*:*:*:*")
 
-set(EXPAT_VERSION 2_5_0)
-set(EXPAT_VERSION_DOTS 2.5.0)
-set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
-set(EXPAT_HASH d375fa3571c0abb945873f5061a8f2e2)
-set(EXPAT_HASH_TYPE MD5)
-set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
-set(EXPAT_CPE "cpe:2.3:a:libexpat_project:libexpat:${EXPAT_VERSION_DOTS}:*:*:*:*:*:*:*")
+set(LCMS_VERSION 2.9)
+set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz)
+set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e)
 
 set(PUGIXML_VERSION 1.10)
 set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.gz)
 set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
-set(PUGIXML_HASH_TYPE MD5)
-set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
-set(PUGIXML_CPE "cpe:2.3:a:pugixml_project:pugixml:${PUGIXML_VERSION}:*:*:*:*:*:*:*")
 
 set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
 set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-set(FLEXBISON_HASH_TYPE MD5)
-set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
 # Libraries to keep Python modules static on Linux.
 
 # NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
 # sources from Debian packaging.
-#
-# NOTE 2: This will *HAVE* to match the version python ships on windows which
-# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
-# can be no exceptions to this.
 set(BZIP2_VERSION 1.0.8)
 set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.gz)
 set(BZIP2_HASH ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269)
-set(BZIP2_HASH_TYPE SHA256)
-set(BZIP2_FILE bzip2_${BZIP2_VERSION}.orig.tar.gz)
-set(BZIP2_CPE "cpe:2.3:a:bzip:bzip2:${BZIP2_VERSION}:*:*:*:*:*:*:*")
 
-# NOTE: This will *HAVE* to match the version python ships on windows which
-# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
-# can be no exceptions to this.
 set(FFI_VERSION 3.3)
 set(FFI_URI https://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
 set(FFI_HASH 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056)
-set(FFI_HASH_TYPE SHA256)
-set(FFI_FILE libffi-${FFI_VERSION}.tar.gz)
-set(FFI_CPE "cpe:2.3:a:libffi_project:libffi:${FFI_VERSION}:*:*:*:*:*:*:*")
 
 set(LZMA_VERSION 5.2.5)
 set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
 set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
-set(LZMA_HASH_TYPE SHA256)
-set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
 
-# NOTE: This will *HAVE* to match the version python ships on windows which
-# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
-# can be no exceptions to this.
-set(SSL_VERSION 1.1.1q)
+set(SSL_VERSION 1.1.1g)
 set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-set(SSL_HASH d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca)
-set(SSL_HASH_TYPE SHA256)
-set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
-set(SSL_CPE "cpe:2.3:a:openssl:openssl:${SSL_VERSION}:*:*:*:*:*:*:*")
+set(SSL_HASH ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46)
 
-# Note: This will *HAVE* to match the version python ships on windows which
-# is hardcoded in pythons PCbuild/get_externals.bat for compliance reasons there
-# can be no exceptions to this.
-set(SQLITE_VERSION 3.37.2)
-set(SQLLITE_LONG_VERSION 3370200)
-set(SQLITE_URI https://www.sqlite.org/2022/sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
-set(SQLITE_HASH e56faacadfb4154f8fbd0f2a3f827d13706b70a1)
-set(SQLITE_HASH_TYPE SHA1)
-set(SQLITE_FILE sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
-set(SQLITE_CPE "cpe:2.3:a:sqlite:sqlite:${SQLITE_VERSION}:*:*:*:*:*:*:*")
+set(SQLITE_VERSION 3.31.1)
+set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
+set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 
 set(EMBREE_VERSION 3.10.0)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
 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 21.02)
+set(USD_VERSION 20.05)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
-set(USD_HASH_TYPE MD5)
-set(USD_FILE usd-v${USD_VERSION}.tar.gz)
+set(USD_HASH 6d679e739e7f65725d9c029e37dda9fc)
 
-set(OIDN_VERSION 1.3.0)
+set(OIDN_VERSION 1.2.3)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 301a5a0958d375a942014df0679b9270)
-set(OIDN_HASH_TYPE MD5)
-set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
+set(OIDN_HASH 1f11466c2c3efc27faba5ec7078d12b2)
 
 set(LIBGLU_VERSION 9.0.1)
 set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz)
 set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
-set(LIBGLU_HASH_TYPE MD5)
-set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
-set(MESA_VERSION 20.3.4)
-set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
-set(MESA_HASH_TYPE MD5)
-set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
-set(MESA_CPE "cpe:2.3:a:mesa3d:mesa:${MESA_VERSION}:*:*:*:*:*:*:*")
+set(MESA_VERSION 18.3.1)
+set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
+set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
 
 set(NASM_VERSION 2.15.02)
-set(NASM_URI https://github.com/netwide-assembler/nasm/archive/nasm-${NASM_VERSION}.tar.gz)
-set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
-set(NASM_HASH_TYPE SHA256)
-set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
-set(NASM_PCE "cpe:2.3:a:nasm:nasm:${NASM_VERSION}:*:*:*:*:*:*:*")
+set(NASM_URI https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz)
+set(NASM_HASH f4fd1329b1713e1ccd34b2fc121c4bcd278c9f91cc4cb205ae8fcd2e4728dd14)
 
-set(XR_OPENXR_SDK_VERSION 1.0.14)
+set(XR_OPENXR_SDK_VERSION 1.0.8)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
-set(XR_OPENXR_SDK_HASH_TYPE MD5)
-set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
+set(XR_OPENXR_SDK_HASH c6de63d2e0f9029aa58dfa97cad8ce07)
 
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  # Unreleased version with macOS arm support.
-  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
-  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
-else()
-  set(ISPC_VERSION v1.14.1)
-  set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-  set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
-endif()
+set(ISPC_VERSION v1.14.1)
+set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
+set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
 set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1)
-set(GMP_HASH_TYPE MD5)
-set(GMP_FILE gmp-${GMP_VERSION}.tar.xz)
-set(GMP_CPE "cpe:2.3:a:gmplib:gmp:${GMP_VERSION}:*:*:*:*:*:*:*")
 
 set(POTRACE_VERSION 1.16)
 set(POTRACE_URI http://potrace.sourceforge.net/download/${POTRACE_VERSION}/potrace-${POTRACE_VERSION}.tar.gz)
 set(POTRACE_HASH 5f0bd87ddd9a620b0c4e65652ef93d69)
-set(POTRACE_HASH_TYPE MD5)
-set(POTRACE_FILE potrace-${POTRACE_VERSION}.tar.gz)
-set(POTRACE_CPE "cpe:2.3:a:icoasoft:potrace:${POTRACE_VERSION}:*:*:*:*:*:*:*")
-
-set(HARU_VERSION 2_3_0)
-set(HARU_URI https://github.com/libharu/libharu/archive/RELEASE_${HARU_VERSION}.tar.gz)
-set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
-set(HARU_HASH_TYPE MD5)
-set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
-
-set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
-set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/vorbis.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_vorbis
-  URL file://${PACKAGE_DIR}/${VORBIS_FILE}
+  URL ${VORBIS_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
+  URL_HASH SHA256=${VORBIS_HASH}
   PREFIX ${BUILD_DIR}/vorbis
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
     --disable-shared

build_files/build_environment/cmake/vpx.cmake

@@ -35,9 +35,9 @@ else()
 endif()
 
 ExternalProject_Add(external_vpx
-  URL file://${PACKAGE_DIR}/${VPX_FILE}
+  URL ${VPX_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${VPX_HASH_TYPE}=${VPX_HASH}
+  URL_HASH SHA256=${VPX_HASH}
   PREFIX ${BUILD_DIR}/vpx
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/vpx/src/external_vpx/ &&

build_files/build_environment/cmake/webp.cmake

@@ -32,9 +32,9 @@ else()
 endif()
 
 ExternalProject_Add(external_webp
-  URL file://${PACKAGE_DIR}/${WEBP_FILE}
+  URL ${WEBP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WEBP_HASH_TYPE}=${WEBP_HASH}
+  URL_HASH MD5=${WEBP_HASH}
   PREFIX ${BUILD_DIR}/webp
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/webp

build_files/build_environment/cmake/x264.cmake

@@ -41,9 +41,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 ExternalProject_Add(external_x264
-  URL file://${PACKAGE_DIR}/${X264_FILE}
+  URL ${X264_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${X264_HASH_TYPE}=${X264_HASH}
+  URL_HASH SHA256=${X264_HASH}
   PREFIX ${BUILD_DIR}/x264
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ &&
     ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264

build_files/build_environment/cmake/xml2.cmake

@@ -16,49 +16,21 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(WIN32)
-  set(XML2_EXTRA_ARGS 
-    -DLIBXML2_WITH_ZLIB=OFF
-    -DLIBXML2_WITH_LZMA=OFF
-    -DLIBXML2_WITH_PYTHON=OFF
-    -DLIBXML2_WITH_ICONV=OFF
-    -DLIBXML2_WITH_TESTS=OFF
-    -DLIBXML2_WITH_PROGRAMS=OFF
-    -DBUILD_SHARED_LIBS=OFF
-  )
-  ExternalProject_Add(external_xml2
-    URL file://${PACKAGE_DIR}/${XML2_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xml2 ${DEFAULT_CMAKE_FLAGS} ${XML2_EXTRA_ARGS}
-    PREFIX ${BUILD_DIR}/xml2
-    INSTALL_DIR ${LIBDIR}/xml2
-  )
-else()
-  ExternalProject_Add(external_xml2
-    URL file://${PACKAGE_DIR}/${XML2_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
-    PREFIX ${BUILD_DIR}/xml2
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
-      --prefix=${LIBDIR}/xml2
-      --disable-shared
-      --enable-static
-      --with-pic
-      --with-python=no
-      --with-lzma=no
-      --with-zlib=no
-      --with-iconv=no
-    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
-    INSTALL_DIR ${LIBDIR}/xml2
-  )
-endif()
-
-if(WIN32 AND BUILD_MODE STREQUAL Release)
-  ExternalProject_Add_Step(external_xml2 after_install
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xml2/include  ${HARVEST_TARGET}/xml2/include
-        COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xml2/lib/libxml2s.lib  ${HARVEST_TARGET}/xml2/lib/libxml2s.lib
-    DEPENDEES install
-  )
-endif()
+ExternalProject_Add(external_xml2
+  URL ${XML2_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${XML2_HASH}
+  PREFIX ${BUILD_DIR}/xml2
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
+    --prefix=${LIBDIR}/xml2
+    --disable-shared
+    --enable-static
+    --with-pic
+    --with-python=no
+    --with-lzma=no
+    --with-zlib=no
+    --with-iconv=no
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
+  INSTALL_DIR ${LIBDIR}/xml2
+)

build_files/build_environment/cmake/xr_openxr.cmake

@@ -35,9 +35,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 ExternalProject_Add(external_xr_openxr_sdk
-  URL file://${PACKAGE_DIR}/${XR_OPENXR_SDK_FILE}
+  URL ${XR_OPENXR_SDK_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XR_OPENXR_SDK_HASH_TYPE}=${XR_OPENXR_SDK_HASH}
+  URL_HASH MD5=${XR_OPENXR_SDK_HASH}
   PREFIX ${BUILD_DIR}/xr_openxr_sdk
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/xr_openxr_sdk
@@ -53,7 +53,7 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loaderd.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loaderd.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loader_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/xvidcore.cmake

@@ -21,9 +21,9 @@ if(WIN32)
 endif()
 
 ExternalProject_Add(external_xvidcore
-  URL file://${PACKAGE_DIR}/${XVIDCORE_FILE}
+  URL ${XVIDCORE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XVIDCORE_HASH_TYPE}=${XVIDCORE_HASH}
+  URL_HASH SHA256=${XVIDCORE_HASH}
   PREFIX ${BUILD_DIR}/xvidcore
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}

build_files/build_environment/cmake/yamlcpp.cmake

@@ -17,22 +17,17 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(YAMLCPP_EXTRA_ARGS
+  -DBUILD_GMOCK=OFF
   -DYAML_CPP_BUILD_TESTS=OFF
   -DYAML_CPP_BUILD_TOOLS=OFF
   -DYAML_CPP_BUILD_CONTRIB=OFF
+  -DYAML_MSVC_SHARED_RT=ON
 )
 
-if(WIN32)
-  set(YAMLCPP_EXTRA_ARGS
-    ${YAMLCPP_EXTRA_ARGS}
-    -DBUILD_GMOCK=OFF
-    -DYAML_MSVC_SHARED_RT=ON)
-endif()
-
 ExternalProject_Add(external_yamlcpp
-  URL file://${PACKAGE_DIR}/${YAMLCPP_FILE}
+  URL ${YAMLCPP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
+  URL_HASH MD5=${YAMLCPP_HASH}
   PREFIX ${BUILD_DIR}/yamlcpp
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/yamlcpp

build_files/build_environment/cmake/zlib.cmake

@@ -17,8 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib
-  URL file://${PACKAGE_DIR}/${ZLIB_FILE}
-  URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
+  URL ${ZLIB_URI}
+  URL_HASH MD5=${ZLIB_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/zlib
   CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
   INSTALL_DIR ${LIBDIR}/zlib

build_files/build_environment/cmake/zlib_mingw.cmake

@@ -17,8 +17,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib_mingw
-  URL file://${PACKAGE_DIR}/${ZLIB_FILE}
-  URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
+  URL ${ZLIB_URI}
+  URL_HASH MD5=${ZLIB_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/zlib_mingw
   CONFIGURE_COMMAND echo .

build_files/build_environment/dependencies.dot

@@ -1,76 +1,38 @@
 strict graph {
-graph[autosize = false, size = "25.7,8.3!", resolution = 300];
+graph[autosize = false, size = "25.7,8.3!", resolution = 300, overlap = false, splines = false, outputorder=edgesfirst ];
+	node [style=filled fillcolor=white];
+	external_alembic -- external_boost;
+	external_alembic -- external_zlib;
 	external_alembic -- external_openexr;
-	external_alembic -- external_imath;
 	external_blosc -- external_zlib;
 	external_blosc -- external_pthreads;
-	external_boost -- external_python;
-	external_boost -- external_numpy;
-	external_dpcpp -- external_python;
-	external_dpcpp -- external_python_site_packages;
-	external_dpcpp -- external_vcintrinsics;
-	external_dpcpp -- external_openclheaders;
-	external_dpcpp -- external_icdloader;
-	external_dpcpp -- external_mp11;
-	external_dpcpp -- external_level_zero;
-	external_dpcpp -- external_spirvheaders;
-	external_embree -- external_tbb;
+	external_boost -- Make_Python_Environment;
+	external_clang -- ll;
 	external_ffmpeg -- external_zlib;
+	external_ffmpeg -- external_faad;
 	external_ffmpeg -- external_openjpeg;
 	external_ffmpeg -- external_xvidcore;
 	external_ffmpeg -- external_x264;
-	external_ffmpeg -- external_opus;
 	external_ffmpeg -- external_vpx;
 	external_ffmpeg -- external_theora;
 	external_ffmpeg -- external_vorbis;
 	external_ffmpeg -- external_ogg;
 	external_ffmpeg -- external_lame;
-	external_ffmpeg -- external_aom;
 	external_ffmpeg -- external_zlib_mingw;
-	external_ffmpeg -- external_nasm;
-	external_freetype -- external_brotli;
-	external_freetype -- external_zlib;
-	external_gmpxx -- external_gmp;
-	external_igc_llvm -- external_igc_opencl_clang;
-	external_igc_spirv_translator -- external_igc_opencl_clang;
-	external_igc -- external_igc_vcintrinsics;
-	external_igc -- external_igc_llvm;
-	external_igc -- external_igc_opencl_clang;
-	external_igc -- external_igc_vcintrinsics;
-	external_igc -- external_igc_spirv_headers;
-	external_igc -- external_igc_spirv_tools;
-	external_igc -- external_igc_spirv_translator;
-	external_igc -- external_flex;
-	external_ispc -- ll;
-	external_ispc -- external_python;
-	external_ispc -- external_flexbison;
-	external_ispc -- external_flex;
-	ll -- external_xml2;
-	ll -- external_python;
-	external_mesa -- ll;
-	external_numpy -- external_python;
-	external_numpy -- external_python_site_packages;
-	external_ocloc -- external_igc;
-	external_ocloc -- external_gmmlib;
+	external_numpy -- Make_Python_Environment;
 	external_opencollada -- external_xml2;
+	external_opencolorio -- external_boost;
+	external_opencolorio -- external_tinyxml;
 	external_opencolorio -- external_yamlcpp;
-	external_opencolorio -- external_expat;
-	external_opencolorio -- external_imath;
-	external_opencolorio -- external_pystring;
 	external_openexr -- external_zlib;
-	external_openimagedenoise -- external_tbb;
-	external_openimagedenoise -- external_ispc;
-	external_openimagedenoise -- external_python;
 	external_openimageio -- external_png;
 	external_openimageio -- external_zlib;
 	external_openimageio -- external_openexr;
-	external_openimageio -- external_imath;
+	external_openimageio -- external_openexr;
 	external_openimageio -- external_jpeg;
 	external_openimageio -- external_boost;
 	external_openimageio -- external_tiff;
-	external_openimageio -- external_pugixml;
-	external_openimageio -- external_fmt;
-	external_openimageio -- external_robinmap;
+	external_openimageio -- external_opencolorio;
 	external_openimageio -- external_openjpeg;
 	external_openimageio -- external_webp;
 	external_openimageio -- external_opencolorio_extra;
@@ -82,37 +44,57 @@ graph[autosize = false, size = "25.7,8.3!", resolution = 300];
 	external_opensubdiv -- external_tbb;
 	openvdb -- external_tbb;
 	openvdb -- external_boost;
+	openvdb -- external_openexr;
+	openvdb -- external_openexr;
 	openvdb -- external_zlib;
 	openvdb -- external_blosc;
 	external_osl -- external_boost;
 	external_osl -- ll;
+	external_osl -- external_clang;
+	external_osl -- external_openexr;
 	external_osl -- external_openexr;
 	external_osl -- external_zlib;
+	external_osl -- external_flexbison;
 	external_osl -- external_openimageio;
 	external_osl -- external_pugixml;
-	external_osl -- external_flexbison;
-	external_osl -- external_flex;
 	external_png -- external_zlib;
-	external_python -- external_bzip2;
-	external_python -- external_ffi;
-	external_python -- external_lzma;
-	external_python -- external_ssl;
-	external_python -- external_sqlite;
-	external_python -- external_zlib;
-	external_python_site_packages -- external_python;
+	external_python_site_packages -- Make_Python_Environment;
 	external_sndfile -- external_ogg;
 	external_sndfile -- external_vorbis;
 	external_sndfile -- external_flac;
 	external_theora -- external_vorbis;
 	external_theora -- external_ogg;
 	external_tiff -- external_zlib;
-	external_usd -- external_tbb;
-	external_usd -- external_boost;
-	external_usd -- external_opensubdiv;
 	external_vorbis -- external_ogg;
-	external_wayland -- external_expat;
-	external_wayland -- external_xml2;
-	external_wayland -- external_ffi;
-	external_wayland_protocols -- external_wayland;
-	external_x264 -- external_nasm;
+	blender-- external_ffmpeg;
+	blender-- external_alembic;
+	blender-- external_openjpeg;
+	blender-- external_opencolorio;
+	blender-- external_openexr;
+	blender-- external_opensubdiv;
+	blender-- openvdb;
+	blender-- external_osl;
+	blender-- external_boost;
+	blender-- external_jpeg;
+	blender-- external_png;
+	blender-- external_python;
+	blender-- external_sndfile;
+	blender-- external_iconv;
+	blender-- external_fftw3;
+	external_python-- external_python_site_packages;
+	external_python_site_packages-- requests;
+	external_python_site_packages-- idna;
+	external_python_site_packages-- chardet;
+	external_python_site_packages-- urllib3;
+	external_python_site_packages-- certifi;
+	external_python-- external_numpy;
+	external_usd-- external_boost;
+	external_usd-- external_tbb;
+	blender-- external_opencollada;
+	blender-- external_sdl;
+	blender-- external_freetype;
+	blender-- external_pthreads;
+	blender-- external_zlib;
+	blender-- external_openal;
+    blender-- external_usd;
 }

build_files/build_environment/patches/aom.diff

@@ -1,18 +0,0 @@
-diff -Naur libaom-3.4.0/build/cmake/aom_configure.cmake external_aom/build/cmake/aom_configure.cmake
---- libaom-3.4.0/build/cmake/aom_configure.cmake	2022-06-17 11:46:18 -0600
-+++ external_aom/build/cmake/aom_configure.cmake	2022-10-16 15:35:54 -0600
-@@ -15,8 +15,12 @@
- 
- include(FindGit)
- include(FindPerl)
--include(FindThreads)
--
-+# Blender: This will drag in a dep on libwinpthreads which we prefer
-+# not to have, aom will fallback on a native win32 thread wrapper
-+# if pthreads are not found.
-+if(NOT WIN32)
-+  include(FindThreads)
-+endif()
- include("${AOM_ROOT}/build/cmake/aom_config_defaults.cmake")
- include("${AOM_ROOT}/build/cmake/aom_experiment_deps.cmake")
- include("${AOM_ROOT}/build/cmake/aom_optimization.cmake")

build_files/build_environment/patches/cmakelists_tbb.txt

@@ -20,7 +20,6 @@ if(APPLE)
 endif()
 
 file(GLOB tbb_src "${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/old/*.cpp")
-list(REMOVE_ITEM tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/tbb_bind.cpp)
 list(APPEND tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/rml/client/rml_tbb.cpp)
 file(GLOB to_remove "${CMAKE_CURRENT_SOURCE_DIR}/src/old/test*.cpp")
 list(REMOVE_ITEM tbb_src ${to_remove})

build_files/build_environment/patches/ffmpeg.diff

@@ -68,18 +68,3 @@
 +
      return ret;
  }
-diff --git a/libavcodec/x86/simple_idct.asm b/libavcodec/x86/simple_idct.asm
-index dcf0da6df121..982b2f0bbba1 100644
---- a/libavcodec/x86/simple_idct.asm
-+++ b/libavcodec/x86/simple_idct.asm
-@@ -25,9 +25,9 @@
- 
- %include "libavutil/x86/x86util.asm"
- 
--%if ARCH_X86_32
- SECTION_RODATA
- 
-+%if ARCH_X86_32
- cextern pb_80
- 
- wm1010: dw 0, 0xffff, 0, 0xffff

build_files/build_environment/patches/gmp.diff

@@ -1,15 +0,0 @@
---- a/mpz/inp_raw.c	Tue Dec 22 23:49:51 2020 +0100
-+++ b/mpz/inp_raw.c	Thu Oct 21 19:06:49 2021 +0200
-@@ -88,8 +88,11 @@
-
-   abs_csize = ABS (csize);
-
-+  if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
-+    return 0; /* Bit size overflows */
-+
-   /* round up to a multiple of limbs */
--  abs_xsize = BITS_TO_LIMBS (abs_csize*8);
-+  abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);
-
-   if (abs_xsize != 0)
-     {

build_files/build_environment/patches/haru.diff

@@ -1,12 +0,0 @@
-diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c
-index 8672763..9be531a 100644
---- a/src/hpdf_image_ccitt.c
-+++ b/src/hpdf_image_ccitt.c
-@@ -21,7 +21,6 @@
- #include <memory.h>
- #include <assert.h>
- 
--#define	G3CODES
- #include "t4.h"
- 
- typedef unsigned int uint32;

build_files/build_environment/patches/llvm.diff

@@ -1,5 +1,5 @@
---- a/llvm/lib/Support/Unix/Path.inc	2020-02-17 09:24:26.000000000 +0100
-+++ b/llvm/lib/Support/Unix/Path.inc	2020-02-17 09:26:25.000000000 +0100
+--- a/lib/Support/Unix/Path.inc	2020-02-17 09:24:26.000000000 +0100
++++ b/lib/Support/Unix/Path.inc	2020-02-17 09:26:25.000000000 +0100
 @@ -1200,7 +1200,9 @@
  /// implementation.
  std::error_code copy_file(const Twine &From, const Twine &To) {

build_files/build_environment/patches/oidn.diff

@@ -1,40 +0,0 @@
-diff -Naur oidn-1.3.0/cmake/FindTBB.cmake external_openimagedenoise/cmake/FindTBB.cmake
---- oidn-1.3.0/cmake/FindTBB.cmake	2021-02-04 16:20:26 -0700
-+++ external_openimagedenoise/cmake/FindTBB.cmake	2021-02-12 09:35:53 -0700
-@@ -332,20 +332,22 @@
-       ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER}
-       ${TBB_ROOT}/lib
-     )
--
-     # On Windows, also search the DLL so that the client may install it.
-     file(GLOB DLL_NAMES
-       ${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME}.dll
-       ${TBB_ROOT}/bin/${LIB_NAME}.dll
-+      ${TBB_ROOT}/lib/${LIB_NAME}.dll
-       ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME}.dll
-       ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME_GLOB1}.dll
-       ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME_GLOB2}.dll
-       ${TBB_ROOT}/../redist/${TBB_ARCH}/tbb/${TBB_VCVER}/${LIB_NAME}.dll
-       ${TBB_ROOT}/../redist/${TBB_ARCH}_win/tbb/${TBB_VCVER}/${LIB_NAME}.dll
-     )
--    list(GET DLL_NAMES 0 DLL_NAME)
--    get_filename_component(${BIN_DIR_VAR} "${DLL_NAME}" DIRECTORY)
--    set(${DLL_VAR} "${DLL_NAME}" CACHE PATH "${COMPONENT_NAME} ${BUILD_CONFIG} dll path")
-+    if (DLL_NAMES) 
-+        list(GET DLL_NAMES 0 DLL_NAME)
-+        get_filename_component(${BIN_DIR_VAR} "${DLL_NAME}" DIRECTORY)
-+        set(${DLL_VAR} "${DLL_NAME}" CACHE PATH "${COMPONENT_NAME} ${BUILD_CONFIG} dll path")
-+    endif()
-   elseif(APPLE)
-     set(LIB_PATHS ${TBB_ROOT}/lib)
-   else()
---- external_openimagedenoise/cmake/oidn_ispc.cmake	2021-02-15 17:29:34.000000000 +0100
-+++ external_openimagedenoise/cmake/oidn_ispc.cmake2	2021-02-15 17:29:28.000000000 +0100
-@@ -98,7 +98,7 @@
-   elseif(OIDN_ARCH STREQUAL "ARM64")
-     set(ISPC_ARCHITECTURE "aarch64")
-     if(APPLE)
--      set(ISPC_TARGET_OS "--target-os=ios")
-+      set(ISPC_TARGET_OS "--target-os=macos")
-     endif()
-   endif()

build_files/build_environment/patches/opencollada.diff

@@ -130,28 +130,3 @@ index 715d903..24423ce 100644
  		{
  			string id = node.attribute("id").value();
  			size_t line = node.line();
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -274,7 +274,7 @@
- add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
- add_subdirectory(common/libBuffer)
- add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
--add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
-+#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
- 
- # building OpenCOLLADA libs
- add_subdirectory(COLLADABaseUtils)
-@@ -284,10 +284,10 @@
- add_subdirectory(COLLADAStreamWriter)
- 
- # building COLLADAValidator app
--add_subdirectory(COLLADAValidator)
-+#add_subdirectory(COLLADAValidator)
- 
- # DAE validator app
--add_subdirectory(DAEValidator)
-+#add_subdirectory(DAEValidator)
- 
- # Library export
- install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake)

build_files/build_environment/patches/opencolorio.diff

@@ -1,16 +1,33 @@
-diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake
-index 7b894a45..92618215 100644
---- a/share/cmake/modules/Findpystring.cmake
-+++ b/share/cmake/modules/Findpystring.cmake
-@@ -113,6 +113,11 @@ if(NOT pystring_FOUND)
-             -DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
-             -DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
-             -DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
-+            -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-+            -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-+            -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-+            -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-+            -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 1eb691b..cff9bd8 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -23,8 +23,6 @@ if(WIN32)
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+         set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+     endif()
+-else()
+-    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+ endif()
+ 
+ # SHARED
+--- a/CMakeLists.txt	2018-09-10 22:15:29.000000000 +0200
++++ b/CMakeLists.txt	2018-09-10 22:17:40.000000000 +0200
+@@ -229,7 +229,7 @@
+             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${TINYXML_PATCHFILE}
+             BINARY_DIR      ext/build/tinyxml
+             INSTALL_DIR     ext/dist
+-            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS}
++            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
          )
-         if(CMAKE_TOOLCHAIN_FILE)
-             set(pystring_CMAKE_ARGS
+         if(WIN32)
+             set(TINYXML_STATIC_LIBRARIES  ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
+@@ -343,7 +343,7 @@
+             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${YAML_CPP_PATCHFILE}
+             BINARY_DIR      ext/build/yaml-cpp
+             INSTALL_DIR     ext/dist
+-            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS}
++            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+         )
+         set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
+         set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)

build_files/build_environment/patches/opencolorio_win.diff

@@ -0,0 +1,51 @@
+diff -Naur external_opencolorio/CMakeLists.txt external_opencolorio.patched/CMakeLists.txt
+--- external_opencolorio/CMakeLists.txt	2018-01-04 18:38:27 -0700
++++ external_opencolorio.patched/CMakeLists.txt	2018-08-15 11:46:53 -0600
+@@ -251,25 +251,30 @@
+ if(USE_EXTERNAL_YAML)
+     # Set minimum yaml version for non-patched sources.
+     set(YAML_VERSION_MIN "0.3.0")
+-    include(FindPkgConfig)
+-    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
+-    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
+-        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
+-    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
+-        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
+-    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
+-    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
+-    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
++    if(NOT WIN32)
++		include(FindPkgConfig)
++		pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
++		find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
++			HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
++		find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
++			HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
++		set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
++		set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
++		set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
+ 
+-    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
+-        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
+-    endif()
+-
+-    find_package_handle_standard_args(yaml-cpp
+-                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
+-    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
+-    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
++		if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
++			message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
++		endif()
+ 
++		find_package_handle_standard_args(yaml-cpp
++										  REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
++		set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
++		mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
++	else()
++		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_1})
++		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_2})
++		message("INCLUDE DIRS = i:${EXTERNAL_INCLUDE_DIRS} |1:${INC_1} |2:${INC_2}")
++	endif()
+     if(YAML_CPP_FOUND)
+         if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
+             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.

build_files/build_environment/patches/openimageio.diff

@@ -34,24 +34,3 @@ diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/incl
  #    include <windows.h>
  #endif
  
-diff -Naur orig/src/libutil/ustring.cpp external_openimageio/src/libutil/ustring.cpp
---- orig/src/libutil/ustring.cpp	2020-05-11 05:43:52.000000000 +0200
-+++ external_openimageio/src/libutil/ustring.cpp	2020-11-26 12:06:08.000000000 +0100
-@@ -337,6 +337,8 @@
-     // the std::string to make it point to our chars!  In such a case, the
-     // destructor will be careful not to allow a deallocation.
- 
-+    // Disable internal std::string for Apple silicon based Macs
-+#if !(defined(__APPLE__) && defined(__arm64__))
- #if defined(__GNUC__) && !defined(_LIBCPP_VERSION)                             \
-     && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI
-     // NEW gcc ABI
-@@ -382,7 +384,7 @@
-         return;
-     }
- #endif
--
-+#endif
-     // Remaining cases - just assign the internal string.  This may result
-     // in double allocation for the chars.  If you care about that, do
-     // something special for your platform, much like we did for gcc and

build_files/build_environment/patches/openvdb.diff

@@ -1,10 +1,10 @@
-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")
+diff -Naur orig/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
+--- orig/cmake/FindIlmBase.cmake	2019-12-06 12:11:33 -0700
++++ openvdb/cmake/FindIlmBase.cmake	2020-08-12 12:48:44 -0600
+@@ -225,6 +225,12 @@
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
+     "-${IlmBase_VERSION_MAJOR}_${IlmBase_VERSION_MINOR}.lib"
+   )
 +  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
 +    "_s.lib"
 +  )
@@ -13,14 +13,14 @@ diff -Naur openvdb-8.0.0/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
 +  )
  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
+diff -Naur orig/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
+--- orig/cmake/FindOpenEXR.cmake	2019-12-06 12:11:33 -0700
++++ openvdb/cmake/FindOpenEXR.cmake	2020-08-12 12:48:44 -0600
+@@ -218,6 +218,12 @@
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
+     "-${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}.lib"
+   )
 +  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
 +    "_s.lib"
 +  )
@@ -29,11 +29,11 @@ diff -Naur openvdb-8.0.0/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
 +  )
  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
-@@ -107,7 +107,9 @@
+     list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
+diff -Naur orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
+--- orig/openvdb/CMakeLists.txt	2019-12-06 12:11:33 -0700
++++ openvdb/openvdb/CMakeLists.txt	2020-08-12 14:12:26 -0600
+@@ -105,7 +105,9 @@
    #        http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
    #        https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
    set(BUILD_SHARED_LIBS ON)
@@ -44,15 +44,15 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/
  endif()
  
  find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
-@@ -146,6 +148,7 @@
-         Boost::disable_autolinking  # add -DBOOST_ALL_NO_LIB
-       )
+@@ -193,6 +195,7 @@
+   if(OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
+     add_definitions(-DBOOST_ALL_NO_LIB)
    endif()
 +  add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -DOPENVDB_OPENEXR_STATICLIB)
  endif()
  
- if(USE_EXR)
-@@ -379,7 +382,12 @@
+ # @todo Should be target definitions
+@@ -383,7 +386,12 @@
  # imported targets.
  
  if(OPENVDB_CORE_SHARED)
@@ -66,9 +66,9 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/
  endif()
  
  if(OPENVDB_CORE_STATIC)
-diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/version.rc.in
---- openvdb-8.0.0/openvdb/openvdb/version.rc.in	1969-12-31 17:00:00 -0700
-+++ openvdb/openvdb/openvdb/version.rc.in	2021-02-05 11:18:33 -0700
+diff -Naur orig/openvdb/version.rc.in openvdb/openvdb/version.rc.in
+--- orig/openvdb/version.rc.in	1969-12-31 17:00:00 -0700
++++ openvdb/openvdb/version.rc.in	2020-08-12 14:15:01 -0600
 @@ -0,0 +1,48 @@
 +#include <winver.h>
 +