Fix subpass iteration

EEVEE: Fix assert during default shader compilation
The default shader could have been requested as deferred and then as non defered. This could make the shader compilation assert.
2020-05-26 13:04:23 +02:00 · 2020-05-14 16:55:25 +02:00 · 2020-05-14 16:55:25 +02:00 · 2020-05-14 16:55:25 +02:00 · 2020-05-14 16:55:25 +02:00 · 2020-05-14 16:55:25 +02:00
8002 changed files with 501252 additions and 784273 deletions
--- a/.clang-format
+++ b/.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
@@ -239,7 +238,6 @@ ForEachMacros:
  - LISTBASE_FOREACH_BACKWARD
  - LISTBASE_FOREACH_MUTABLE
  - LISTBASE_FOREACH_BACKWARD_MUTABLE
-  - LISTBASE_FOREACH_INDEX
  - MAN_ITER_AXES_BEGIN
  - NODE_INSTANCE_HASH_ITER
  - NODE_SOCKET_TYPES_BEGIN
@@ -254,16 +252,14 @@ ForEachMacros:
  - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
-  - SEQ_ALL_BEGIN
-  - SEQ_ITERATOR_FOREACH
+  - SEQP_BEGIN
+  - SEQ_BEGIN
  - SURFACE_QUAD_ITER_BEGIN
  - foreach
  - ED_screen_areas_iter
-  - SLOT_PROBING_BEGIN
-  - SET_SLOT_PROBING_BEGIN
-  - MAP_SLOT_PROBING_BEGIN
-  - VECTOR_SET_SLOT_PROBING_BEGIN

-StatementMacros:
-  - PyObject_HEAD
-  - 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
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,47 +0,0 @@
-# The warnings below are disabled because they are too pedantic and not worth fixing.
-# Some of them will be enabled as part of the Clang-Tidy task, see T78535.
-
-Checks:  >
-  -*,
-  readability-*,
-  -readability-uppercase-literal-suffix,
-  -readability-magic-numbers,
-  -readability-isolate-declaration,
-  -readability-convert-member-functions-to-static,
-  -readability-implicit-bool-conversion,
-  -readability-avoid-const-params-in-decls,
-  -readability-simplify-boolean-expr,
-  -readability-make-member-function-const,
-
-  -readability-misleading-indentation,
-
-  -readability-use-anyofallof,
-
-  -readability-function-cognitive-complexity,
-
-  bugprone-*,
-  -bugprone-narrowing-conversions,
-  -bugprone-unhandled-self-assignment,
-  -bugprone-branch-clone,
-  -bugprone-macro-parentheses,
-  -bugprone-reserved-identifier,
-
-  -bugprone-sizeof-expression,
-  -bugprone-integer-division,
-
-  -bugprone-redundant-branch-condition,
-
-  modernize-*,
-  -modernize-use-auto,
-  -modernize-use-trailing-return-type,
-  -modernize-avoid-c-arrays,
-  -modernize-use-nodiscard,
-  -modernize-loop-convert,
-  -modernize-pass-by-value,
-  # Cannot be enabled yet, because using raw string literals in tests breaks
-  # the windows compiler currently.
-  -modernize-raw-string-literal
-
-CheckOptions:
-  - key: modernize-use-default-member-init.UseAssignment
-    value: 1
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,104 +0,0 @@
-# git config blame.ignoreRevsFile .git-blame-ignore-revs
-#
-# After running the above, commits listed in this file will be
-# ignored by git blame. The blame will be shifted to the person
-# who edited the line(s) before the ignored commit.
-#
-# To disable this ignorance for a command, run as follows
-# git blame --ignore-revs-file="" <other options>
-#
-# 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.
-#
-# Note:
-# - The comment above the SHA should be the first line of the commit.
-# - It is fine to pack together similar commits if they have the same explanatory comment.
-# - Use only 40 character git SHAs; not smaller ones, not prefixed with rB.
-#
-# https://git-scm.com/docs/git-blame/2.23.0
-
-# white space commit. (2 spaces -> tab).
-0a3694cd6ebec710da7110e9f168a72d47c71ee0
-
-# Cycles: Cleanup, spacing after preprocessor
-cb4b5e12abf1fc6cf9ffc0944e0a1bc406286c63
-
-# ClangFormat: apply to source, most of intern
-e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1
-
-# Code Style: use "#pragma once" in source directory
-91694b9b58ab953f3b313be9389cc1303e472fc2
-
-# Code Style: use "#pragma once" in some newer headers
-8198dbb888856b8c11757586df02aca15f132f90
-
-# Code Style: use "#pragma once" in intern/ghost
-1b1129f82a9cf316b54fbc025f8cfcc1a74b8589
-
-# Cleanup: mostly comments, use doxy syntax & typos
-e0cb02587012b4b2f4b18363dc7d0a7da2c02093
-
-# Cleanup: use C comments for descriptive text
-2abfcebb0eb7989e3d1e7d03f37ecf5c088210af
-
-# use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
-afacd184982e58a9c830a3d5366e25983939a7ba
-
-# Spelling: It's Versus Its
-3a7fd309fce89213b0224b3c6807adb2d1fe7ca8
-
-# Spelling: Then Versus Than
-d1eefc421544e2ea632fb35cb6bcaade4c39ce6b
-
-# Spelling: Miscellaneous
-84ef3b80de4915a24a9fd2fd214d0fa44e59b854
-
-# Spelling: Loose Versus Lose
-c0a6bc19794c69843c38451c762e91bc10136e0f
-
-# Spelling: Apart Versus A Part
-3d26cd01b9ba6381eb165e11536345ae652dfb41
-
-# Cleanup: use 2 space indentation for CMake
-3076d95ba441cd32706a27d18922a30f8fd28b8a
-
-# Cleanup: use over-line for doxy comments
-4b188bb08cf5aaae3c68ab57bbcfa037eef1ac10
-
-# Cleanup: General comment style clean up of graph_edit.c and fcurve.c
-0105f146bb40bd609ccbda3d3f6aeb8e14ad3f9e
-
-# Cleanup: pep8 (indentation, spacing, long lines)
-41d2d6da0c96d351b47acb64d3e0decdba16cb16
-
-# Cleanup: pep8, blank lines
-bab9de2a52929fe2b45ecddb1eb09da3378e303b
-
-# Cleanup: PEP8 for python changes
-1e7e94588daa66483190f45a9de5e98228f80e05
-
-# GPencil: Cleanup pep8
-a09cc3ee1a99f2cd5040bbf30c8ab8c588bb2bb1
-
-# Cleanup: trailing space, remove tabs, pep8
-c42a6b77b52560d257279de2cb624b4ef2c0d24c
-
-# Cleanup: use C style doxygen comments
-8c1726918374e1d2d2123e17bae8db5aadde3433
-
-# Cleanup: use doxy sections for imbuf
-c207f7c22e1439e0b285fba5d2c072bdae23f981
-
-# Cleanup: clang-format
-c4d8f6a4a8ddc29ed27311ed7578b3c8c31399d2
-b5d310b569e07a937798a2d38539cfd290149f1c
-8c846cccd6bdfd3e90a695fabbf05f53e5466a57
-4eac03d821fa17546f562485f7d073813a5e5943
-1166110a9d66af9c5a47cee2be591f50fdc445e8
-
-# Cleanup: clang-format.
-40d4a4cb1a6b4c3c2a486e8f2868f547530e0811
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,3 @@ Desktop.ini

 # smoke simulation noise tile (generated)
 waveletNoiseTile.bin
-
-# testing environment
-/Testing
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,10 +41,10 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
  endif()
 endif()

-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.5)

-# Prefer LEGACY OpenGL to be compatible with all the existing releases and
-# platforms which don't have GLVND yet. Only do it if preference was not set
+# Prever LEGACY OpenGL to eb compatible with all the existing releases and
+# platforms which don't hare GLVND yet. Only do it if preference was not set
 # externally.
 if(NOT DEFINED OpenGL_GL_PREFERENCE)
  set(OpenGL_GL_PREFERENCE "LEGACY")
@@ -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.
@@ -105,11 +102,6 @@ if(POLICY CMP0068)
  cmake_policy(SET CMP0068 NEW)
 endif()

-# find_package() uses <PackageName>_ROOT variables.
-if(POLICY CMP0074)
-  cmake_policy(SET CMP0074 NEW)
-endif()
-
 #-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
@@ -131,9 +123,7 @@ enable_testing()

 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
-
-get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(GENERATOR_IS_MULTI_CONFIG)
+if(MSVC)
  set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/$<CONFIG>/ CACHE INTERNAL "" FORCE)
 else()
  set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/ CACHE INTERNAL "" FORCE)
@@ -167,6 +157,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 +171,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)
@@ -190,7 +183,6 @@ if(APPLE)
 else()
  option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" ON)
 endif()
-option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON)

 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
@@ -198,13 +190,10 @@ option(WITH_OPENIMAGEDENOISE   "Enable the OpenImageDenoise compositing node" ON

 option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ON)

-option(WITH_POTRACE       "Enable features relying on potrace" ON)
 option(WITH_OPENVDB       "Enable features relying on OpenVDB" ON)
 option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" ON)
 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 +225,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)
@@ -287,9 +278,10 @@ option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd

 # Alembic support
 option(WITH_ALEMBIC             "Enable Alembic Support" ON)
+option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support (not officially supported)" OFF)

 # Universal Scene Description support
-option(WITH_USD                 "Enable Universal Scene Description (USD) Support" ON)
+option(WITH_USD                 "Enable Universal Scene Description (USD) Support" OFF)

 # 3D format support
 # Disable opencollada when we don't have precompiled libs
@@ -298,33 +290,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)
@@ -348,8 +322,16 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 # Freestyle
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)

+# New object types
+option(WITH_NEW_OBJECT_TYPES "Enable new hair and pointcloud objects (use for development only, don't save in files)" OFF)
+mark_as_advanced(WITH_NEW_OBJECT_TYPES)
+
+# New simulation data block
+option(WITH_NEW_SIMULATION_TYPE "Enable simulation data block (use for development only, don't save in files)" OFF)
+mark_as_advanced(WITH_NEW_SIMULATION_TYPE)
+
 # Misc
-if(WIN32 OR APPLE)
+if(WIN32)
  option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
@@ -363,21 +345,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,21 +363,20 @@ 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)
 option(WITH_CYCLES_STANDALONE       "Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI   "Build Cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL              "Build Cycles with OSL support" ON)
-option(WITH_CYCLES_EMBREE           "Build Cycles with Embree support" ON)
+option(WITH_CYCLES_EMBREE           "Build Cycles with Embree support" OFF)
 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")
+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING  "Build Cycles with logging support" ON)
@@ -432,7 +408,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,11 +424,6 @@ 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)
-  mark_as_advanced(WITH_CLANG_TIDY)
-endif()
-
 option(WITH_BOOST "Enable features depending on boost" ON)
 option(WITH_TBB   "Enable features depending on TBB (OpenVDB, OpenImageDenoise, sculpt multithreading)" ON)

@@ -462,14 +432,6 @@ if(WIN32)
  option(WITH_TBB_MALLOC_PROXY "Enable the TBB malloc replacement" ON)
 endif()

-# This should be turned off when Blender enter beta/rc/release
-if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
-   "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
-  set(WITH_EXPERIMENTAL_FEATURES OFF)
-else()
-  set(WITH_EXPERIMENTAL_FEATURES ON)
-endif()
-
 # Unit testsing
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
 option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF)
@@ -520,10 +482,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 \
@@ -540,22 +502,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 -fno-sanitize=alignment \
 ")

-    if(MSVC)
-      # clang-cl doesn't support all sanitizers, but leak and object-size give errors/warnings.
-      set(_asan_defaults "${_asan_defaults}")
-    elseif(APPLE)
-      # AppleClang doesn't support all sanitizers, but leak gives error.
-      # Build type is not known for multi-config generator, so don't add object-size sanitizer.
-      if(CMAKE_BUILD_TYPE MATCHES "Debug" OR GENERATOR_IS_MULTI_CONFIG)
-        # Silence the warning that object-size is not effective in -O0.
-        set(_asan_defaults "${_asan_defaults}")
-      else()
-        string(APPEND _asan_defaults " -fsanitize=object-size")
-      endif()
-    else()
-      string(APPEND _asan_defaults " -fsanitize=leak -fsanitize=object-size")
+    if(NOT MSVC) # not all sanitizers are supported with clang-cl, these two however are very vocal about it
+      set(_asan_defaults "${_asan_defaults} -fsanitize=leak -fsanitize=object-size" )
    endif()
-
    set(COMPILER_ASAN_CFLAGS "${_asan_defaults}" CACHE STRING "C flags for address sanitizer")
    mark_as_advanced(COMPILER_ASAN_CFLAGS)
    set(COMPILER_ASAN_CXXFLAGS "${_asan_defaults}" CACHE STRING "C++ flags for address sanitizer")
@@ -563,42 +512,20 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")

    unset(_asan_defaults)

-    if(MSVC)
-        find_library(
-          COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
+    if(NOT MSVC)
+      find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
+    else()
+      find_library(
+        COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
        PATHS
        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
      )
-    elseif(APPLE)
-      execute_process(COMMAND ${CMAKE_CXX_COMPILER}
-        -print-file-name=lib
-        OUTPUT_VARIABLE CLANG_LIB_DIR
-      )
-      string(STRIP "${CLANG_LIB_DIR}" CLANG_LIB_DIR)
-      find_library(
-        COMPILER_ASAN_LIBRARY
-        NAMES
-          libclang_rt.asan_osx_dynamic.dylib
-        PATHS
-          "${CLANG_LIB_DIR}/darwin/"
-      )
-      unset(CLANG_LIB_DIR)
-    else()
-      find_library(
-        COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
-      )
    endif()
-
    mark_as_advanced(COMPILER_ASAN_LIBRARY)
  endif()
 endif()

-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  option(WITH_COMPILER_SHORT_FILE_MACRO "Make paths in macros like __FILE__ relative to top level source and build directories." ON)
-  mark_as_advanced(WITH_COMPILER_SHORT_FILE_MACRO)
-endif()
-
 if(WIN32)
  # Use hardcoded paths or find_package to find externals
  option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
@@ -627,12 +554,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 +608,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 +628,16 @@ 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)
+
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+  set(WITH_HEADLESS ON)
+endif()
+
+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 +654,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))
@@ -729,21 +661,13 @@ if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
  set(WITH_BOOST OFF)
 endif()

-set_and_warn_dependency(WITH_TBB WITH_CYCLES            OFF)
 set_and_warn_dependency(WITH_TBB WITH_USD               OFF)
 set_and_warn_dependency(WITH_TBB WITH_OPENIMAGEDENOISE  OFF)
 set_and_warn_dependency(WITH_TBB WITH_OPENVDB           OFF)
 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 +676,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 +698,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 +709,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 +736,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 +765,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, but found Python ${PYTHON_VERSION}")
+  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")
@@ -870,10 +800,11 @@ set(CXX_WARNINGS)
 set(C_REMOVE_STRICT_FLAGS)
 set(CXX_REMOVE_STRICT_FLAGS)

-# Libraries to link to targets in setup_platform_linker_libs
+# libraries to link the binary with passed to target_link_libraries()
+# known as LLIBS to scons
 set(PLATFORM_LINKLIBS "")

-# Added to target linker flags in setup_platform_linker_flags
+# Added to linker flags in setup_liblinks
 # - CMAKE_EXE_LINKER_FLAGS
 # - CMAKE_EXE_LINKER_FLAGS_DEBUG
 set(PLATFORM_LINKFLAGS "")
@@ -881,29 +812,15 @@ set(PLATFORM_LINKFLAGS_DEBUG "")

 if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
  if(WITH_COMPILER_ASAN)
-    if(NOT APPLE)
-      # Avoid passing address sanitizer compiler flags to `try_compile`.
-      # Since linker flags are not set, all compiler checks and `find_package`
-      # calls that rely on `try_compile` will fail.
-      # See CMP0066 also.
-      string(APPEND CMAKE_C_FLAGS_DEBUG " ${COMPILER_ASAN_CFLAGS}")
-      string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${COMPILER_ASAN_CFLAGS}")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")

-      string(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMPILER_ASAN_CXXFLAGS}")
-      string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILER_ASAN_CXXFLAGS}")
-    endif()
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
    if(MSVC)
      set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6")
    endif()
-
-    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>")
-      unset(_list_COMPILER_ASAN_CFLAGS)
-      unset(_is_CONFIG_DEBUG)
-    elseif(COMPILER_ASAN_LIBRARY)
+    if(COMPILER_ASAN_LIBRARY)
      set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
      set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
      set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
@@ -911,18 +828,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 +883,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)
+  set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
+  add_definitions(-D__SSE__ -D__MMX__)
 endif()
+if(SUPPORT_SSE2_BUILD)
+  set(PLATFORM_CFLAGS " ${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)
@@ -1031,7 +909,7 @@ if(MSVC)
  # endianess-detection and auto-setting is counterproductive
  # so we just set endianness according CMAKE_OSX_ARCHITECTURES

-elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR CMAKE_OSX_ARCHITECTURES MATCHES arm64)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
  add_definitions(-D__LITTLE_ENDIAN__)
 elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)
  add_definitions(-D__BIG_ENDIAN__)
@@ -1066,9 +944,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}
@@ -1229,10 +1104,8 @@ if(WITH_OPENMP)

  if(OPENMP_FOUND)
    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}")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
    else()
      # Typically avoid adding flags as defines but we can't
      # pass OpenMP flags to the linker for static builds, meaning
@@ -1243,7 +1116,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 +1191,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()
@@ -1381,7 +1252,7 @@ endif()

 if(WITH_LIBMV)
  # We always have C++11 which includes unordered_map.
-  set(CERES_DEFINES "-DCERES_STD_UNORDERED_MAP;-DCERES_USE_CXX_THREADS")
+  set(CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
 endif()

 #-----------------------------------------------------------------------------
@@ -1488,7 +1359,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 +1396,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")
@@ -1553,14 +1422,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT     -Wno-int-in-bool-context)
  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 +1455,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)
@@ -1601,7 +1464,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE  -Wno-unused-variable)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
-  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISLEADING_INDENTATION    -Wno-misleading-indentation)

  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
@@ -1612,18 +1474,15 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)

-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
-  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_REORDER -Wno-reorder)
  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_UNDEFINED_VAR_TEMPLATE -Wno-undefined-var-template)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_INSTANTIATION_AFTER_SPECIALIZATION -Wno-instantiation-after-specialization)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_MISLEADING_INDENTATION    -Wno-misleading-indentation)

 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")

@@ -1636,8 +1495,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)

  # disable numbered, false positives
-  string(APPEND C_WARNINGS " -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
-  string(APPEND CXX_WARNINGS " -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
+  set(C_WARNINGS "${C_WARNINGS} -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
+  set(CXX_WARNINGS "${CXX_WARNINGS} -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199")
 elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
  # most msvc warnings are C & C++
  set(_WARNINGS
@@ -1668,7 +1527,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")

  if(MSVC_VERSION GREATER_EQUAL 1911)
    # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017
-    string(APPEND _WARNINGS " /w35038") # order of initialization in c++ constructors
+    set(_WARNINGS "${_WARNINGS} /w35038") # order of initialization in c++ constructors
  endif()

  string(REPLACE ";" " " _WARNINGS "${_WARNINGS}")
@@ -1692,35 +1551,37 @@ 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()

 if(MSVC)
-  string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
-  # Make MSVC properly report the value of the __cplusplus preprocessor macro
-  # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
-  # of the C++ standard chosen above
-  if(MSVC_VERSION GREATER 1913)
-    string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
-  endif()
+  # MSVC needs to be tested first, since clang on windows will
+  # match the compiler test below but clang-cl does not accept -std=c++11
+  # since it is on by default and cannot be turned off.
+  #
+  # Nothing special is needed, C++11 features are available by default.
 elseif(
  CMAKE_COMPILER_IS_GNUCC OR
  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
  CMAKE_C_COMPILER_ID MATCHES "Intel"
 )
-  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
+  # TODO(sergey): Do we want c++11 or gnu-c++11 here?
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 else()
-  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++17 build")
+  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build")
 endif()

 # Visual Studio has all standards it supports available by default
@@ -1731,47 +1592,12 @@ if(
  (CMAKE_C_COMPILER_ID MATCHES "Intel")
 )
  # Use C11 + GNU extensions, works with GCC, Clang, ICC
-  string(APPEND CMAKE_C_FLAGS " -std=gnu11")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 endif()

 if(UNIX AND NOT APPLE)
  if(NOT WITH_CXX11_ABI)
-    string(APPEND PLATFORM_CFLAGS " -D_GLIBCXX_USE_CXX11_ABI=0")
-  endif()
-endif()
-
-if(WITH_COMPILER_SHORT_FILE_MACRO)
-  # Use '-fmacro-prefix-map' for Clang and GCC (MSVC doesn't support this).
-  ADD_CHECK_C_COMPILER_FLAG(C_PREFIX_MAP_FLAGS C_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
-  if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
-    if(APPLE)
-      if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
-      # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
-      # with Xcode-11 (the Clang of which doesn't support the flag).
-        message(WARNING
-          "-fmacro-prefix-map flag is NOT supported by Clang shipped with Xcode-${XCODE_VERSION}."
-          " Some Xcode functionality in Product menu may not work. Disabling WITH_COMPILER_SHORT_FILE_MACRO."
-        )
-        set(WITH_COMPILER_SHORT_FILE_MACRO OFF)
-      endif()
-    endif()
-    if(WITH_COMPILER_SHORT_FILE_MACRO)
-      path_ensure_trailing_slash(_src_dir "${CMAKE_SOURCE_DIR}")
-      path_ensure_trailing_slash(_bin_dir "${CMAKE_BINARY_DIR}")
-      # Keep this variable so it can be stripped from build-info.
-      set(PLATFORM_CFLAGS_FMACRO_PREFIX_MAP
-        "-fmacro-prefix-map=\"${_src_dir}\"=\"\" -fmacro-prefix-map=\"${_bin_dir}\"=\"\"")
-      string(APPEND PLATFORM_CFLAGS " ${PLATFORM_CFLAGS_FMACRO_PREFIX_MAP}")
-      unset(_src_dir)
-      unset(_bin_dir)
-    endif()
-  else()
-    message(WARNING
-      "-fmacro-prefix-map flag is NOT supported by C/C++ compiler."
-      " Disabling WITH_COMPILER_SHORT_FILE_MACRO."
-    )
-    set(WITH_COMPILER_SHORT_FILE_MACRO OFF)
+    set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
  endif()
 endif()

@@ -1816,6 +1642,10 @@ endif()
 #-----------------------------------------------------------------------------
 # Libraries

+if(WITH_GTESTS)
+  include(GTestTesting)
+endif()
+
 if(WITH_BLENDER)
  add_subdirectory(intern)
  add_subdirectory(extern)
@@ -1824,20 +1654,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 +1664,6 @@ elseif(WITH_CYCLES_STANDALONE)
  endif()
 endif()

-#-----------------------------------------------------------------------------
-# Testing
-add_subdirectory(tests)
-
 #-----------------------------------------------------------------------------
 # Blender Application
 if(WITH_BLENDER)
@@ -1857,6 +1671,11 @@ if(WITH_BLENDER)
 endif()


+#-----------------------------------------------------------------------------
+# Testing
+add_subdirectory(tests)
+
+
 #-----------------------------------------------------------------------------
 # Define 'heavy' submodules (for Ninja builder when using pools).
 setup_heavy_lib_pool()
@@ -1886,7 +1705,7 @@ if(FIRST_RUN)
    set(_msg "  - ${_setting}")
    string(LENGTH "${_msg}" _len)
    while("32" GREATER "${_len}")
-      string(APPEND _msg " ")
+      set(_msg "${_msg} ")
      math(EXPR _len "${_len} + 1")
    endwhile()

@@ -1904,29 +1723,23 @@ if(FIRST_RUN)
  message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")

  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)
-  info_cfg_option(WITH_INPUT_IME)
-  info_cfg_option(WITH_INTERNATIONAL)
+  info_cfg_option(WITH_IK_ITASC)
  info_cfg_option(WITH_OPENCOLLADA)
+  info_cfg_option(WITH_FFTW3)
+  info_cfg_option(WITH_INTERNATIONAL)
+  info_cfg_option(WITH_INPUT_NDOF)
+  info_cfg_option(WITH_CYCLES)
+  info_cfg_option(WITH_FREESTYLE)
  info_cfg_option(WITH_OPENCOLORIO)
+  info_cfg_option(WITH_XR_OPENXR)
  info_cfg_option(WITH_OPENIMAGEDENOISE)
  info_cfg_option(WITH_OPENVDB)
-  info_cfg_option(WITH_POTRACE)
-  info_cfg_option(WITH_PUGIXML)
+  info_cfg_option(WITH_ALEMBIC)
  info_cfg_option(WITH_QUADRIFLOW)
-  info_cfg_option(WITH_TBB)
  info_cfg_option(WITH_USD)
-  info_cfg_option(WITH_XR_OPENXR)
+  info_cfg_option(WITH_TBB)

  info_cfg_text("Compiler Options:")
  info_cfg_option(WITH_BUILDINFO)
@@ -1934,62 +1747,58 @@ if(FIRST_RUN)

  info_cfg_text("System Options:")
  info_cfg_option(WITH_INSTALL_PORTABLE)
-  info_cfg_option(WITH_MEM_JEMALLOC)
-  info_cfg_option(WITH_MEM_VALGRIND)
-  info_cfg_option(WITH_SYSTEM_GLEW)
  info_cfg_option(WITH_X11_ALPHA)
  info_cfg_option(WITH_X11_XF86VMODE)
  info_cfg_option(WITH_X11_XFIXES)
  info_cfg_option(WITH_X11_XINPUT)
+  info_cfg_option(WITH_MEM_JEMALLOC)
+  info_cfg_option(WITH_MEM_VALGRIND)
+  info_cfg_option(WITH_SYSTEM_GLEW)

  info_cfg_text("Image Formats:")
+  info_cfg_option(WITH_OPENIMAGEIO)
  info_cfg_option(WITH_IMAGE_CINEON)
  info_cfg_option(WITH_IMAGE_DDS)
  info_cfg_option(WITH_IMAGE_HDR)
  info_cfg_option(WITH_IMAGE_OPENEXR)
  info_cfg_option(WITH_IMAGE_OPENJPEG)
  info_cfg_option(WITH_IMAGE_TIFF)
-  info_cfg_option(WITH_OPENIMAGEIO)

  info_cfg_text("Audio:")
+  info_cfg_option(WITH_OPENAL)
+  info_cfg_option(WITH_SDL)
+  info_cfg_option(WITH_SDL_DYNLOAD)
+  info_cfg_option(WITH_JACK)
+  info_cfg_option(WITH_JACK_DYNLOAD)
  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)
  info_cfg_option(WITH_LZO)

  info_cfg_text("Python:")
-  if(APPLE)
-    info_cfg_option(WITH_PYTHON_FRAMEWORK)
-  endif()
  info_cfg_option(WITH_PYTHON_INSTALL)
  info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
  info_cfg_option(WITH_PYTHON_MODULE)
  info_cfg_option(WITH_PYTHON_SAFETY)
+  if(APPLE)
+    info_cfg_option(WITH_PYTHON_FRAMEWORK)
+  endif()

  info_cfg_text("Modifiers:")
+  info_cfg_option(WITH_MOD_REMESH)
  info_cfg_option(WITH_MOD_FLUID)
  info_cfg_option(WITH_MOD_OCEANSIM)
-  info_cfg_option(WITH_MOD_REMESH)

  info_cfg_text("OpenGL:")
+  info_cfg_option(WITH_GLEW_ES)
+  info_cfg_option(WITH_GL_EGL)
+  info_cfg_option(WITH_GL_PROFILE_ES20)
  if(WIN32)
    info_cfg_option(WITH_GL_ANGLE)
  endif()
-  info_cfg_option(WITH_GL_EGL)
-  info_cfg_option(WITH_GL_PROFILE_ES20)
-  info_cfg_option(WITH_GLEW_ES)

  info_cfg_text("")

--- a/99
+++ b/99
@@ -26,31 +26,24 @@

 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
   * 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.
@@ -87,22 +80,11 @@ Static Source Code Checking
   * check_splint:          Run blenders source through splint (C only).
   * check_sparse:          Run blenders source through sparse (C only).
   * check_smatch:          Run blenders source through smatch (C only).
-   * 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_c:      Check for spelling errors (C/C++ only).
+   * check_spelling_c_qtc:  Same as check_spelling_c but outputs QtCreator tasks format.
   * 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,
-   so re-running does not need to re-check unchanged files.
-
-   Example:
-      make check_spelling_c CHECK_SPELLING_CACHE=../spelling_cache.data
+   * check_descriptions:    Check for duplicate/invalid descriptions.

 Utilities
   Not associated with building Blender.
@@ -128,16 +110,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"
@@ -165,10 +141,6 @@ Information
 endef
 # HELP_TEXT (end)

-# This makefile is not meant for Windows
-ifeq ($(OS),Windows_NT)
-    $(error On Windows, use "cmd //c make.bat" instead of "make")
-endif

 # System Vars
 OS:=$(shell uname -s)
@@ -197,13 +169,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 +184,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
@@ -240,10 +207,6 @@ ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_lite
 	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake" $(CMAKE_CONFIG_ARGS)
 endif
-ifneq "$(findstring release, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_release
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_release.cmake" $(CMAKE_CONFIG_ARGS)
-endif
 ifneq "$(findstring cycles, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_cycles
 	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake" $(CMAKE_CONFIG_ARGS)
@@ -261,10 +224,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

@@ -358,13 +317,11 @@ all: .FORCE
 debug: all
 full: all
 lite: all
-release: all
 cycles: all
 headless: all
 bpy: all
 developer: all
 ninja: all
-ccache: all

 # -----------------------------------------------------------------------------
 # Build dependencies
@@ -480,9 +437,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) \
@@ -493,17 +447,26 @@ check_spelling_c: .FORCE
 	cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    --cache-file=$(CHECK_SPELLING_CACHE) \
 	    "$(BLENDER_DIR)/source" \
 	    "$(BLENDER_DIR)/intern/cycles" \
 	    "$(BLENDER_DIR)/intern/guardedalloc" \
 	    "$(BLENDER_DIR)/intern/ghost" \

+check_spelling_c_qtc: .FORCE
+	cd "$(BUILD_DIR)" ; USE_QTC_TASK=1 \
+	PYTHONIOENCODING=utf_8 $(PYTHON) \
+	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
+	    "$(BLENDER_DIR)/source" \
+	    "$(BLENDER_DIR)/intern/cycles" \
+	    "$(BLENDER_DIR)/intern/guardedalloc" \
+	    "$(BLENDER_DIR)/intern/ghost" \
+	    > \
+	    "$(BLENDER_DIR)/check_spelling_c.tasks"
+
 check_spelling_osl: .FORCE
 	cd "$(BUILD_DIR)" ;\
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    --cache-file=$(CHECK_SPELLING_CACHE) \
 	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"

 check_descriptions: .FORCE
@@ -515,14 +478,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 +494,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,10 +505,10 @@ 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
+	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"

 doc_doxy: .FORCE
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -30,12 +30,11 @@
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # 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
+#   Install with homebrew: brew install cmake autoconf automake libtool yasm nasm
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
-#   Install compiler cmake autoconf automake libtool yasm tcl
+#   Install compiler cmake autoconf automake libtool yasm nasm tcl
 #   Run "make deps" from main Blender directory
 #
 ####################################################################################################
@@ -47,10 +46,13 @@ 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)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    include(cmake/setup_mingw64.cmake)
+  else()
+    include(cmake/setup_mingw32.cmake)
+  endif()
 else()
  set(mingw_LIBDIR ${LIBDIR})
 endif()
@@ -59,6 +61,7 @@ include(cmake/zlib.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
+include(cmake/boost.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
 include(cmake/openexr.cmake)
@@ -72,57 +75,48 @@ 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()
-if(UNIX)
-  include(cmake/nasm.cmake)
-endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
 include(cmake/flexbison.cmake)
 include(cmake/osl.cmake)
 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)
+if(UNIX)
+  # Rely on PugiXML compiled with OpenImageIO
+else()
+  include(cmake/pugixml.cmake)
+endif()
 include(cmake/openimagedenoise.cmake)
 include(cmake/embree.cmake)
-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(BLENDER_PLATFORM_ARM)
-  include(cmake/sse2neon.cmake)
-endif()
+include(cmake/xr_openxr.cmake)

 if(WITH_WEBP)
  include(cmake/webp.cmake)
 endif()

+if(WIN32)
+  # HMD branch deps
+  include(cmake/hidapi.cmake)
+  # 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)
  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
    if(WIN32)
@@ -136,6 +130,7 @@ if(NOT WIN32 OR ENABLE_MINGW64)
    include(cmake/vpx.cmake)
    include(cmake/x264.cmake)
    include(cmake/xvidcore.cmake)
+    include(cmake/faad.cmake)
    include(cmake/ffmpeg.cmake)
    include(cmake/fftw.cmake)
    include(cmake/sndfile.cmake)
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@ -16,9 +16,28 @@
 #
 # ***** END GPL LICENSE BLOCK *****

+if(ALEMBIC_HDF5)
+  set(ALEMBIC_HDF5_HL)
+  # in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
+  # unhappy, stub it with the debug mode lib. it's not linking it in at this
+  # point in time anyhow
+  if(BUILD_MODE STREQUAL Debug)
+    set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
+  endif()
+endif()
+
 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
  -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}
@@ -33,6 +52,7 @@ set(ALEMBIC_EXTRA_ARGS
  -DUSE_PRMAN=0
  -DUSE_HDF5=Off
  -DUSE_STATIC_HDF5=Off
+  -DHDF5_ROOT=${LIBDIR}/hdf5
  -DUSE_TESTS=Off
  -DALEMBIC_NO_OPENGL=1
  -DUSE_BINARIES=ON
@@ -41,12 +61,13 @@ set(ALEMBIC_EXTRA_ARGS
  -DGLUT_INCLUDE_DIR=""
  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  ${ALEMBIC_HDF5_HL}
 )

 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 +92,7 @@ endif()

 add_dependencies(
  external_alembic
+  external_boost
  external_zlib
  external_openexr
 )
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -29,16 +29,16 @@ set(BLOSC_EXTRA_ARGS
  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )

-# Prevent blosc from including its own local copy of zlib in the object file
+# Prevent blosc from including it's own local copy of zlib in the object file
 # and cause linker errors with everybody else.
 set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
  -DPREFER_EXTERNAL_ZLIB=ON
 )

 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}
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -18,27 +18,33 @@

 set(BOOST_ADDRESS_MODEL 64)

-if(BLENDER_PLATFORM_ARM)
-  set(BOOST_ARCHITECTURE arm)
-else()
-  set(BOOST_ARCHITECTURE x86)
-endif()
-
 if(WIN32)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(PYTHON_ARCH x64)
+    set(PYTHON_ARCH2 win-AMD64)
+    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
+  else()
+    set(PYTHON_ARCH x86)
+    set(PYTHON_ARCH2 win32)
+    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
+    set(BOOST_ADDRESS_MODEL 32)
+  endif()
+
  set(BOOST_TOOLSET toolset=msvc-14.1)
  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)
    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
  endif()
+
 elseif(APPLE)
  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
  set(BOOST_BUILD_COMMAND ./b2)
-  set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
+  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
  set(BOOST_HARVEST_CMD echo .)
  set(BOOST_PATCH_COMMAND echo .)
 else()
@@ -54,21 +60,6 @@ else()
  endif()
 endif()

-if(WITH_BOOST_PYTHON)
-  set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
-  configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
-  set(BOOST_PYTHON_OPTIONS
-    --with-python
-    --user-config=${JAM_FILE}
-  )
-  if(WIN32 AND BUILD_MODE STREQUAL Debug)
-    set(BOOST_PYTHON_OPTIONS
-      ${BOOST_PYTHON_OPTIONS}
-      define=BOOST_DEBUG_PYTHON
-    )
-  endif()
-endif()
-
 set(BOOST_OPTIONS
  --with-filesystem
  --with-locale
@@ -85,28 +76,19 @@ set(BOOST_OPTIONS
  -sNO_LZMA=1
  -sNO_ZSTD=1
  ${BOOST_TOOLSET}
-  ${BOOST_PYTHON_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}
  CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
  BUILD_IN_SOURCE 1
  INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
-
-if(WITH_BOOST_PYTHON)
-  add_dependencies(
-    external_boost
-    external_python
-    external_numpy
-  )
-endif()
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -26,23 +26,12 @@ if(UNIX)
  set(_required_software
    autoconf
    automake
-    bison
    ${_libtoolize_name}
-    pkg-config
-    tclsh
+    nasm
    yasm
+    tclsh
  )

-  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)
@@ -51,18 +40,6 @@ if(UNIX)
    unset(_software_find CACHE)
  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")
-      string(APPEND _software_missing " bison")
-    endif()
-  endif()
-
  if(_software_missing)
    message(
      "\n"
@@ -70,13 +47,10 @@ 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 nasm tcl\n"
      "\n"
-      "On macOS Intel (with homebrew):\n"
-      "  brew install autoconf automake bison libtool pkg-config yasm\n"
-      "\n"
-      "On macOS ARM (with homebrew):\n"
-      "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
+      "On macOS (with homebrew):\n"
+      "  brew install cmake autoconf automake libtool yasm nasm\n"
      "\n"
      "Other platforms:\n"
      "  Install equivalent packages.\n")
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -0,0 +1,61 @@
+# ***** 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()
+
+
+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
+)
--- a/build_files/build_environment/cmake/clew.cmake
+++ b/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
--- a/build_files/build_environment/cmake/cuew.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,93 +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()
-  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()
-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(NANOVDB)
-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(TINYXML)
-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)
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -26,59 +26,24 @@ set(EMBREE_EXTRA_ARGS
  -DEMBREE_RAY_MASK=ON
  -DEMBREE_FILTER_FUNCTION=ON
  -DEMBREE_BACKFACE_CULLING=OFF
+  -DEMBREE_TASKING_SYSTEM=INTERNAL
  -DEMBREE_MAX_ISA=AVX2
-  -DEMBREE_TASKING_SYSTEM=TBB
-  -DEMBREE_TBB_ROOT=${LIBDIR}/tbb
-  -DTBB_ROOT=${LIBDIR}/tbb
-  -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
 )

-if(TBB_STATIC_LIBRARY)
-  set(EMBREE_EXTRA_ARGS
-    ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_TBB_LIBRARY_NAME=tbb_static
-    -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_static
-  )
-endif()
-
 if(WIN32)
  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
-  if(BUILD_MODE STREQUAL Debug)
-    list(APPEND EMBREE_EXTRA_ARGS
-     -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_debug
-     -DEMBREE_TBB_LIBRARY_NAME=tbb_debug
-    )
-  endif()
 else()
  set(EMBREE_BUILD_DIR)
 endif()

-if(BLENDER_PLATFORM_ARM)
-  ExternalProject_Add(external_embree
-    GIT_REPOSITORY ${EMBREE_ARM_GIT}
-    GIT_TAG "blender-arm"
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    PREFIX ${BUILD_DIR}/embree
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/embree
-  )
-else()
-  ExternalProject_Add(external_embree
-    URL file://${PACKAGE_DIR}/${EMBREE_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
-    PREFIX ${BUILD_DIR}/embree
-    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/embree
-  )
-endif()
-
-add_dependencies(
-  external_embree
-  external_tbb
+ExternalProject_Add(external_embree
+  URL ${EMBREE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${EMBREE_HASH}
+  PREFIX ${BUILD_DIR}/embree
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/embree
 )
-
 if(WIN32)

  if(BUILD_MODE STREQUAL Release)
--- a/build_files/build_environment/cmake/expat.cmake
+++ b/build_files/build_environment/cmake/expat.cmake
@@ -1,35 +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(EXPAT_EXTRA_ARGS
-  -DEXPAT_BUILD_DOCS=OFF
-  -DEXPAT_BUILD_EXAMPLES=OFF
-  -DEXPAT_BUILD_TESTS=OFF
-  -DEXPAT_BUILD_TOOLS=OFF
-  -DEXPAT_SHARED_LIBS=OFF
-)
-
-ExternalProject_Add(external_expat
-  URL file://${PACKAGE_DIR}/${EXPAT_FILE}
-  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
-)
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -0,0 +1,40 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(FAAD_EXTRA_ARGS)
+
+if(WIN32)
+  set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
+else()
+  set(FAAD_EXTRA_CONFIGURE echo .)
+endif()
+
+ExternalProject_Add(external_faad
+  URL ${FAAD_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FAAD_HASH}
+  PREFIX ${BUILD_DIR}/faad
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+  INSTALL_DIR ${LIBDIR}/faad
+)
+
+if(MSVC)
+  set_target_properties(external_faad PROPERTIES FOLDER Mingw)
+endif()
--- a/build_files/build_environment/cmake/ffi.cmake
+++ b/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
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -50,19 +50,13 @@ if(APPLE)
  set(FFMPEG_EXTRA_FLAGS
    ${FFMPEG_EXTRA_FLAGS}
    --target-os=darwin
-    --x86asmexe=${LIBDIR}/nasm/bin/nasm
-  )
-elseif(UNIX)
-  set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
-    --x86asmexe=${LIBDIR}/nasm/bin/nasm
-  )
+    )
 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
@@ -100,6 +94,8 @@ ExternalProject_Add(external_ffmpeg
    --disable-version3
    --disable-debug
    --enable-optimizations
+    --disable-sse
+    --disable-ssse3
    --enable-ffplay
    --disable-openssl
    --disable-securetransport
@@ -131,6 +127,7 @@ endif()
 add_dependencies(
  external_ffmpeg
  external_zlib
+  external_faad
  external_openjpeg
  external_xvidcore
  external_x264
@@ -147,12 +144,6 @@ if(WIN32)
    external_zlib_mingw
  )
 endif()
-if(UNIX)
-  add_dependencies(
-    external_ffmpeg
-    external_nasm
-  )
-endif()

 if(BUILD_MODE STREQUAL Release AND WIN32)
  ExternalProject_Add_Step(external_ffmpeg after_install
--- a/build_files/build_environment/cmake/fftw.cmake
+++ b/build_files/build_environment/cmake/fftw.cmake
@@ -19,23 +19,19 @@
 set(FFTW_EXTRA_ARGS)

 if(WIN32)
+  set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
  set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
-  set(FFTW_EXTRA_ARGS --disable-static --enable-shared)
-  set(FFTW_INSTALL install-strip)
-else()
-  set(FFTW_EXTRA_ARGS --enable-static)
-  set(FFTW_INSTALL install)
 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
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
  PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make ${FFTW_INSTALL}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
  INSTALL_DIR ${LIBDIR}/fftw3
 )

@@ -43,8 +39,7 @@ if(MSVC)
  set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(external_fftw3 after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.dll.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/bin/libfftw3-3.dll ${HARVEST_TARGET}/fftw3/lib/libfftw3-3.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
      DEPENDEES install
    )
--- a/build_files/build_environment/cmake/flac.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/flexbison.cmake
+++ b/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 .
--- a/build_files/build_environment/cmake/freeglut.cmake
+++ b/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
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -24,13 +24,12 @@ set(FREETYPE_EXTRA_ARGS
  -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)
+  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=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
--- a/build_files/build_environment/cmake/glew.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/glfw.cmake
+++ b/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
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -1,108 +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(GMP_EXTRA_ARGS -enable-cxx)
-
-if(WIN32)
-  # Shared for windows because static libs will drag in a libgcc dependency.
-  set(GMP_OPTIONS --disable-static --enable-shared --enable-fat --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32)
-else()
-  set(GMP_OPTIONS --enable-static --disable-shared )
-endif()
-
-if(APPLE AND NOT BLENDER_PLATFORM_ARM)
-  set(GMP_OPTIONS
-    ${GMP_OPTIONS}
-    --with-pic
-  )
-elseif(UNIX AND NOT APPLE)
-  set(GMP_OPTIONS
-    ${GMP_OPTIONS}
-    --with-pic
-    --enable-fat
-  )
-endif()
-
-if(BLENDER_PLATFORM_ARM)
-  set(GMP_OPTIONS
-    ${GMP_OPTIONS}
-    --disable-assembly
-  )
-endif()
-
-ExternalProject_Add(external_gmp
-  URL file://${PACKAGE_DIR}/${GMP_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
-  PREFIX ${BUILD_DIR}/gmp
-  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
-  INSTALL_DIR ${LIBDIR}/gmp
-)
-
-if(MSVC)
-  set_target_properties(external_gmp PROPERTIES FOLDER Mingw)
-endif()
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_gmp after_install
-      COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
-      COMMAND  lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
-      COMMAND  ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll ${HARVEST_TARGET}/gmp/lib/libgmp-10.dll
-      COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib ${HARVEST_TARGET}/gmp/lib/libgmp-10.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include ${HARVEST_TARGET}/gmp/include
-    DEPENDEES install
-  )
-endif()
-
-if(BUILD_MODE STREQUAL Debug AND WIN32)
-ExternalProject_Add_Step(external_gmp after_install
-      COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
-      COMMAND  lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
-    DEPENDEES install
-  )
-endif()
-
-if(WIN32)
-  # gmpxx is somewhat special, it builds on top of the C style gmp library but exposes C++ bindings
-  # 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}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${GMP_HASH_TYPE}=${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
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmpxx ${DEFAULT_CMAKE_FLAGS} -DGMP_LIBRARY=${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib -DGMP_INCLUDE_DIR=${BUILD_DIR}/gmp/src/external_gmp -DCMAKE_DEBUG_POSTFIX=_d
-    INSTALL_DIR ${LIBDIR}/gmpxx
-  )
-  set_target_properties(external_gmpxx PROPERTIES FOLDER Mingw)
-
-  add_dependencies(
-    external_gmpxx
-    external_gmp
-  )
-
-  ExternalProject_Add_Step(external_gmpxx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmpxx/ ${HARVEST_TARGET}/gmp
-    DEPENDEES install
-  )
-
-endif()
--- a/build_files/build_environment/cmake/haru.cmake
+++ b/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()
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -26,12 +26,15 @@ 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/ &&
+        # OpenImageIO
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
        # 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/ &&
@@ -41,13 +44,30 @@ if(BUILD_MODE STREQUAL Release)
        # glew-> opengl
        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # sndfile
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
        # 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/
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+        # hidapi
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/
    DEPENDS
  )
 endif()

+if(BUILD_MODE STREQUAL Debug)
+  add_custom_target(Harvest_Debug_Results
+        # OpenImageIO
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
+        # hdf5
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+    DEPENDS Package_Python
+  )
+endif()
+
 else(WIN32)

 function(harvest from to)
@@ -90,29 +110,20 @@ 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(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")
-harvest(llvm/lib llvm/lib "libclang*.a")
 if(APPLE)
  harvest(openmp/lib openmp/lib "*")
  harvest(openmp/include openmp/include "*.h")
 endif()
-if(BLENDER_PLATFORM_ARM)
-  harvest(sse2neon sse2neon "*.h")
-endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
@@ -144,26 +155,21 @@ harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
 harvest(openimagedenoise/include openimagedenoise/include "*")
 harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
-harvest(embree/include embree/include "*.h")
-harvest(embree/lib embree/lib "*.a")
 harvest(openjpeg/include/openjpeg-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(osl/shaders 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/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")
@@ -183,17 +189,15 @@ 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(embree/include embree/include "*.h")
+harvest(embree/lib embree/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*")
+  harvest(mesa/lib mesa/lib "*.so*")
 endif()

 endif()
--- a/build_files/build_environment/cmake/hdf5.cmake
+++ b/build_files/build_environment/cmake/hdf5.cmake
@@ -0,0 +1,42 @@
+# ***** 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(HDF5_EXTRA_ARGS
+  -DHDF5_ENABLE_THREADSAFE=Off
+  -DHDF5_BUILD_CPP_LIB=Off
+  -DBUILD_TESTING=Off
+  -DHDF5_BUILD_TOOLS=Off
+  -DHDF5_BUILD_EXAMPLES=Off
+  -DHDF5_BUILD_HL_LIB=On
+  -DBUILD_STATIC_CRT_LIBS=On
+  -DBUILD_SHARED_LIBS=On
+)
+
+if(WIN32)
+  set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
+endif()
+
+ExternalProject_Add(external_hdf5
+  URL ${HDF5_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${HDF5_HASH}
+  PREFIX ${BUILD_DIR}/hdf5
+  PATCH_COMMAND ${HDF5_PATCH}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/hdf5
+)
--- a/build_files/build_environment/cmake/hidapi.cmake
+++ b/build_files/build_environment/cmake/hidapi.cmake
@@ -0,0 +1,29 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(HIDAPI_EXTRA_ARGS)
+
+ExternalProject_Add(external_hidapi
+  URL ${HIDAPI_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${HIDAPI_HASH}
+  PREFIX ${BUILD_DIR}/hidapi
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt   ${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/hidapi
+)
--- a/build_files/build_environment/cmake/iconv.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -1,85 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(WIN32)
-  set(ISPC_EXTRA_ARGS_WIN
-    -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()
-elseif(UNIX)
-  set(ISPC_EXTRA_ARGS_UNIX
-    -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
-    -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-    -DARM_ENABLED=Off
-  )
-endif()
-
-set(ISPC_EXTRA_ARGS
-    -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++
-    -DISPC_INCLUDE_TESTS=Off
-    -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
-    -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
-    ${ISPC_EXTRA_ARGS_WIN}
-    ${ISPC_EXTRA_ARGS_APPLE}
-    ${ISPC_EXTRA_ARGS_UNIX}
-)
-
-ExternalProject_Add(external_ispc
-  URL file://${PACKAGE_DIR}/${ISPC_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ISPC_HASH_TYPE}=${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
-  INSTALL_DIR ${LIBDIR}/ispc
-)
-
-add_dependencies(
-  external_ispc
-  ll
-)
-
-if(WIN32)
-  add_dependencies(
-    external_ispc
-    external_flexbison
-  )
-endif()
--- a/build_files/build_environment/cmake/jemalloc.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/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
@@ -42,21 +42,24 @@ if(WIN32)
    set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
  endif()
 else(WIN32)
-  # cmake for unix
-  set(JPEG_EXTRA_ARGS
-    -DWITH_JPEG8=ON
-    -DENABLE_STATIC=ON
-    -DENABLE_SHARED=OFF
-    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
+  # autoconf for unix
+  if(APPLE)
+    set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
+  else()
+    set(JPEG_EXTRA_ARGS --with-jpeg8)
+  endif()

  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}
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
+    BUILD_IN_SOURCE 1
+    BUILD_COMMAND ${CONFIGURE_ENV} && make install
    PREFIX ${BUILD_DIR}/jpg
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
    INSTALL_DIR ${LIBDIR}/jpg
  )

  set(JPEG_LIBRARY libjpeg${LIBEXT})
-endif()
+endif(WIN32)
--- a/build_files/build_environment/cmake/lame.cmake
+++ b/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
--- a/build_files/build_environment/cmake/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -0,0 +1,31 @@
+# ***** 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(LCMS_EXTRA_ARGS
+)
+
+ExternalProject_Add(external_lcms
+  URL ${LCMS_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  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
+)
--- a/build_files/build_environment/cmake/libglu.cmake
+++ b/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/ &&
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -16,32 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-if(BLENDER_PLATFORM_ARM)
-  set(LLVM_TARGETS AArch64$<SEMICOLON>ARM)
-else()
-  set(LLVM_TARGETS X86)
-endif()
-
-if(APPLE)
-  set(LLVM_XML2_ARGS
-    -DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
-  )
-  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
  -DLLVM_INCLUDE_TESTS=OFF
-  -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS}
+  -DLLVM_TARGETS_TO_BUILD=X86
  -DLLVM_INCLUDE_EXAMPLES=OFF
  -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)
@@ -52,13 +35,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
@@ -78,11 +59,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()
--- a/build_files/build_environment/cmake/lzma.cmake
+++ b/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
--- a/build_files/build_environment/cmake/mesa.cmake
+++ b/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
 )

--- a/build_files/build_environment/cmake/nanovdb.cmake
+++ b/build_files/build_environment/cmake/nanovdb.cmake
@@ -1,54 +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(NANOVDB_EXTRA_ARGS
-   # NanoVDB is header-only, so only need the install target
-  -DNANOVDB_BUILD_UNITTESTS=OFF
-  -DNANOVDB_BUILD_EXAMPLES=OFF
-  -DNANOVDB_BUILD_BENCHMARK=OFF
-  -DNANOVDB_BUILD_DOCS=OFF
-  -DNANOVDB_BUILD_TOOLS=OFF
-  -DNANOVDB_CUDA_KEEP_PTX=OFF
-   # Do not need to include any of the dependencies because of this
-  -DNANOVDB_USE_OPENVDB=OFF
-  -DNANOVDB_USE_OPENGL=OFF
-  -DNANOVDB_USE_OPENCL=OFF
-  -DNANOVDB_USE_CUDA=OFF
-  -DNANOVDB_USE_TBB=OFF
-  -DNANOVDB_USE_BLOSC=OFF
-  -DNANOVDB_USE_ZLIB=OFF
-  -DNANOVDB_USE_OPTIX=OFF
-  -DNANOVDB_ALLOW_FETCHCONTENT=OFF
-)
-
-ExternalProject_Add(nanovdb
-  URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
-  PREFIX ${BUILD_DIR}/nanovdb
-  SOURCE_SUBDIR nanovdb
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/nanovdb
-)
-
-if(WIN32)
-  ExternalProject_Add_Step(nanovdb after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/nanovdb/nanovdb ${HARVEST_TARGET}/nanovdb/include/nanovdb
-    DEPENDEES install
-  )
-endif()
--- a/build_files/build_environment/cmake/nasm.cmake
+++ b/build_files/build_environment/cmake/nasm.cmake
@@ -1,38 +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 *****
-
-ExternalProject_Add(external_nasm
-  URL file://${PACKAGE_DIR}/${NASM_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NASM_HASH_TYPE}=${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
-  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()
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -32,13 +32,12 @@ 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 ""
-  PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
  LOG_BUILD 1
  BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
  INSTALL_COMMAND ""
@@ -47,5 +46,4 @@ ExternalProject_Add(external_numpy
 add_dependencies(
  external_numpy
  external_python
-  external_python_site_packages
 )
--- a/build_files/build_environment/cmake/ogg.cmake
+++ b/build_files/build_environment/cmake/ogg.cmake
@@ -17,11 +17,10 @@
 # ***** 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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -46,12 +46,13 @@ 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
+    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
  )

  if(WIN32)
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -23,9 +23,9 @@ if(UNIX)
 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_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}
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -18,84 +18,95 @@

 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(BLENDER_PLATFORM_ARM)
-  set(OPENCOLORIO_EXTRA_ARGS
-    ${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()
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/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
--- a/build_files/build_environment/cmake/openimagedenoise.cmake
+++ b/build_files/build_environment/cmake/openimagedenoise.cmake
@@ -18,42 +18,26 @@


 set(OIDN_EXTRA_ARGS
-  -DOIDN_APPS=OFF
+  -DWITH_EXAMPLE=OFF
+  -DWITH_TEST=OFF
  -DTBB_ROOT=${LIBDIR}/tbb
  -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
  -DOIDN_STATIC_LIB=ON
-  -DOIDN_STATIC_RUNTIME=OFF
-  -DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
 )

-if(WIN32)
-  set(OIDN_EXTRA_ARGS
-    ${OIDN_EXTRA_ARGS}
-    -DTBB_DEBUG_LIBRARY=${LIBDIR}/tbb/lib/tbb.lib
-    -DTBB_DEBUG_LIBRARY_MALLOC=${LIBDIR}/tbb/lib/tbbmalloc.lib
-  )
-else()
-  set(OIDN_EXTRA_ARGS
-    ${OIDN_EXTRA_ARGS}
-    -Dtbb_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/tbb_static.a
-    -Dtbbmalloc_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/tbbmalloc_static.a
-  )
-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}
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/openimagedenoise.diff
  INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

 add_dependencies(
  external_openimagedenoise
  external_tbb
-  external_ispc
 )

 if(WIN32)
@@ -62,7 +46,7 @@ if(WIN32)
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/include ${HARVEST_TARGET}/openimagedenoise/include
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/dnnl.lib ${HARVEST_TARGET}/openimagedenoise/lib/dnnl.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn.lib
      DEPENDEES install
    )
  endif()
@@ -70,7 +54,7 @@ if(WIN32)
    ExternalProject_Add_Step(external_openimagedenoise after_install
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/dnnl.lib ${HARVEST_TARGET}/openimagedenoise/lib/dnnl_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn_d.lib
      DEPENDEES install
    )
  endif()
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -32,7 +32,7 @@ endif()

 if(WIN32)
  set(PNG_LIBNAME libpng16_static${LIBEXT})
-  set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
+  set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
  set(OPENJPEG_POSTFIX _msvc)
 else()
  set(PNG_LIBNAME libpng${LIBEXT})
@@ -49,17 +49,23 @@ endif()

 if(MSVC)
  set(OPENJPEG_FLAGS
-    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg_msvc
+    -DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
+    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+    -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
  )
 else()
  set(OPENJPEG_FLAGS
-    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg
+    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
  )
 endif()

 set(OPENIMAGEIO_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=OFF
+  -DBUILDSTATIC=ON
  ${OPENIMAGEIO_LINKSTATIC}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
+  -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
  -DBoost_USE_MULTITHREADED=ON
  -DBoost_USE_STATIC_LIBS=ON
@@ -67,15 +73,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
  -DBOOST_ROOT=${LIBDIR}/boost
  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
-  -DUSE_LIBSQUISH=OFF
-  -DUSE_QT5=OFF
-  -DUSE_NUKE=OFF
-  -DUSE_OPENVDB=OFF
-  -DUSE_BZIP2=OFF
-  -DUSE_FREETYPE=OFF
-  -DUSE_DCMTK=OFF
-  -DUSE_LIBHEIF=OFF
+  -OIIO_BUILD_CPP11=ON
  -DUSE_OPENGL=OFF
  -DUSE_TBB=OFF
  -DUSE_FIELD3D=OFF
@@ -83,12 +81,15 @@ set(OPENIMAGEIO_EXTRA_ARGS
  -DUSE_PYTHON=OFF
  -DUSE_GIF=OFF
  -DUSE_OPENCV=OFF
+  -DUSE_OPENSSL=OFF
  -DUSE_OPENJPEG=ON
  -DUSE_FFMPEG=OFF
  -DUSE_PTEX=OFF
  -DUSE_FREETYPE=OFF
  -DUSE_LIBRAW=OFF
-  -DUSE_OPENCOLORIO=OFF
+  -DUSE_PYTHON=OFF
+  -DUSE_PYTHON3=OFF
+  -DUSE_OCIO=OFF
  -DUSE_WEBP=${WITH_WEBP}
  -DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
  -DOIIO_BUILD_TESTS=OFF
@@ -102,60 +103,49 @@ set(OPENIMAGEIO_EXTRA_ARGS
  -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
  ${OPENJPEG_FLAGS}
+  -DOCIO_PATH=${LIBDIR}/opencolorio/
  -DOpenEXR_USE_STATIC_LIBS=On
+  -DOPENEXR_HOME=${LIBDIR}/openexr/
+  -DILMBASE_INCLUDE_PATH=${LIBDIR}/openexr/
+  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/openexr/
  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
  -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
+  PATCH_COMMAND
+    ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
+    ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/openimageio
 )

 add_dependencies(
  external_openimageio
-  external_png
-  external_zlib
+  external_png external_zlib
  external_openexr
  external_jpeg
  external_boost
  external_tiff
-  external_pugixml
+  external_opencolorio
  external_openjpeg${OPENJPEG_POSTFIX}
  ${WEBP_DEP}
 )
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
-
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
-      DEPENDEES install
-    )
-  endif()
+if(NOT WIN32)
+  add_dependencies(
+    external_openimageio
+    external_opencolorio_extra
+  )
 endif()
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/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
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -18,11 +18,10 @@


 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}
  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
  INSTALL_DIR ${LIBDIR}/openmp
@@ -30,5 +29,5 @@ ExternalProject_Add(external_openmp

 add_dependencies(
  external_openmp
-  ll
+  external_clang
 )
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/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
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -20,14 +20,6 @@ if(BUILD_MODE STREQUAL Debug)
  set(BLOSC_POST _d)
 endif()

-if(WIN32)
-  set(OPENVDB_SHARED ON)
-  set(OPENVDB_STATIC OFF)
-else()
-  set(OPENVDB_SHARED OFF)
-  set(OPENVDB_STATIC ON)
-endif()
-
 set(OPENVDB_EXTRA_ARGS
  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
  -DBoost_USE_MULTITHREADED=ON
@@ -35,7 +27,6 @@ set(OPENVDB_EXTRA_ARGS
  -DBoost_USE_STATIC_RUNTIME=OFF
  -DBOOST_ROOT=${LIBDIR}/boost
  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
  -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
@@ -50,12 +41,8 @@ set(OPENVDB_EXTRA_ARGS
  -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
   # All libs live in openexr, even the ilmbase ones
  -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
-  -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
-  -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
+  -DOPENVDB_CORE_SHARED=Off
  -DOPENVDB_BUILD_BINARIES=Off
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -DILMBASE_USE_STATIC_LIBS=On
-  -DOPENEXR_USE_STATIC_LIBS=On
 )

 if(WIN32)
@@ -77,9 +64,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}
@@ -98,16 +85,14 @@ add_dependencies(
 if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include/openvdb ${HARVEST_TARGET}/openvdb/include/openvdb
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
      DEPENDEES install
    )
  endif()
  if(BUILD_MODE STREQUAL Debug)
    ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb_d.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb_d.dll ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
      DEPENDEES install
    )
  endif()
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -17,12 +17,10 @@
 # ***** END GPL LICENSE BLOCK *****

 if(WIN32)
-  option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
+  option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
-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")
@@ -36,24 +34,22 @@ 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}")

 if(WIN32)
-  set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
+  else()
+    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
+  endif()
  set(LIBEXT ".lib")
  set(LIBPREFIX "")

@@ -63,7 +59,7 @@ if(WIN32)
  if(MSVC_VERSION GREATER 1909)
    set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
  endif()
-  string(APPEND COMMON_MSVC_FLAGS " /bigobj")
+  set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
  if(WITH_OPTIMIZED_DEBUG)
    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
  else()
@@ -86,10 +82,17 @@ if(WIN32)
  set(PLATFORM_CXX_FLAGS)
  set(PLATFORM_CMAKE_FLAGS)

-  set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
-  set(MINGW_SHELL ming64sh.cmd)
-  set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
-  set(MINGW_HOST x86_64-w64-mingw32)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
+    set(MINGW_SHELL ming64sh.cmd)
+    set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
+    set(MINGW_HOST x86_64-w64-mingw32)
+  else()
+    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
+    set(MINGW_SHELL ming32sh.cmd)
+    set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
+    set(MINGW_HOST i686-w64-mingw32)
+  endif()

  set(CONFIGURE_ENV
    cd ${MINGW_PATH} &&
@@ -121,44 +124,20 @@ else()
      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(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_ARCHITECTURES x86_64)
+    set(OSX_DEPLOYMENT_TARGET 10.11)
    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)

-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      set(BLENDER_PLATFORM_ARM ON)
-    endif()
-
-    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()
-      set(PLATFORM_BUILD_TARGET --build=aarch64-apple-darwin20.0.0) # macOS 11.00
-    endif()
+    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
+    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+    set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin15.0.0) # OS X 10.11
    set(PLATFORM_CMAKE_FLAGS
-      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
    )
  else()
-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
-      set(BLENDER_PLATFORM_ARM ON)
-    endif()
-
    set(PLATFORM_CFLAGS "-fPIC")
    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
    set(PLATFORM_LDFLAGS)
@@ -187,7 +166,6 @@ else()

  set(CONFIGURE_ENV
    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}
@@ -210,6 +188,18 @@ set(DEFAULT_CMAKE_FLAGS
  ${PLATFORM_CMAKE_FLAGS}
 )

+if(WIN32)
+  # We need both flavors to build the thumbnail dlls
+  if(MSVC12)
+    set(GENERATOR_32 "Visual Studio 12 2013")
+    set(GENERATOR_64 "Visual Studio 12 2013 Win64")
+  elseif(MSVC14)
+    set(GENERATOR_32 "Visual Studio 14 2015")
+    set(GENERATOR_64 "Visual Studio 14 2015 Win64")
+  endif()
+endif()
+
+
 if(WIN32)
  if(BUILD_MODE STREQUAL Debug)
    set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
--- a/build_files/build_environment/cmake/opus.cmake
+++ b/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
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/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}
@@ -38,9 +44,13 @@ set(OSL_EXTRA_ARGS
  -DBOOST_ROOT=${LIBDIR}/boost
  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
-  -DOpenEXR_ROOT=${LIBDIR}/openexr/
-  -DIlmBase_ROOT=${LIBDIR}/openexr/
+  -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,39 +58,45 @@ 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
-  -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}
@@ -91,13 +107,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
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -22,14 +22,10 @@ set(PNG_EXTRA_ARGS
  -DPNG_STATIC=ON
 )

-if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR="aarch64")
-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 MD5=${PNG_HASH}
  PREFIX ${BUILD_DIR}/png
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/png
--- a/build_files/build_environment/cmake/potrace.cmake
+++ b/build_files/build_environment/cmake/potrace.cmake
@@ -1,38 +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(POTRACE_EXTRA_ARGS
-)
-
-if((WIN32 AND BUILD_MODE STREQUAL Release) OR UNIX)
-  ExternalProject_Add(external_potrace
-    URL file://${PACKAGE_DIR}/${POTRACE_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${POTRACE_HASH_TYPE}=${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}
-    INSTALL_DIR ${LIBDIR}/potrace
-  )
-  if(WIN32)
-    ExternalProject_Add_Step(external_potrace after_install
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/potrace ${HARVEST_TARGET}/potrace
-        DEPENDEES install
-    )
-  endif()
-endif()
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/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
--- a/build_files/build_environment/cmake/pugixml.cmake
+++ b/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,14 +30,14 @@ 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()
-endif()
+  endif() 
+endif()
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -37,23 +37,18 @@ if(WIN32)
  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
    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
+    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -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-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.
-    #
-    # Disable libintl (gettext library) as it might come from Homebrew, which makes
-    # it so test program compiles, but the Python does not. This is because for Python
-    # we use isysroot, which seems to forbid using libintl.h.
-    # The gettext functionality seems to come from CoreFoundation, so should be all fine.
+    # disable functions that can be in 10.13 sdk but aren't available on 10.9 target
    set(PYTHON_FUNC_CONFIGS
      export ac_cv_func_futimens=no &&
      export ac_cv_func_utimensat=no &&
@@ -65,34 +60,28 @@ else()
      export ac_cv_func_getentropy=no &&
      export ac_cv_func_mkostemp=no &&
      export ac_cv_func_mkostemps=no &&
-      export ac_cv_func_timingsafe_bcmp=no &&
-      export ac_cv_header_libintl_h=no &&
-      export ac_cv_lib_intl_textdomain=no
-    )
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      set(PYTHON_FUNC_CONFIGS ${PYTHON_FUNC_CONFIGS} && export PYTHON_DECIMAL_WITH_MACHINE=ansi64)
-    endif()
+      export ac_cv_func_timingsafe_bcmp=no)
    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
  else()
    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
  endif()
-  # Link against zlib statically (Unix). Avoid rpath issues (macOS).
-  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
+
  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
-  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} &&
    export LDFLAGS=${PYTHON_LDFLAGS} &&
    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)

  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}
--- a/build_files/build_environment/cmake/python_site_packages.cmake
+++ b/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
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -0,0 +1,227 @@
+# ***** 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 *****
+
+####################################################################################################################
+# Mingw32 Builds
+####################################################################################################################
+# This installs mingw32+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3
+####################################################################################################################
+
+message("LIBDIR = ${LIBDIR}")
+macro(cmake_to_msys_path MsysPath ResultingPath)
+  string(REPLACE ":" "" TmpPath "${MsysPath}")
+  string(SUBSTRING ${TmpPath} 0 1 Drive)
+  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+  string(TOLOWER ${Drive} LowerDrive)
+  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+endmacro()
+cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
+message("mingw_LIBDIR = ${mingw_LIBDIR}")
+
+message("Checking for mingw32")
+# download mingw32
+if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+  message("Downloading mingw32")
+  file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+endif()
+
+# make mingw root directory
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
+endif()
+
+# extract mingw32
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
+  message("Extracting mingw32")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
+  )
+endif()
+
+message("Checking for pkg-config")
+if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+  message("Downloading pkg-config")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+endif()
+
+# extract pkgconfig
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
+  message("Extracting pkg-config")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
+  )
+
+endif()
+
+message("Checking for nasm")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+  message("Downloading nasm")
+  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+endif()
+
+# extract nasm
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
+  message("Extracting nasm")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
+  )
+
+endif()
+SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
+message("Checking for mingwGet")
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+  message("Downloading mingw-get")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+endif()
+
+# extract mingw_get
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
+  message("Extracting mingw-get")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
+  )
+endif()
+
+if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe"))
+  message("Installing MSYS")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+  )
+endif()
+
+if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
+  message("Installing mktemp")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+  )
+endif()
+
+
+message("Checking for CoreUtils")
+# download old core_utils for pr.exe (ffmpeg needs it to build)
+if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+  message("Downloading CoreUtils 5.97")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+endif()
+
+if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"))
+  message("Installing pr from CoreUtils 5.97")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
+endif()
+
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd")
+  message("Installing ming32sh.cmd")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
+  )
+endif()
+
+message("Checking for perl")
+# download perl for libvpx
+if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
+  message("Downloading perl")
+  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
+endif()
+
+# make perl root directory
+if(NOT EXISTS "${DOWNLOAD_DIR}/perl32")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
+endif()
+
+# extract perl
+if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip"))
+  message("Extracting perl")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
+  )
+endif()
+
+# get yasm for vpx
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
+  message("Downloading yasm")
+  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
+endif()
+
+message("checking i686-w64-mingw32-strings")
+# copy strings.exe to i686-w64-mingw32-strings for x264
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe")
+  message("fixing i686-w64-mingw32-strings.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
+  )
+endif()
+
+message("checking i686-w64-mingw32-ar.exe")
+# copy ar.exe to i686-w64-mingw32-ar.exe for x264
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe")
+  message("fixing i686-w64-mingw32-ar.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
+  )
+endif()
+
+message("checking i686-w64-mingw32-strip.exe")
+# copy strip.exe to i686-w64-mingw32-strip.exe for x264
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe")
+  message("fixing i686-w64-mingw32-strip.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
+  )
+endif()
+
+message("checking i686-w64-mingw32-ranlib.exe")
+# copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264
+if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
+  message("fixing i686-w64-mingw32-ranlib.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
+  )
+endif()
--- a/build_files/build_environment/cmake/setup_mingw64.cmake
+++ b/build_files/build_environment/cmake/setup_mingw64.cmake
@@ -19,7 +19,7 @@
 ####################################################################################################################
 # Mingw64 Builds
 ####################################################################################################################
-# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/fftw3
+# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3
 ####################################################################################################################

 message("LIBDIR = ${LIBDIR}")
@@ -128,14 +128,6 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "$
  )
 endif()

-if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe"))
-  message("Installing m4")
-  execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-m4
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-  )
-endif()
-
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -34,9 +34,9 @@ else()
 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
@@ -60,14 +60,3 @@ if(UNIX)
    external_flac
  )
 endif()
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_sndfile after_install
-      COMMAND  lib /def:${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.def /machine:x64 /out:${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.lib
-      COMMAND  ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll
-      COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.lib ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib
-      COMMAND  ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h
-
-    DEPENDEES install
-  )
-endif()
--- a/build_files/build_environment/cmake/spnav.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -42,29 +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
+  PATCH_COMMAND ${SQLITE_PATCH_CMD}
  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
--- a/build_files/build_environment/cmake/sse2neon.cmake
+++ b/build_files/build_environment/cmake/sse2neon.cmake
@@ -1,28 +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 *****
-
-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
-)
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -20,11 +20,9 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)

 if(APPLE)
-  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
+  set(SSL_OS_COMPILER "blender-darwin-x86_64")
 else()
-  if(BLENDER_PLATFORM_ARM)
-    set(SSL_OS_COMPILER "blender-linux-aarch64")
-  elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
    set(SSL_OS_COMPILER "blender-linux-x86_64")
  else()
@@ -33,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
--- a/build_files/build_environment/cmake/ssl.conf
+++ b/build_files/build_environment/cmake/ssl.conf
@@ -1,4 +1,4 @@
-my %targets = (
+%targets = (

  "blender-linux-x86" => {
    inherit_from     => [ "linux-x86" ],
@@ -8,18 +8,8 @@ my %targets = (
    inherit_from     => [ "linux-x86_64" ],
    cflags => add("-fPIC"),
  },
-  "blender-linux-aarch64" => {
-    inherit_from     => [ "linux-aarch64" ],
-    cxxflags => add("-fPIC"),
-    cflags => add("-fPIC"),
-  },
  "blender-darwin-x86_64" => {
    inherit_from     => [ "darwin64-x86_64-cc" ],
    cflags => add("-fPIC"),
  },
-  "blender-darwin-arm64" => {
-    inherit_from     => [ "darwin-common" ],
-    cxxflags => add("-fPIC -arch arm64"),
-    cflags => add("-fPIC -arch arm64"),
-  },
 );
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -21,8 +21,6 @@ if(WIN32)
    -DTBB_BUILD_TBBMALLOC=On
    -DTBB_BUILD_TBBMALLOC_PROXY=On
    -DTBB_BUILD_STATIC=Off
-    -DTBB_BUILD_TESTS=Off
-    -DCMAKE_DEBUG_POSTFIX=_debug
  )
  set(TBB_LIBRARY tbb)
  set(TBB_STATIC_LIBRARY Off)
@@ -32,7 +30,6 @@ else()
    -DTBB_BUILD_TBBMALLOC=On
    -DTBB_BUILD_TBBMALLOC_PROXY=Off
    -DTBB_BUILD_STATIC=On
-    -DTBB_BUILD_TESTS=Off
  )
  set(TBB_LIBRARY tbb_static)
  set(TBB_STATIC_LIBRARY On)
@@ -40,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/build/version_string.ver.in &&
-  ${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
 )
@@ -54,19 +50,12 @@ ExternalProject_Add(external_tbb
 if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(external_tbb after_install
-      # findtbb.cmake in some deps *NEEDS* to find tbb_debug.lib even if they are not going to use it
-      # to make that test pass, we place a copy with the right name in the lib folder.
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${LIBDIR}/tbb/lib/tbb_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${LIBDIR}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
-      # Normal collection of build artifacts
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${HARVEST_TARGET}/tbb/bin/tbb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.dll ${HARVEST_TARGET}/tbb/lib/tbb.dll
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc.dll
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.dll
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
      DEPENDEES install
    )
@@ -77,12 +66,11 @@ if(WIN32)
      # to make that test pass, we place a copy with the right name in the lib folder.
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${LIBDIR}/tbb/lib/tbb.lib
      # Normal collection of build artifacts
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb_debug.dll ${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/debug/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.dll ${HARVEST_TARGET}/tbb/lib/debug/tbb_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc_proxy.dll
      DEPENDEES install
    )
  endif()
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -23,11 +23,10 @@ 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
    --disable-shared
    --enable-static
--- a/build_files/build_environment/cmake/tiff.cmake
+++ b/build_files/build_environment/cmake/tiff.cmake
@@ -16,12 +16,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-if(WITH_WEBP)
-  set(WITH_TIFF_WEBP ON)
-else()
-  set(WITH_TIFF_WEBP OFF)
-endif()
-
 set(TIFF_EXTRA_ARGS
  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
@@ -29,14 +23,12 @@ set(TIFF_EXTRA_ARGS
  -DBUILD_SHARED_LIBS=OFF
  -Dlzma=OFF
  -Djbig=OFF
-  -Dzstd=OFF
-  -Dwebp=${WITH_TIFF_WEBP}
 )

 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
--- a/build_files/build_environment/cmake/tinyxml.cmake
+++ b/build_files/build_environment/cmake/tinyxml.cmake
@@ -0,0 +1,31 @@
+# ***** 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(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
+)
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -22,14 +22,9 @@ set(USD_EXTRA_ARGS
  -DBoost_USE_STATIC_LIBS=ON
  -DBoost_USE_STATIC_RUNTIME=OFF
  -DBOOST_ROOT=${LIBDIR}/boost
-  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
  -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
-  # USD wants the tbb debug lib set even when you are doing a release build
-  # Otherwise it will error out during the cmake configure phase.
-  -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}

  # This is a preventative measure that avoids possible conflicts when add-ons
  # try to load another USD library into the same process space.
@@ -53,9 +48,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}
@@ -81,14 +76,14 @@ if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(external_usd after_install
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/libusd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
      DEPENDEES install
    )
  endif()
  if(BUILD_MODE STREQUAL Debug)
    ExternalProject_Add_Step(external_usd after_install
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/libusd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
      DEPENDEES install
    )
  endif()
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -19,54 +19,37 @@
 set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
 set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
-set(ZLIB_HASH_TYPE MD5)
-set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)

-set(OPENAL_VERSION 1.20.1)
+set(OPENAL_VERSION 1.18.2)
 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(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)

-set(PNG_VERSION 1.6.37)
+set(PNG_VERSION 1.6.35)
 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_HASH 678b7e696a62a193ed3503b04bf449d6)

-set(JPEG_VERSION 2.0.4)
+set(JPEG_VERSION 1.5.3)
 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_HASH 5b7549d440b86c98a517355c102d155e)

-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_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(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.5)
+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_HASH 9e4d69cf2a12c6fb19b98af7c5e0eaee)
 if(WIN32)
  # Openexr started appending _d on its own so now
  # we need to tell the build the postfix is _s while
@@ -83,416 +66,259 @@ else()
  set(OPENEXR_VERSION_POSTFIX)
 endif()

-set(FREETYPE_VERSION 2.10.2)
+set(FREETYPE_VERSION 2.10.1)
 set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
-set(FREETYPE_HASH_TYPE MD5)
-set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947)

 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(HDF5_VERSION 1.8.17)
+set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz)
+set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca)
+
+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(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_VERSION v3_4_0_RC2)
+set(OPENSUBDIV_Hash f6a10ba9efaa82fde86fe65aad346319)
 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_VERSION 2.0.8)
 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_HASH 3800d705cef742c6a634f202c37f263f)

 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_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_VERSION 1.1.0)
+set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
+set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8)

-if(BLENDER_PLATFORM_ARM)
-  # 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(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_VERSION 1.8.13)
 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(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93)

-set(TIFF_VERSION 4.1.0)
+set(TIFF_VERSION 4.0.9)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
-set(TIFF_HASH_TYPE MD5)
-set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
+set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)

-set(OSL_VERSION 1.11.10.0)
+set(OSL_VERSION 1.10.9)
 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 a94f1e8506f7e8f5e993653de5c5fa00)

-set(PYTHON_VERSION 3.9.2)
-set(PYTHON_SHORT_VERSION 3.9)
-set(PYTHON_SHORT_VERSION_NO_DOTS 39)
+set(PYTHON_VERSION 3.7.4)
+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_HASH d33e4aae66097051c2eca45ee3604803)

-set(TBB_VERSION 2020_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_HASH 26263622e9187212ec240dcf01b66207)

-set(OPENVDB_VERSION 8.0.1)
-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_VERSION 7.0.0)
+set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
+set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8)

-set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
-set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
-set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
-set(NANOVDB_HASH_TYPE MD5)
-set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
+set(IDNA_VERSION 2.8)
+set(CHARDET_VERSION 3.0.4)
+set(URLLIB3_VERSION 1.25.3)
+set(CERTIFI_VERSION 2019.6.16)
+set(REQUESTS_VERSION 2.22.0)

-set(IDNA_VERSION 2.10)
-set(CHARDET_VERSION 4.0.0)
-set(URLLIB3_VERSION 1.26.3)
-set(CERTIFI_VERSION 2020.12.5)
-set(REQUESTS_VERSION 2.25.1)
-set(CYTHON_VERSION 0.29.21)
-
-set(NUMPY_VERSION 1.19.5)
-set(NUMPY_SHORT_VERSION 1.19)
-set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
-set(NUMPY_HASH f6a1b48717c552bbc18f1adc3cc1fe0e)
-set(NUMPY_HASH_TYPE MD5)
-set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
+set(NUMPY_VERSION v1.17.0)
+set(NUMPY_SHORT_VERSION 1.17)
+set(NUMPY_URI https://files.pythonhosted.org/packages/da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da/numpy-1.17.0.zip)
+set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)

 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(OGG_VERSION 1.3.4)
+set(OGG_VERSION 1.3.3)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
-set(OGG_HASH_TYPE SHA256)
-set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
+set(OGG_HASH c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985)

 set(VORBIS_VERSION 1.3.6)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
 set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
-set(VORBIS_HASH_TYPE SHA256)
-set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)

 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.3)
+set(FLAC_VERSION 1.3.2)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
-set(FLAC_HASH_TYPE SHA256)
-set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
+set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f)

-set(VPX_VERSION 1.8.2)
+set(VPX_VERSION 1.7.0)
 set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
-set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
-set(VPX_HASH_TYPE SHA256)
-set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
+set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)

 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_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
-set(X264_HASH_TYPE SHA256)
-set(X264_FILE x264-${X264_VERSION}.tar.gz)
+set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
+set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)

-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(XVIDCORE_VERSION 1.3.5)
+set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
+set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)

-set(OPENJPEG_VERSION 2.3.1)
+# This has to be in sync with the version in blenders /extern folder.
+set(OPENJPEG_VERSION 2.3.0)
 set(OPENJPEG_SHORT_VERSION 2.3)
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
-set(OPENJPEG_HASH_TYPE SHA256)
-set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
+# Use slightly newer commit after release which includes a cmake fix
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
+set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)

-set(FFMPEG_VERSION 4.4)
+set(FAAD_VERSION 2-2.8.8)
+set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
+set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)
+
+set(FFMPEG_VERSION 4.0.2)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e)
-set(FFMPEG_HASH_TYPE SHA256)
-set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
+set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)

 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_VERSION 1.15)
 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(ICONV_HASH ace8b5f2db42f7b3b3057585e80d9808)
+
+set(LAPACK_VERSION 3.6.0)
+set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
+set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101)

 set(SNDFILE_VERSION 1.0.28)
 set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
 set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
-set(SNDFILE_HASH_TYPE MD5)
-set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
+
+# 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 b49ce9c3e3e9acae4d91bca44bb85a72)
-set(WEBP_HASH_TYPE MD5)
-set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)

 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_VERSION 5.0.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(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)

-set(XML2_VERSION 2.9.10)
+set(XML2_VERSION 2.9.4)
 set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
-set(XML2_HASH 10942a1dc23137a8aa07f0639cbfece5)
-set(XML2_HASH_TYPE MD5)
-set(XML2_FILE libxml2-${XML2_VERSION}.tar.gz)
+set(XML2_HASH ae249165c173b1ff386ee8ad676815f5)

 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(TINYXML_HASH_TYPE MD5)
-set(TINYXML_FILE tinyxml_${TINYXML_VERSION}.tar.gz)

 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(EXPAT_VERSION 2_2_10)
-set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
-set(EXPAT_HASH 7ca5f09959fcb9a57618368deb627b9f)
-set(EXPAT_HASH_TYPE MD5)
-set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
+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_VERSION 1.9)
+set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v1.9.tar.gz)
+set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)

 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.
-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_VERSION 1.0.6)
+set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.bz2)
+set(BZIP2_HASH d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7)

-set(FFI_VERSION 3.3)
+set(FFI_VERSION 3.2.1)
 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_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)

-set(LZMA_VERSION 5.2.5)
+set(LZMA_VERSION 5.2.4)
 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)
+set(LZMA_HASH 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf)

-if(BLENDER_PLATFORM_ARM)
-  # Need at least 1.1.1i for aarch64 support (https://github.com/openssl/openssl/pull/13218)
-  set(SSL_VERSION 1.1.1i)
-  set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-  set(SSL_HASH e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242)
-  set(SSL_HASH_TYPE SHA256)
-  set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
-else()
-  set(SSL_VERSION 1.1.1g)
-  set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-  set(SSL_HASH ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46)
-  set(SSL_HASH_TYPE SHA256)
-  set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
-endif()
+set(SSL_VERSION 1.1.0i)
+set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
+set(SSL_HASH ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99)

-set(SQLITE_VERSION 3.31.1)
+set(SQLITE_VERSION 3.24.0)
 set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
 set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
-set(SQLITE_HASH_TYPE SHA1)
-set(SQLITE_FILE sqlite-src-3240000.zip)

-set(EMBREE_VERSION 3.10.0)
+set(EMBREE_VERSION 3.8.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(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52)

-set(USD_VERSION 21.02)
+set(USD_VERSION 19.11)
 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 79ff176167b3fe85f4953abd6cc5e0cc)

-set(OIDN_VERSION 1.4.0)
-set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 421824019becc5b664a22a2b98332bc5)
-set(OIDN_HASH_TYPE MD5)
-set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
+set(OIDN_VERSION 1.0.0)
+set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
+set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)

 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_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(XR_OPENXR_SDK_VERSION 1.0.14)
+set(XR_OPENXR_SDK_VERSION 1.0.6)
 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)
-
-if(BLENDER_PLATFORM_ARM)
-  # 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(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(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(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)
+set(XR_OPENXR_SDK_HASH 21daea7c3bfec365298d779a0e19caa1)
--- a/build_files/build_environment/cmake/vorbis.cmake
+++ b/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
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -24,20 +24,16 @@ if(WIN32)
  endif()
 else()
  if(APPLE)
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      set(VPX_EXTRA_FLAGS --target=generic-gnu)
-    else()
-      set(VPX_EXTRA_FLAGS --target=x86_64-darwin17-gcc)
-    endif()
+    set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
  else()
    set(VPX_EXTRA_FLAGS --target=generic-gnu)
  endif()
 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/ &&
--- a/build_files/build_environment/cmake/webp.cmake
+++ b/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
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -18,27 +18,19 @@

 if(WIN32)
  set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
-endif()
-
-if(BLENDER_PLATFORM_ARM)
-  set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm")
-endif()
-
-if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE))
-  set(X264_CONFIGURE_ENV
-    export AS=${LIBDIR}/nasm/bin/nasm
-  )
+  set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
 else()
-  set(X264_CONFIGURE_ENV echo .)
+  set(X264_PATCH_CMD echo .)
 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
+  PATCH_COMMAND ${X264_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
    --enable-static
    --enable-pic
    --disable-lavf
@@ -51,10 +43,3 @@ ExternalProject_Add(external_x264
 if(MSVC)
  set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
 endif()
-
-if(UNIX)
-  add_dependencies(
-    external_x264
-    external_nasm
-  )
-endif()
--- a/build_files/build_environment/cmake/xml2.cmake
+++ b/build_files/build_environment/cmake/xml2.cmake
@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****

 ExternalProject_Add(external_xml2
-  URL file://${PACKAGE_DIR}/${XML2_FILE}
+  URL ${XML2_URI}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
+  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
--- a/build_files/build_environment/cmake/xr_openxr.cmake
+++ b/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()
--- a/build_files/build_environment/cmake/xvidcore.cmake
+++ b/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}
--- a/build_files/build_environment/cmake/yamlcpp.cmake
+++ b/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
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/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
--- a/build_files/build_environment/cmake/zlib_mingw.cmake
+++ b/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 .
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
--- a/build_files/build_environment/patches/blosc.diff
+++ b/build_files/build_environment/patches/blosc.diff
@@ -91,41 +91,3 @@ diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c


 /* Some useful units */
- diff --git a/blosc/shuffle.c b/blosc/shuffle.c
- index 84b5095..23053b4 100644
- --- a/blosc/shuffle.c
- +++ b/blosc/shuffle.c
- @@ -490,12 +490,12 @@ void unshuffle(size_t bytesoftype, size_t blocksize,
-  #else   /* no __SSE2__ available */
- 
-  void shuffle(size_t bytesoftype, size_t blocksize,
- -             uint8_t* _src, uint8_t* _dest) {
- +             const uint8_t* _src, uint8_t* _dest) {
-    _shuffle(bytesoftype, blocksize, _src, _dest);
-  }
- 
-  void unshuffle(size_t bytesoftype, size_t blocksize,
- -               uint8_t* _src, uint8_t* _dest) {
- +               const uint8_t* _src, uint8_t* _dest) {
-    _unshuffle(bytesoftype, blocksize, _src, _dest);
-  }
-  --- a/cmake/FindSSE.cmake
-  +++ b/cmake/FindSSE.cmake
-  @@ -49,6 +49,17 @@
-         set(AVX_FOUND false CACHE BOOL "AVX available on host")
-      ENDIF (AVX_TRUE)
-   ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  +   execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  +   message(STATUS "Detected architecture ${ARCHITECTURE}")
-  +   IF("${ARCHITECTURE}" STREQUAL "arm64")
-  +      set(SSE2_FOUND   false  CACHE BOOL "SSE2 available on host")
-  +      set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
-  +      set(SSSE3_FOUND  false CACHE BOOL "SSSE3 available on host")
-  +      set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-  +      set(AVX_FOUND false CACHE BOOL "AVX available on host")
-  +      return()
-  +   ENDIF()
-  +   
-      EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
-         CPUINFO)
- 
--- a/build_files/build_environment/patches/boost.user.jam.in
+++ b/build_files/build_environment/patches/boost.user.jam.in
@@ -1,4 +0,0 @@
-using python : @PYTHON_SHORT_VERSION@ : @PYTHON_BINARY@
- : @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@m/ 
- : @LIBDIR@/python/libs  
-;
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -20,7 +20,7 @@
 # ILMBASE_LIBRARIES   - list of libraries to link against when using IlmBase.
 # ILMBASE_FOUND       - True if IlmBase was found.

-# Other standard issue macros
+# Other standarnd issue macros
 include(FindPackageHandleStandardArgs)
 include(FindPackageMessage)
 include(SelectLibraryConfigurations)
--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -22,7 +22,7 @@
 #                       These are defined by the FindIlmBase module.
 # OPENEXR_FOUND       - True if OpenEXR was found.

-# Other standard issue macros
+# Other standarnd issue macros
 include(SelectLibraryConfigurations)
 include(FindPackageHandleStandardArgs)
 include(FindPackageMessage)
--- a/build_files/build_environment/patches/cmakelists_gmpxx.txt
+++ b/build_files/build_environment/patches/cmakelists_gmpxx.txt
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-project(libgmpxx)
-
-include_directories(. cxx ${GMP_INCLUDE_DIR})
-add_definitions(-D__GMP_WITHIN_GMPXX)
-add_library(libgmpxx SHARED
-  cxx/dummy.cc
-  cxx/isfuns.cc
-  cxx/ismpf.cc
-  cxx/ismpq.cc
-  cxx/ismpz.cc
-  cxx/ismpznw.cc
-  cxx/limits.cc
-  cxx/osdoprnti.cc
-  cxx/osfuns.cc
-  cxx/osmpf.cc
-  cxx/osmpq.cc
-  cxx/osmpz.cc
-)
-
-target_link_libraries(libgmpxx ${GMP_LIBRARY})
-install(TARGETS libgmpxx DESTINATION lib)
--- a/build_files/build_environment/patches/cmakelists_hidapi.txt
+++ b/build_files/build_environment/patches/cmakelists_hidapi.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.8)
+project(hidapi)
+
+set(SRC_FILES
+	windows/hid.c
+)
+
+set(HEADER_FILES
+	hidapi/hidapi.h
+)
+include_directories(hidapi)
+add_definitions(-DHID_API_STATIC)
+add_library(hidapi STATIC ${SRC_FILES} ${HEADER_FILES})
+
+install(TARGETS hidapi DESTINATION lib)
+
+INSTALL(FILES hidapi/hidapi.h
+        DESTINATION "include"
+        )
+
--- a/build_files/build_environment/patches/cmakelists_potrace.txt
+++ b/build_files/build_environment/patches/cmakelists_potrace.txt
@@ -1,54 +0,0 @@
-project(potrace)
-cmake_minimum_required(VERSION 2.8)
-
-include_directories(src/include)
-
-set(SOURCES
-  src/backend_dxf.c
-  src/backend_eps.c
-  src/backend_geojson.c
-  src/backend_pdf.c
-  src/backend_pgm.c
-  src/backend_svg.c
-  src/backend_xfig.c
-  src/bbox.c
-  src/bitmap_io.c
-  src/curve.c
-  src/decompose.c
-  src/flate.c
-  src/greymap.c
-  src/lzw.c
-  src/potracelib.c
-  src/progress_bar.c
-  src/render.c
-  src/trace.c
-  src/trans.c
-)
-
-set(HEADERS
-    src/potracelib.h
-)
-
-if(WIN32)
-  add_definitions(/D_USE_MATH_DEFINES)
-endif()
-
-add_definitions(/DPOTRACE="POTrace")
-add_definitions(/DVERSION="Blender")
-add_definitions(/DHAVE_INTTYPES_H)
-
-
-add_library(${PROJECT_NAME} STATIC ${HEADERS} ${SOURCES})
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
-	LIBRARY_OUTPUT_NAME "${PROJECT_NAME}"
-	PUBLIC_HEADER 		"${HEADERS}"
-)
-
-install(TARGETS 		${PROJECT_NAME}
-		RUNTIME         DESTINATION		bin
-        LIBRARY         DESTINATION     lib
-        ARCHIVE         DESTINATION     lib
-        PUBLIC_HEADER	DESTINATION     include
-)
-
--- a/build_files/build_environment/patches/cmakelists_tbb.txt
+++ b/build_files/build_environment/patches/cmakelists_tbb.txt
@@ -1,32 +1,5 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-if (POLICY CMP0048)
-  # cmake warns if loaded from a min-3.0-required parent dir, so silence the warning:
-  cmake_policy(SET CMP0048 NEW)
-endif()
-
-project (tbb CXX)
-
-include(CheckCXXCompilerFlag)
-include(CheckCXXSourceRuns)
-
-if(POLICY CMP0058)
-  cmake_policy(SET CMP0058 NEW)
-endif()
-
-if(POLICY CMP0068)
-  cmake_policy(SET CMP0068 NEW)
-endif()
-
-if (POLICY CMP0078)
-  # swig standard target names
-  cmake_policy(SET CMP0078 NEW)
-endif ()
-
-if (POLICY CMP0086)
-  # UseSWIG honors SWIG_MODULE_NAME via -module flag
-  cmake_policy(SET CMP0086 NEW)
-endif ()
+cmake_minimum_required (VERSION 2.8)
+project(tbb CXX)

 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  message(STATUS "Setting build type to 'Release' as none was specified.")
@@ -35,43 +8,18 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    "MinSizeRel" "RelWithDebInfo")
 endif()

-if(NOT TBB_INSTALL_RUNTIME_DIR)
-  set(TBB_INSTALL_RUNTIME_DIR bin)
-endif()
-if(NOT TBB_INSTALL_LIBRARY_DIR)
-  set(TBB_INSTALL_LIBRARY_DIR lib)
-endif()
-if(NOT TBB_INSTALL_ARCHIVE_DIR)
-  set(TBB_INSTALL_ARCHIVE_DIR lib)
-endif()
-if(NOT TBB_INSTALL_INCLUDE_DIR)
-  set(TBB_INSTALL_INCLUDE_DIR include)
-endif()
-if(NOT TBB_CMAKE_PACKAGE_INSTALL_DIR)
-  set(TBB_CMAKE_PACKAGE_INSTALL_DIR lib/cmake/tbb)
-endif()
-
-include_directories(include src src/rml/include ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(include src src/rml/include )

 option(TBB_BUILD_SHARED          "Build TBB shared library" ON)
 option(TBB_BUILD_STATIC          "Build TBB static library" ON)
 option(TBB_BUILD_TBBMALLOC       "Build TBB malloc library" ON)
 option(TBB_BUILD_TBBMALLOC_PROXY "Build TBB malloc proxy library" ON)
-option(TBB_BUILD_TESTS           "Build TBB tests and enable testing infrastructure" ON)
-option(TBB_NO_DATE               "Do not save the configure date in the version string" OFF)
-option(TBB_BUILD_PYTHON          "Build TBB Python bindings" OFF)
-option(TBB_SET_SOVERSION         "Set the SOVERSION (shared library build version suffix)?" OFF)
-
-# When this repository is part of a larger build system of a parent project
-# we may not want TBB to set up default installation targets
-option(TBB_INSTALL_TARGETS       "Include build targets for 'make install'" ON)

 if(APPLE)
  set(CMAKE_MACOSX_RPATH ON)
 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})
@@ -90,143 +38,66 @@ set(tbbmalloc_proxy_src
  src/tbbmalloc/proxy.cpp
  src/tbbmalloc/tbb_function_replacement.cpp)

-add_library (tbb_interface INTERFACE)
-add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(i386|x86_64)")
-  if (NOT APPLE AND NOT MINGW)
-    target_compile_definitions(tbb_interface INTERFACE DO_ITT_NOTIFY)
-  endif()
-endif()
-
-if (APPLE)
+if (NOT APPLE)
+  add_definitions(-DDO_ITT_NOTIFY)
+else()
  # Disable annoying "has no symbols" warnings
-  set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-  set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+ set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+ set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
 endif()

-macro(CHECK_CXX_COMPILER_AND_LINKER_FLAGS _RESULT _CXX_FLAGS _LINKER_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS ${_CXX_FLAGS})
-  set(CMAKE_REQUIRED_LIBRARIES ${_LINKER_FLAGS})
-  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_cxx_source_runs("#include <iostream>\nint main(int argc, char **argv) { std::cout << \"test\"; return 0; }" ${_RESULT})
-  set(CMAKE_REQUIRED_FLAGS "")
-  set(CMAKE_REQUIRED_LIBRARIES "")
-endmacro()
-
-# Prefer libc++ in conjunction with Clang
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  if (CMAKE_CXX_FLAGS MATCHES "-stdlib=libc\\+\\+")
-    message(STATUS "TBB: using libc++.")
-  else()
-    CHECK_CXX_COMPILER_AND_LINKER_FLAGS(HAS_LIBCPP "-stdlib=libc++" "-stdlib=libc++")
-    if (HAS_LIBCPP)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -D_LIBCPP_VERSION")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
-      message(STATUS "TBB: using libc++.")
-    else()
-      message(STATUS "TBB: NOT using libc++.")
-    endif()
-  endif()
-endif()
-
-set (CMAKE_CXX_STANDARD 11)
-
 if (UNIX)
-  target_compile_definitions(tbb_interface INTERFACE USE_PTHREAD)
-
-  check_cxx_compiler_flag ("-mrtm -Werror" SUPPORTS_MRTM)
-  if (SUPPORTS_MRTM)
-    target_compile_options(tbb_interface INTERFACE "-mrtm")
-  endif ()
-
-elseif(WIN32)
-  target_compile_definitions(tbb_interface INTERFACE USE_WINTHREAD _WIN32_WINNT=0x0600)
-  if (MSVC)
-    enable_language(ASM_MASM)
-    target_compile_options(tbb_interface INTERFACE /GS- /Zc:wchar_t /Zc:forScope)
-    check_cxx_compiler_flag ("/volatile:iso" SUPPORTS_VOLATILE_FLAG)
-    if (SUPPORTS_VOLATILE_FLAG)
-      target_compile_options(tbb_interface INTERFACE /volatile:iso)
-    endif ()
-    target_compile_options(tbb_interface INTERFACE $<$<COMPILE_LANGUAGE:CXX>:/wd4267 /wd4800 /wd4146 /wd4244 /wd4577 /wd4018>)
-    if (NOT CMAKE_SIZEOF_VOID_P)
-       message(FATAL_ERROR "'CMAKE_SIZEOF_VOID_P' is undefined. Please delete your build directory and rerun CMake again!")
-    endif()
-
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-      list(APPEND tbb_src src/tbb/intel64-masm/atomic_support.asm
-        src/tbb/intel64-masm/itsx.asm src/tbb/intel64-masm/intel64_misc.asm)
-      list(APPEND tbbmalloc_src src/tbb/intel64-masm/atomic_support.asm)
-      set(CMAKE_ASM_MASM_FLAGS "/DEM64T=1 ${CMAKE_ASM_MASM_FLAGS}")
-    else()
-      list(APPEND tbb_src src/tbb/ia32-masm/atomic_support.asm
-        src/tbb/ia32-masm/itsx.asm src/tbb/ia32-masm/lock_byte.asm)
-      # Enable SAFESEH feature for assembly (x86 builds only).
-      set(CMAKE_ASM_MASM_FLAGS "/safeseh ${CMAKE_ASM_MASM_FLAGS}")
-    endif()
-  elseif (MINGW)
-    target_compile_options(tbb_interface INTERFACE "-mthreads")
-  endif ()
-endif()
-
-if (MSVC)
-  set(ENABLE_RTTI "/EHsc /GR ")
-  set(DISABLE_RTTI "/EHs- /GR- ")
-elseif (UNIX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DUSE_PTHREAD")
+  if(NOT CMAKE_CXX_FLAGS MATCHES "-mno-rtm")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mrtm")
+  endif()
+  if (APPLE)
+    set(ARCH_PREFIX "mac")
+  else()
+    set(ARCH_PREFIX "lin")
+  endif()
+  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(ARCH_PREFIX "${ARCH_PREFIX}64")
+  else()
+    set(ARCH_PREFIX "${ARCH_PREFIX}32")
+  endif()
  set(ENABLE_RTTI "-frtti -fexceptions ")
  set(DISABLE_RTTI "-fno-rtti -fno-exceptions ")
-endif ()
+elseif(WIN32)
+  cmake_minimum_required (VERSION 3.1)
+  enable_language(ASM_MASM)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS- /Zc:wchar_t /Zc:forScope /DUSE_WINTHREAD")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0600 /volatile:iso")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4800 /wd4146 /wd4244 /wd4018")

-##--------
-#   - Added TBB_USE_GLIBCXX_VERSION macro to specify the version of GNU
-#     libstdc++ when it cannot be properly recognized, e.g. when used
-#     with Clang on Linux* OS. Inspired by a contribution from David A.
-if (NOT TBB_USE_GLIBCXX_VERSION AND UNIX AND NOT APPLE)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    # using Clang
-    string(REPLACE "." "0" TBB_USE_GLIBCXX_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    list(APPEND tbb_src src/tbb/intel64-masm/atomic_support.asm
+      src/tbb/intel64-masm/itsx.asm src/tbb/intel64-masm/intel64_misc.asm)
+    list(APPEND tbbmalloc_src src/tbb/intel64-masm/atomic_support.asm)
+    set(CMAKE_ASM_MASM_FLAGS "/DEM64T=1")
+    set(ARCH_PREFIX "win64")
+  else()
+    list(APPEND tbb_src src/tbb/ia32-masm/atomic_support.asm
+      src/tbb/ia32-masm/itsx.asm src/tbb/ia32-masm/lock_byte.asm)
+    list(APPEND tbbmalloc_src src/tbb/ia32-masm/atomic_support.asm)
+    set(ARCH_PREFIX "win32")
  endif()
+  set(ENABLE_RTTI "/EHsc /GR ")
+  set(DISABLE_RTTI "/EHs- /GR- ")
 endif()

-if (TBB_USE_GLIBCXX_VERSION)
-  target_compile_definitions(tbb_interface INTERFACE TBB_USE_GLIBCXX_VERSION=${TBB_USE_GLIBCXX_VERSION})
-endif()
-
-##-------
-
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-   check_cxx_compiler_flag ("-flifetime-dse=1" SUPPORTS_FLIFETIME)
-   if (SUPPORTS_FLIFETIME)
-     target_compile_options(tbb_interface INTERFACE -flifetime-dse=1)
-   endif()
+  include(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag("-flifetime-dse=1" SUPPORTS_FLIFETIME)
+  if (SUPPORTS_FLIFETIME)
+    add_definitions(-flifetime-dse=1)
+  endif()
 endif()

 # Linker export definitions
-if (APPLE)
-  set (ARCH_PREFIX "mac")
-elseif(WIN32)
-  set (ARCH_PREFIX "win")
-else()
-  set (ARCH_PREFIX "lin")
-endif()
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(ARCH_PREFIX "${ARCH_PREFIX}64")
-else()
-  set(ARCH_PREFIX "${ARCH_PREFIX}32")
-endif()
-
-if (MINGW)
-  set (ARCH_PREFIX "${ARCH_PREFIX}-gcc")
-  # there's no win32-gcc-tbb-export.def, use lin32-tbb-export.def
-  execute_process (COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/lin32-tbb-export.def ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/win32-gcc-tbb-export.def)
-endif()
-
-if (MSVC)
+if (WIN32)
  add_custom_command(OUTPUT tbb.def
    COMMAND ${CMAKE_CXX_COMPILER} /TC /EP ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/${ARCH_PREFIX}-tbb-export.def  -I ${CMAKE_CURRENT_SOURCE_DIR}/include > tbb.def
    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/${ARCH_PREFIX}-tbb-export.def
@@ -238,15 +109,18 @@ if (MSVC)
    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/${ARCH_PREFIX}-tbbmalloc-export.def
    COMMENT "Preprocessing tbbmalloc.def"
  )
+  list(APPEND tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/tbb_resource.rc)
+  list(APPEND tbbmalloc_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/tbbmalloc.rc)
+  list(APPEND tbbmalloc_proxy_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/tbbmalloc.rc)
 else()
  add_custom_command(OUTPUT tbb.def
-    COMMAND ${CMAKE_CXX_COMPILER} -xc++ -std=c++11 -E ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/${ARCH_PREFIX}-tbb-export.def  -I ${CMAKE_CURRENT_SOURCE_DIR}/include -o tbb.def
+    COMMAND ${CMAKE_CXX_COMPILER} -xc++ -E ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/${ARCH_PREFIX}-tbb-export.def  -I ${CMAKE_CURRENT_SOURCE_DIR}/include -o tbb.def
    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/${ARCH_PREFIX}-tbb-export.def
    COMMENT "Preprocessing tbb.def"
  )

  add_custom_command(OUTPUT tbbmalloc.def
-    COMMAND ${CMAKE_CXX_COMPILER} -xc++ -std=c++11 -E ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/${ARCH_PREFIX}-tbbmalloc-export.def  -I ${CMAKE_CURRENT_SOURCE_DIR}/include -o   tbbmalloc.def
+    COMMAND ${CMAKE_CXX_COMPILER} -xc++ -E ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/${ARCH_PREFIX}-tbbmalloc-export.def  -I ${CMAKE_CURRENT_SOURCE_DIR}/include -o   tbbmalloc.def
    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/tbbmalloc/${ARCH_PREFIX}-tbbmalloc-export.def
    COMMENT "Preprocessing tbbmalloc.def"
  )
@@ -257,80 +131,34 @@ add_custom_target(tbb_def_files DEPENDS tbb.def tbbmalloc.def)
 # TBB library
 if (TBB_BUILD_STATIC)
  add_library(tbb_static STATIC ${tbb_src})
-  target_link_libraries(tbb_static PRIVATE tbb_interface)
-  target_include_directories(tbb_static INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${TBB_INSTALL_INCLUDE_DIR}>")
+  set_property(TARGET tbb_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_BUILD=1")
+  set_property(TARGET tbb_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_SOURCE_DIRECTLY_INCLUDED=1")
  set_property(TARGET tbb_static APPEND_STRING PROPERTY COMPILE_FLAGS ${ENABLE_RTTI})
-  if (TBB_INSTALL_TARGETS)
-    install(TARGETS tbb_static ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR})
-  endif()
-
-  target_compile_definitions(tbb_static
-    PRIVATE
-      -D__TBB_BUILD=1
-      -D__TBB_DYNAMIC_LOAD_ENABLED=0
-      -D__TBB_SOURCE_DIRECTLY_INCLUDED=1)
-
-  if (MSVC)
-    target_compile_definitions(tbb_static
-      PUBLIC -D__TBB_NO_IMPLICIT_LINKAGE=1
-      PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-  endif()
-
-  if (UNIX AND NOT APPLE)
-    target_link_libraries(tbb_static PUBLIC pthread dl)
-  endif()
+  install(TARGETS tbb_static ARCHIVE DESTINATION lib)
 endif()

 if (TBB_BUILD_SHARED)
  add_library(tbb SHARED ${tbb_src})
-  target_link_libraries(tbb PRIVATE tbb_interface)
-  target_include_directories(tbb INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${TBB_INSTALL_INCLUDE_DIR}>")
+  set_property(TARGET tbb APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_BUILD=1")
  set_property(TARGET tbb APPEND_STRING PROPERTY COMPILE_FLAGS ${ENABLE_RTTI})
-  if (TBB_SET_SOVERSION)
-    set_property(TARGET tbb PROPERTY SOVERSION 2)
-  endif ()
-
-  target_compile_definitions(tbb
-    PRIVATE -D__TBB_BUILD=1)
-
-  if (MSVC)
-    target_compile_definitions(tbb
-      PUBLIC -D__TBB_NO_IMPLICIT_LINKAGE=1
-      PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-  endif()
-
  add_dependencies(tbb tbb_def_files)
-
  if (APPLE)
-    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "-Wl,-exported_symbols_list,\"${CMAKE_CURRENT_BINARY_DIR}/tbb.def\"")
-  elseif (MSVC)
-    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/tbb.def\"")
-  else ()
-    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "-Wl,-version-script,\"${CMAKE_CURRENT_BINARY_DIR}/tbb.def\"")
+    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/tbb.def")
+  elseif(UNIX)
+    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "-Wl,-version-script,${CMAKE_CURRENT_BINARY_DIR}/tbb.def")
+  elseif(WIN32)
+    set_property(TARGET tbb APPEND PROPERTY LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/tbb.def")
+    
  endif()
-
-  if (TBB_INSTALL_TARGETS)
-    install(TARGETS tbb EXPORT TBB
-            LIBRARY DESTINATION ${TBB_INSTALL_LIBRARY_DIR}
-            ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR}
-            RUNTIME DESTINATION ${TBB_INSTALL_RUNTIME_DIR})
-    if (MSVC)
-      install(FILES $<TARGET_PDB_FILE:tbb> DESTINATION ${TBB_INSTALL_RUNTIME_DIR} OPTIONAL)
-    endif()
-  endif()
-
-  if (UNIX AND NOT APPLE)
-    target_link_libraries(tbb PUBLIC pthread dl)
+  install(TARGETS tbb DESTINATION lib)
+  if(WIN32)
+    set_target_properties(tbb PROPERTIES OUTPUT_NAME "tbb$<$<CONFIG:Debug>:_debug>")
  endif()
 endif()

-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if(CMAKE_COMPILER_IS_GNUCC)
  # Quench a warning on GCC
  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/governor.cpp COMPILE_FLAGS "-Wno-missing-field-initializers ")
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  # Quench a warning on Clang
-  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/itt_notify.cpp COMPILE_FLAGS "-Wno-varargs ")
 elseif(MSVC)
  # Quench a warning on MSVC
  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/scheduler.cpp COMPILE_FLAGS "/wd4458 ")
@@ -340,50 +168,24 @@ if(TBB_BUILD_TBBMALLOC)
  # TBB malloc library
  if (TBB_BUILD_STATIC)
    add_library(tbbmalloc_static STATIC ${tbbmalloc_static_src})
-    target_link_libraries(tbbmalloc_static PRIVATE tbb_interface)
    set_property(TARGET tbbmalloc_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBBMALLOC_BUILD=1")
-    set_property(TARGET tbbmalloc_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_DYNAMIC_LOAD_ENABLED=0")
-    set_property(TARGET tbbmalloc_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_SOURCE_DIRECTLY_INCLUDED=1")
    set_property(TARGET tbbmalloc_static APPEND_STRING PROPERTY COMPILE_FLAGS ${DISABLE_RTTI})
-    if (MSVC)
-      target_compile_definitions(tbbmalloc_static PUBLIC __TBB_NO_IMPLICIT_LINKAGE=1 __TBBMALLOC_NO_IMPLICIT_LINKAGE=1)
-    endif()
-    if (TBB_INSTALL_TARGETS)
-      install(TARGETS tbbmalloc_static ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR})
-    endif()
+    install(TARGETS tbbmalloc_static ARCHIVE DESTINATION lib)
  endif()

  if (TBB_BUILD_SHARED)
    add_library(tbbmalloc SHARED ${tbbmalloc_src})
-    target_link_libraries(tbbmalloc PRIVATE tbb_interface)
    set_property(TARGET tbbmalloc APPEND PROPERTY COMPILE_DEFINITIONS "__TBBMALLOC_BUILD=1")
    set_property(TARGET tbbmalloc APPEND_STRING PROPERTY COMPILE_FLAGS ${DISABLE_RTTI})
-    if (TBB_SET_SOVERSION)
-      set_property(TARGET tbbmalloc PROPERTY SOVERSION 2)
-    endif ()
    add_dependencies(tbbmalloc tbb_def_files)
    if (APPLE)
-      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "-Wl,-exported_symbols_list,\"${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def\"")
-    elseif (MSVC)
-      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def\"")
-    else ()
-      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "-Wl,-version-script,\"${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def\"")
-    endif()
-    if (MSVC)
-      target_compile_definitions(tbbmalloc PUBLIC __TBB_NO_IMPLICIT_LINKAGE=1 __TBBMALLOC_NO_IMPLICIT_LINKAGE=1)
-    endif()
-    if (TBB_INSTALL_TARGETS)
-      install(TARGETS tbbmalloc EXPORT TBB
-              LIBRARY DESTINATION ${TBB_INSTALL_LIBRARY_DIR}
-              ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR}
-              RUNTIME DESTINATION ${TBB_INSTALL_RUNTIME_DIR})
-      if (MSVC)
-        install(FILES $<TARGET_PDB_FILE:tbbmalloc> DESTINATION ${TBB_INSTALL_RUNTIME_DIR} OPTIONAL)
-      endif()
-    endif()
-    if (UNIX AND NOT APPLE)
-      target_link_libraries(tbbmalloc PUBLIC pthread dl)
+      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def")
+    elseif(UNIX)
+      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "-Wl,-version-script,${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def")
+    elseif(WIN32)
+      set_property(TARGET tbbmalloc APPEND PROPERTY LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/tbbmalloc.def")
    endif()
+    install(TARGETS tbbmalloc DESTINATION lib)
  endif()
 endif()

@@ -391,298 +193,19 @@ if(TBB_BUILD_TBBMALLOC_PROXY)
  # TBB malloc proxy library
  if (TBB_BUILD_STATIC)
    add_library(tbbmalloc_proxy_static STATIC ${tbbmalloc_proxy_src})
-    target_link_libraries(tbbmalloc_proxy_static PRIVATE tbb_interface)
    set_property(TARGET tbbmalloc_proxy_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBBMALLOC_BUILD=1")
-    set_property(TARGET tbbmalloc_proxy_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_DYNAMIC_LOAD_ENABLED=0")
-    set_property(TARGET tbbmalloc_proxy_static APPEND PROPERTY COMPILE_DEFINITIONS "__TBB_SOURCE_DIRECTLY_INCLUDED=1")
    set_property(TARGET tbbmalloc_proxy_static APPEND_STRING PROPERTY COMPILE_FLAGS ${DISABLE_RTTI})
-    if (TBB_INSTALL_TARGETS)
-      install(TARGETS tbbmalloc_proxy_static ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR})
-    endif()
+    link_libraries(tbbmalloc_proxy_static tbbmalloc)
+    install(TARGETS tbbmalloc_proxy_static ARCHIVE DESTINATION lib)
  endif()

  if (TBB_BUILD_SHARED)
    add_library(tbbmalloc_proxy SHARED ${tbbmalloc_proxy_src})
-    target_link_libraries(tbbmalloc_proxy PRIVATE tbb_interface)
    set_property(TARGET tbbmalloc_proxy APPEND PROPERTY COMPILE_DEFINITIONS "__TBBMALLOC_BUILD=1")
    set_property(TARGET tbbmalloc_proxy APPEND_STRING PROPERTY COMPILE_FLAGS ${DISABLE_RTTI})
-    if (TBB_SET_SOVERSION)
-      set_property(TARGET tbbmalloc_proxy PROPERTY SOVERSION 2)
-    endif ()
-    target_link_libraries(tbbmalloc_proxy PUBLIC tbbmalloc)
-    if (TBB_INSTALL_TARGETS)
-      install(TARGETS tbbmalloc_proxy EXPORT TBB
-              LIBRARY DESTINATION ${TBB_INSTALL_LIBRARY_DIR}
-              ARCHIVE DESTINATION ${TBB_INSTALL_ARCHIVE_DIR}
-              RUNTIME DESTINATION ${TBB_INSTALL_RUNTIME_DIR})
-      if (MSVC)
-        install(FILES $<TARGET_PDB_FILE:tbbmalloc_proxy> DESTINATION ${TBB_INSTALL_RUNTIME_DIR} OPTIONAL)
-      endif()
-    endif()
-    if (UNIX AND NOT APPLE)
-      target_link_libraries(tbbmalloc_proxy PUBLIC pthread dl)
-    endif()
+    target_link_libraries(tbbmalloc_proxy tbbmalloc)
+    install(TARGETS tbbmalloc_proxy DESTINATION lib)
  endif()
 endif()

-if (TBB_INSTALL_TARGETS)
-  install(DIRECTORY include/tbb DESTINATION ${TBB_INSTALL_INCLUDE_DIR})
-  if (TBB_BUILD_SHARED)
-    install(EXPORT TBB DESTINATION ${TBB_CMAKE_PACKAGE_INSTALL_DIR} NAMESPACE TBB:: FILE TBBConfig.cmake)
-  endif()
-endif()
-
-# version file
-if (TBB_INSTALL_TARGETS)
-  set (_VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/include/tbb/tbb_stddef.h)
-  file (STRINGS ${_VERSION_FILE} _VERSION_MAJOR_STRING REGEX ".*define[ ]+TBB_VERSION_MAJOR[ ]+[0-9]+.*")
-  file (STRINGS ${_VERSION_FILE} _VERSION_MINOR_STRING REGEX ".*define[ ]+TBB_VERSION_MINOR[ ]+[0-9]+.*")
-  string (REGEX REPLACE ".*TBB_VERSION_MAJOR[ ]+([0-9]+)" "\\1" TBB_MAJOR_VERSION ${_VERSION_MAJOR_STRING})
-  string (REGEX REPLACE ".*TBB_VERSION_MINOR[ ]+([0-9]+)" "\\1" TBB_MINOR_VERSION ${_VERSION_MINOR_STRING})
-  set (TBB_VERSION_STRING "${TBB_MAJOR_VERSION}.${TBB_MINOR_VERSION}")
-  include (CMakePackageConfigHelpers)
-  write_basic_package_version_file (TBBConfigVersion.cmake VERSION "${TBB_VERSION_STRING}" COMPATIBILITY AnyNewerVersion)
-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/TBBConfigVersion.cmake DESTINATION "${TBB_CMAKE_PACKAGE_INSTALL_DIR}")
-endif()
-
-# version_string.ver
-if (UNIX AND NOT TBB_NO_DATE)
-  execute_process (COMMAND date "+%a, %d %b %Y %H:%M:%S %z"
-                   OUTPUT_VARIABLE _configure_date
-                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-elseif (WIN32 AND NOT TBB_NO_DATE)
-  execute_process (COMMAND cmd " /C date /T"
-                   OUTPUT_VARIABLE _configure_date
-                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-else ()
-  set (_configure_date "Unknown")
-endif()
-set (TBB_CONFIG_DATE "${_configure_date}" CACHE STRING "First time that TBB was configured")
-set (_configure_date "${TBB_CONFIG_DATE}")
-include_directories (${CMAKE_BINARY_DIR})
-configure_file (build/version_string.ver.in version_string.ver @ONLY)
-
-if (TBB_BUILD_TESTS)
-  enable_language (C)
-  enable_testing ()
-
-  find_library (LIBRT_LIBRARIES rt)
-  find_library (LIDL_LIBRARIES dl)
-  find_package (Threads)
-  if (NOT APPLE)
-    find_package (OpenMP)
-  endif()
-
-  macro (tbb_add_test testname)
-    set (full_testname tbb_test_${testname})
-    add_executable (${full_testname} src/test/test_${testname}.cpp)
-    target_link_libraries(${full_testname} PRIVATE tbb_interface)
-    if (TBB_BUILD_SHARED)
-      target_link_libraries (${full_testname} PRIVATE tbb tbbmalloc)
-      target_compile_definitions (${full_testname} PRIVATE __TBB_LIB_NAME=tbb)
-    else ()
-      target_link_libraries (${full_testname} PRIVATE tbb_static tbbmalloc_static)
-      target_compile_definitions (${full_testname} PRIVATE __TBB_LIB_NAME=tbb_static)
-    endif ()
-    if (LIBRT_LIBRARIES)
-      target_link_libraries (${full_testname} PRIVATE ${LIBRT_LIBRARIES})
-    endif ()
-    if (LIDL_LIBRARIES)
-      target_link_libraries (${full_testname} PRIVATE ${LIDL_LIBRARIES})
-    endif ()
-    if (Threads_FOUND)
-      target_link_libraries (${full_testname} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-    endif ()
-    if (OPENMP_FOUND AND "${testname}" MATCHES "openmp")
-      set_target_properties (${full_testname} PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
-      set_target_properties (${full_testname} PROPERTIES LINK_FLAGS "${OpenMP_CXX_FLAGS}")
-    endif()
-    if (MINGW)
-      target_link_libraries (${full_testname} PRIVATE psapi)
-    endif ()
-    add_test (NAME ${full_testname} COMMAND ${full_testname})
-  endmacro ()
-
-  tbb_add_test (aggregator)
-  tbb_add_test (aligned_space)
-  tbb_add_test (assembly)
-  if (NOT WIN32)
-    tbb_add_test (async_msg) # msvc64/debug timeouts
-  endif()
-  tbb_add_test (async_node)
-  # tbb_add_test (atomic) # msvc64/debug timeouts: Compile-time initialization fails for static tbb::atomic variables
-  tbb_add_test (blocked_range2d)
-  tbb_add_test (blocked_range3d)
-  tbb_add_test (blocked_range)
-  tbb_add_test (broadcast_node)
-  tbb_add_test (buffer_node)
-  tbb_add_test (cache_aligned_allocator)
-  if (NOT WIN32)
-    tbb_add_test (cache_aligned_allocator_STL)
-  endif()
-  tbb_add_test (cilk_dynamic_load)
-  tbb_add_test (cilk_interop)
-  tbb_add_test (combinable)
-  tbb_add_test (composite_node)
-  tbb_add_test (concurrent_hash_map)
-  tbb_add_test (concurrent_lru_cache)
-  # tbb_add_test (concurrent_monitor) # too long
-  # tbb_add_test (concurrent_priority_queue)
-  if (NOT WIN32)
-    tbb_add_test (concurrent_queue) # msvc64/debug timeouts
-  endif()
-  # tbb_add_test (concurrent_queue_whitebox)
-  tbb_add_test (concurrent_unordered_map)
-  # tbb_add_test (concurrent_unordered_set)
-  tbb_add_test (concurrent_vector)
-  tbb_add_test (continue_node)
-  tbb_add_test (critical_section)
-  tbb_add_test (dynamic_link)
-  # tbb_add_test (eh_algorithms)
-  tbb_add_test (eh_flow_graph)
-  # tbb_add_test (eh_tasks)
-  tbb_add_test (enumerable_thread_specific)
-  tbb_add_test (examples_common_utility)
-  # tbb_add_test (fast_random)
-  tbb_add_test (flow_graph)
-  tbb_add_test (flow_graph_whitebox)
-  # tbb_add_test (fp) # mingw: harness_fp.h:66, assertion !checkConsistency || (ctl.mxcsr & SSE_RND_MODE_MASK) >> 3 == (ctl.x87cw & FE_RND_MODE_MASK): failed
-  # tbb_add_test (function_node) # mingw:random timeout
-  # tbb_add_test (global_control)
-  # tbb_add_test (global_control_whitebox)
-  tbb_add_test (halt)
-  tbb_add_test (handle_perror)
-  # tbb_add_test (hw_concurrency)
-  tbb_add_test (indexer_node)
-  tbb_add_test (inits_loop)
-  tbb_add_test (intrusive_list)
-  tbb_add_test (ittnotify)
-  # tbb_add_test (join_node) #msvc/64: fatal error C1128: number of sections exceeded object file format limit: compile with /bigob
-  tbb_add_test (lambda)
-  tbb_add_test (limiter_node)
-  # tbb_add_test (malloc_atexit)
-  # tbb_add_test (malloc_compliance) #mingw: Limits should be decreased for the test to work
-  tbb_add_test (malloc_init_shutdown)
-  # tbb_add_test (malloc_lib_unload)
-  # tbb_add_test (malloc_overload)
-  tbb_add_test (malloc_pools)
-  tbb_add_test (malloc_regression)
-  # tbb_add_test (malloc_used_by_lib)
-  # tbb_add_test (malloc_whitebox)
-  tbb_add_test (model_plugin)
-  # tbb_add_test (multifunction_node) # too long
-  tbb_add_test (mutex)
-  tbb_add_test (mutex_native_threads)
-  # tbb_add_test (opencl_node)
-  if (OPENMP_FOUND)
-    tbb_add_test (openmp)
-  endif ()
-  tbb_add_test (overwrite_node)
-  # tbb_add_test (parallel_do)
-  # This seems to fail on CI platforms (AppVeyor/Travis), perhaps because the VM exposes just 1 core?
-  tbb_add_test (parallel_for)
-  tbb_add_test (parallel_for_each)
-  tbb_add_test (parallel_for_vectorization)
-  tbb_add_test (parallel_invoke)
-  tbb_add_test (parallel_pipeline)
-  tbb_add_test (parallel_reduce)
-  tbb_add_test (parallel_scan)
-  tbb_add_test (parallel_sort)
-  tbb_add_test (parallel_while)
-  # tbb_add_test (partitioner_whitebox) # too long
-  tbb_add_test (pipeline)
-  # tbb_add_test (pipeline_with_tbf) # takes forever on appveyor
-  tbb_add_test (priority_queue_node)
-  tbb_add_test (queue_node)
-  tbb_add_test (reader_writer_lock)
-  # tbb_add_test (runtime_loader) # LINK : fatal error LNK1104: cannot open file 'tbbproxy.lib' [C:\projects\tbb\test_runtime_loader.vcxproj]
-  tbb_add_test (rwm_upgrade_downgrade)
-  # tbb_add_test (ScalableAllocator)
-  if (NOT WIN32)
-    tbb_add_test (ScalableAllocator_STL)
-  endif()
-  tbb_add_test (semaphore)
-  # tbb_add_test (sequencer_node) # msvc: timeout
-  tbb_add_test (source_node)
-  tbb_add_test (split_node)
-  tbb_add_test (static_assert)
-  tbb_add_test (std_thread)
-  tbb_add_test (tagged_msg)
-  # tbb_add_test (task_arena) # LINK : fatal error LNK1104: cannot open file '__TBB_LIB_NAME.lib' [C:\projects\tbb\test_task_arena.vcxproj]
-  # tbb_add_test (task_assertions)
-  tbb_add_test (task_auto_init)
-  tbb_add_test (task)
-  # tbb_add_test (task_enqueue) # too long
-  tbb_add_test (task_group)
-  # tbb_add_test (task_leaks)
-  # tbb_add_test (task_priority)
-  # tbb_add_test (task_scheduler_init) # msvc: test_task_scheduler_init.cpp:68, assertion !test_mandatory_parallelism || Harness::CanReachConcurrencyLevel(threads): failed
-  tbb_add_test (task_scheduler_observer)
-  tbb_add_test (task_steal_limit)
-  tbb_add_test (tbb_condition_variable)
-  tbb_add_test (tbb_fork)
-  # tbb_add_test (tbb_header)
-  tbb_add_test (tbb_thread)
-  # tbb_add_test (tbb_version)
-  tbb_add_test (tick_count)
-  tbb_add_test (tuple)
-  tbb_add_test (write_once_node)
-  tbb_add_test (yield)
-endif ()
-
-if (TBB_BUILD_PYTHON)
-  find_package(PythonInterp)
-  find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-  find_package(SWIG 3)
-  if (PythonLibs_FOUND AND SWIG_FOUND AND TBB_BUILD_SHARED)
-    include (${SWIG_USE_FILE})
-    set_source_files_properties (python/tbb/api.i PROPERTIES CPLUSPLUS ON)
-    set (CMAKE_SWIG_FLAGS "-threads")
-
-    # swig_add_module is deprecated
-    if (CMAKE_VERSION VERSION_LESS 3.8)
-      swig_add_module (api python python/tbb/api.i)
-    else ()
-      swig_add_library (api LANGUAGE python SOURCES python/tbb/api.i)
-    endif ()
-
-    # UseSWIG generates now standard target names
-    if (CMAKE_VERSION VERSION_LESS 3.13)
-      set (module_target ${SWIG_MODULE_api_REAL_NAME})
-    else ()
-      set (module_target api)
-    endif ()
-
-    target_include_directories(${module_target} PRIVATE ${PYTHON_INCLUDE_DIRS})
-    target_link_libraries(${module_target} PRIVATE tbb)
-    if(WIN32)
-      target_link_libraries(${module_target} ${PYTHON_LIBRARIES})
-    elseif(APPLE)
-      set_target_properties(${module_target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-    endif()
-
-    if (WIN32)
-      set (PYTHON_SITE_PACKAGES Lib/site-packages)
-    else ()
-      set (PYTHON_SITE_PACKAGES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-    endif ()
-    if (TBB_INSTALL_TARGETS)
-      install(FILES python/TBB.py
-              DESTINATION ${PYTHON_SITE_PACKAGES})
-      install(FILES python/tbb/__init__.py python/tbb/pool.py python/tbb/test.py python/tbb/__main__.py ${CMAKE_CURRENT_BINARY_DIR}/api.py
-              DESTINATION ${PYTHON_SITE_PACKAGES}/tbb)
-      install(TARGETS ${module_target}
-              DESTINATION ${PYTHON_SITE_PACKAGES}/tbb)
-    endif()
-
-    if(UNIX AND NOT APPLE)
-      add_library(irml SHARED python/rml/ipc_server.cpp python/rml/ipc_utils.cpp src/tbb/cache_aligned_allocator.cpp src/tbb/dynamic_link.cpp src/tbb/tbb_misc_ex.cpp src/tbb/tbb_misc.cpp)
-      target_compile_definitions(irml PRIVATE DO_ITT_NOTIFY=0 USE_PTHREAD=1)
-      target_link_libraries(irml PRIVATE tbb)
-      set_target_properties(irml PROPERTIES VERSION 1)
-      if (TBB_INSTALL_TARGETS)
-        install(TARGETS irml DESTINATION ${TBB_INSTALL_LIBRARY_DIR})
-      endif()
-    endif ()
-  endif ()
-endif ()
+install(DIRECTORY include/tbb DESTINATION include)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clément Foucault	7499e7912e	Fix subpass iteration	2020-05-26 13:04:23 +02:00
Clément Foucault	b2320263f2	EEVEE: Fix assert during default shader compilation The default shader could have been requested as deferred and then as non defered. This could make the shader compilation assert.	2020-05-14 16:55:25 +02:00
Clément Foucault	c11aea538f	Cleanup: DRW: Remove unused DRW_shgroup_hair_create/DRW_shgroup_material_hair_create	2020-05-14 16:55:25 +02:00
Clément Foucault	3b86d5e95c	Cleanup: EEVEE: Remove EEVEE_material_default_render_pass_ubo_get	2020-05-14 16:55:25 +02:00
Clément Foucault	ca22d1ec79	Cleanup: EEVEE: Move shader related function to eevee_shaders.c	2020-05-14 16:55:25 +02:00
Clément Foucault	9f8c22929b	Cleanup: EEVEE: Split LUT generation code from eevee_material.c	2020-05-14 16:55:25 +02:00
Clément Foucault	5ead114e1c	Cleanup: EEVEE: Remove Unused variable after refactor.	2020-05-14 16:55:25 +02:00
Clément Foucault	8197022d6c	EEVEE: Rewrite Passes and Material handling Passes of the same type are now chained together and reusing the same shgroup when possible. Materials are now always handled as a nodetree compiled shader (GPUMaterial) even for default materials. Render passes use a ubo reference to change output pass type instead of creating a lot of DRWPasses. # Conflicts: # source/blender/draw/engines/eevee/eevee_materials.c	2020-05-14 16:53:03 +02:00
Clément Foucault	6e18b02065	EEVEE: Rename / merge passes using new DRWPass chaining/instancing Now calling DRW_pass_draw on material_ps will draw all opaque passes. Same for depth_ps for opaque prepass.	2020-05-14 16:46:18 +02:00
Clément Foucault	cf6ee13fab	EEVEE: Make lit_surface_vert.glsl usable for depth pass	2020-05-14 16:46:18 +02:00
Clément Foucault	4f89f4e1b0	EEVEE: Use alpha hash shader for alpha clip material This reduces the number of shader combination. We use the nodetree material output node shader code to do the alpha comparison.	2020-05-14 16:46:18 +02:00
Clément Foucault	2ef54d03b5	DRW: Expose DRW_shgroup_add_material_resources for better flexibility	2020-05-14 16:46:18 +02:00
Clément Foucault	4090f06b2d	DRW: Add pass chaining and instances Instancing will draw the same shgroups but with the instancer pass' state. Chaining (linking) will render multiple passes by just calling DRW_draw_pass on the first one.	2020-05-14 16:46:18 +02:00
Clément Foucault	4d05823055	DRW: Add texture ref persist, block ref and block ref persist uniforms	2020-05-14 16:46:18 +02:00
Clément Foucault	5ce4ce2e50	GPUMaterial: Expose shader getter	2020-05-14 16:46:17 +02:00