PointCloud: Initial rendering support for Workbench

Also includes outline overlays. Removes the temp overlay drawing We make the geometry follow camera like billboards this uses less geometry. Currently we use half octahedron for now. Goal would be to use icospheres. This patch also optimize the case when pointcloud has uniform radius. However we should premultiply the radius prop by the default radius beforehand to avoid a multiplication on CPU. Differential Revision: https://developer.blender.org/D8301
PointCloud: Change visualization to use octahedron
2020-07-15 14:23:35 +02:00 · 2020-07-15 14:08:32 +02:00 · 2020-07-15 13:23:22 +02:00 · 2020-07-14 16:47:45 +02:00 · 2020-07-11 14:46:02 +02:00
3997 changed files with 139883 additions and 201453 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -238,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
@@ -253,8 +252,8 @@ ForEachMacros:
  - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
-  - SEQ_ALL_BEGIN
-  - SEQ_CURRENT_BEGIN
+  - SEQP_BEGIN
+  - SEQ_BEGIN
  - SURFACE_QUAD_ITER_BEGIN
  - foreach
  - ED_screen_areas_iter
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,3 @@
-# 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-*,
@@ -15,17 +12,32 @@ Checks:  >

  -readability-misleading-indentation,

+  -readability-else-after-return,
+  -readability-inconsistent-declaration-parameter-name,
+  -readability-redundant-preprocessor,
+  -readability-function-size,
+  -readability-function-size,
+  -readability-redundant-string-init,
  -readability-redundant-member-init,
-  -readability-use-anyofallof,
+  -readability-const-return-type,
+  -readability-static-accessed-through-instance,
+  -readability-redundant-declaration,
+  -readability-qualified-auto,

  bugprone-*,
  -bugprone-narrowing-conversions,
  -bugprone-unhandled-self-assignment,
  -bugprone-branch-clone,
  -bugprone-macro-parentheses,
-  -bugprone-reserved-identifier,

  -bugprone-sizeof-expression,
  -bugprone-integer-division,
+  -bugprone-incorrect-roundings,
+  -bugprone-suspicious-string-compare,
+  -bugprone-not-null-terminated-result,
+  -bugprone-suspicious-missing-comma,
+  -bugprone-parent-virtual-call,
+  -bugprone-infinite-loop,
+  -bugprone-copy-constructor-init,

 WarningsAsErrors: '*'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
  endif()
 endif()

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

 # 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
@@ -102,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)
@@ -128,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)
@@ -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)
@@ -222,8 +214,6 @@ if(WITH_GHOST_X11)
  option(WITH_GHOST_XDND    "Enable drag'n'drop support on X11 using XDND protocol" ON)
 endif()

-option(WITH_GMP "Use the gmp library for more accurate booleans" OFF)
-
 # Misc...
 option(WITH_HEADLESS      "Build without graphical support (renderfarm, server mode only)" OFF)
 mark_as_advanced(WITH_HEADLESS)
@@ -377,7 +367,7 @@ 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_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 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)
@@ -438,14 +428,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)
@@ -516,21 +498,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.
-      if(CMAKE_BUILD_TYPE MATCHES "Debug")
-        # Silence the warning that object-size is not effective in -O0.
-        set(_asan_defaults "${_asan_defaults}")
-      else()
-        set(_asan_defaults "${_asan_defaults} -fsanitize=object-size")
-      endif()
-    else()
-      set(_asan_defaults "${_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")
@@ -538,31 +508,16 @@ 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()
@@ -856,9 +811,6 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
    if(MSVC)
      set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6")
    endif()
-    if(APPLE)
-      set(COMPILER_ASAN_LINKER_FLAGS "-fno-omit-frame-pointer -fsanitize=address")
-    endif(APPLE)
    if(COMPILER_ASAN_LIBRARY)
      set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
      set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
@@ -948,7 +900,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__)
@@ -1608,12 +1560,6 @@ endif()

 if(MSVC)
  set(CMAKE_CXX_FLAGS "${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)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
-  endif()
 elseif(
  CMAKE_COMPILER_IS_GNUCC OR
  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
@@ -1682,6 +1628,10 @@ endif()
 #-----------------------------------------------------------------------------
 # Libraries

+if(WITH_GTESTS)
+  include(GTestTesting)
+endif()
+
 if(WITH_BLENDER)
  add_subdirectory(intern)
  add_subdirectory(extern)
@@ -1776,7 +1726,6 @@ if(FIRST_RUN)
  info_cfg_option(WITH_QUADRIFLOW)
  info_cfg_option(WITH_USD)
  info_cfg_option(WITH_TBB)
-  info_cfg_option(WITH_GMP)

  info_cfg_text("Compiler Options:")
  info_cfg_option(WITH_BUILDINFO)
--- a/27
+++ b/27
@@ -81,19 +81,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
-
-   * 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 that spell checkers can tak 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.
@@ -465,17 +457,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
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -57,6 +57,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)
@@ -88,18 +89,14 @@ include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
 include(cmake/numpy.cmake)
 include(cmake/usd.cmake)
-# Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed.
-include(cmake/boost.cmake)
 if(UNIX)
  # Rely on PugiXML compiled with OpenImageIO
 else()
  include(cmake/pugixml.cmake)
 endif()
-if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
-  include(cmake/ispc.cmake)
-  include(cmake/openimagedenoise.cmake)
-  include(cmake/embree.cmake)
-endif()
+include(cmake/ispc.cmake)
+include(cmake/openimagedenoise.cmake)
+include(cmake/embree.cmake)
 if(NOT APPLE)
  include(cmake/xr_openxr.cmake)
 endif()
@@ -118,7 +115,6 @@ if(WIN32)
 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)
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -19,6 +19,17 @@
 set(BOOST_ADDRESS_MODEL 64)

 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)

@@ -49,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
@@ -80,7 +76,6 @@ set(BOOST_OPTIONS
  -sNO_LZMA=1
  -sNO_ZSTD=1
  ${BOOST_TOOLSET}
-  ${BOOST_PYTHON_OPTIONS}
 )

 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
@@ -97,11 +92,3 @@ ExternalProject_Add(external_boost
  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/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -30,11 +30,6 @@ else()
  set(CLANG_GENERATOR "Unix Makefiles")
 endif()

-if(APPLE)
-  set(CLANG_EXTRA_ARGS ${CLANG_EXTRA_ARGS}
-    -DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
-  )
-endif()

 ExternalProject_Add(external_clang
  URL ${CLANG_URI}
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -95,6 +95,8 @@ ExternalProject_Add(external_ffmpeg
    --disable-version3
    --disable-debug
    --enable-optimizations
+    --disable-sse
+    --disable-ssse3
    --enable-ffplay
    --disable-openssl
    --disable-securetransport
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -1,95 +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 --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32)
-else()
-  set(GMP_OPTIONS --enable-static --disable-shared )
-endif()
-
-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  set(GMP_OPTIONS
-     ${GMP_OPTIONS}
-     --disable-assembly
-  )
-endif()
-
-ExternalProject_Add(external_gmp
-  URL ${GMP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${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 ${GMP_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${GMP_HASH}
-    PREFIX ${BUILD_DIR}/gmpxx
-    PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_gmpxx.txt ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
-                          ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/config_gmpxx.h ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h
-    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/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -42,7 +42,7 @@ if(BUILD_MODE STREQUAL Release)
        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
        # tiff
        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
    DEPENDS
  )
 endif()
@@ -89,8 +89,6 @@ 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")
@@ -134,12 +132,8 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
-  harvest(openimagedenoise/include openimagedenoise/include "*")
-  harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
-  harvest(embree/include embree/include "*.h")
-  harvest(embree/lib embree/lib "*.a")
-endif()
+harvest(openimagedenoise/include openimagedenoise/include "*")
+harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
 harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
@@ -174,6 +168,8 @@ 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 "*")
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -73,3 +73,4 @@ if(WIN32)
    external_flexbison
  )
 endif()
+
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -16,17 +16,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-if(APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  set(LLVM_TARGETS AArch64)
-else()
-  set(LLVM_TARGETS X86)
-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
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -38,7 +38,6 @@ ExternalProject_Add(external_numpy
  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 ""
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -30,13 +30,6 @@ set(OPENCOLORIO_EXTRA_ARGS
  -DOCIO_STATIC_JNIGLUE=OFF
 )

-if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
-  set(OPENCOLORIO_EXTRA_ARGS
-     ${OPENCOLORIO_EXTRA_ARGS}
-     -DOCIO_USE_SSE=OFF
-  )
-endif()
-
 if(WIN32)
  set(OCIO_PATCH opencolorio_win.diff)
  set(OPENCOLORIO_EXTRA_ARGS
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -22,7 +22,6 @@ ExternalProject_Add(external_openmp
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
  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
--- 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
@@ -50,10 +42,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
 )

 if(WIN32)
@@ -97,15 +87,13 @@ if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(openvdb after_install
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/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
@@ -20,7 +20,6 @@ if(WIN32)
  option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
-option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")

 if(NOT BUILD_MODE)
@@ -118,28 +117,16 @@ else()
      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.13)
    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)

-    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-darwin17.0.0) # OS X 10.13
    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}
    )
@@ -195,6 +182,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/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -22,10 +22,6 @@ set(PNG_EXTRA_ARGS
  -DPNG_STATIC=ON
 )

-if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  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 ${PNG_URI}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -42,7 +42,7 @@ if(WIN32)
    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}
+    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
  )

@@ -69,17 +69,12 @@ else()
      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()
    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_macos.diff)
  else()
    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
- endif()
+  endif()

  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
@@ -89,6 +84,7 @@ else()
    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 ${PYTHON_URI}
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -51,7 +51,7 @@ ExternalProject_Add(external_sqlite
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
  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/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -20,7 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)

 if(APPLE)
-   set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
+  set(SSL_OS_COMPILER "blender-darwin-x86_64")
 else()
  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
--- a/build_files/build_environment/cmake/ssl.conf
+++ b/build_files/build_environment/cmake/ssl.conf
@@ -12,9 +12,4 @@ my %targets = (
    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/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -27,7 +27,6 @@ ExternalProject_Add(external_theora
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
  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/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -312,11 +312,6 @@ set(NASM_HASH f4fd1329b1713e1ccd34b2fc121c4bcd278c9f91cc4cb205ae8fcd2e4728dd14)
 set(XR_OPENXR_SDK_VERSION 1.0.8)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
 set(XR_OPENXR_SDK_HASH c6de63d2e0f9029aa58dfa97cad8ce07)
-
 set(ISPC_VERSION v1.13.0)
 set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
 set(ISPC_HASH 4bf5e8d0020c4b9980faa702c1a6f25f)
-
-set(GMP_VERSION 6.2.0)
-set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
-set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1)
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -24,11 +24,7 @@ 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()
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -22,14 +22,9 @@ endif()


 if(APPLE)
-  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-    set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm")
-    set(X264_CONFIGURE_ENV echo .)
-  else()
-    set(X264_CONFIGURE_ENV
-      export AS=${LIBDIR}/nasm/bin/nasm
-    )
-  endif()
+  set(X264_CONFIGURE_ENV
+    export AS=${LIBDIR}/nasm/bin/nasm
+  )
 else()
  set(X264_CONFIGURE_ENV echo .)
 endif()
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -374,96 +374,71 @@ NO_BUILD=false
 NO_CONFIRM=false
 USE_CXX11=true

-# Note about versions: Min is inclusive, Max is exclusive (i.e. XXX_VERSION_MIN <= ACTUAL_VERSION < XXX_VERSION_MAX)
-# XXX_VERSION is officially supported/used version in official builds.
-# XXX_VERSION_SHORT is used for various things, like preferred version (when distribution provides several of them),
-#                   and to name shortcuts to built libraries' installation directories...
-
 CLANG_FORMAT_VERSION_MIN="6.0"
-CLANG_FORMAT_VERSION_MAX="10.0"

 PYTHON_VERSION="3.7.7"
-PYTHON_VERSION_SHORT="3.7"
 PYTHON_VERSION_MIN="3.7"
-PYTHON_VERSION_MAX="3.9"
 PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_MIN
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
 PYTHON_SKIP=false

-NUMPY_VERSION="1.17.5"
-NUMPY_VERSION_SHORT="1.17"
+NUMPY_VERSION="1.17.0"
 NUMPY_VERSION_MIN="1.8"
-NUMPY_VERSION_MAX="2.0"
 NUMPY_FORCE_BUILD=false
 NUMPY_FORCE_REBUILD=false
 NUMPY_SKIP=false

 BOOST_VERSION="1.70.0"
-BOOST_VERSION_SHORT="1.70"
 BOOST_VERSION_MIN="1.49"
-BOOST_VERSION_MAX="2.0"
 BOOST_FORCE_BUILD=false
 BOOST_FORCE_REBUILD=false
 BOOST_SKIP=false

 TBB_VERSION="2019"
-TBB_VERSION_SHORT="2019"
 TBB_VERSION_UPDATE="_U9"  # Used for source packages...
 TBB_VERSION_MIN="2018"
-TBB_VERSION_MAX="2021"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false

-OCIO_VERSION="1.1.1"
-OCIO_VERSION_SHORT="1.1"
+OCIO_VERSION="1.1.0"
 OCIO_VERSION_MIN="1.0"
-OCIO_VERSION_MAX="1.2"
 OCIO_FORCE_BUILD=false
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false

 OPENEXR_VERSION="2.4.0"
-OPENEXR_VERSION_SHORT="2.4"
 OPENEXR_VERSION_MIN="2.3"
-OPENEXR_VERSION_MAX="3.0"
 OPENEXR_FORCE_BUILD=false
 OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false

-OIIO_VERSION="2.1.15.0"
-OIIO_VERSION_SHORT="2.1"
-OIIO_VERSION_MIN="1.8"
-OIIO_VERSION_MAX="3.0"
+OIIO_VERSION="1.8.13"
+OIIO_VERSION_MIN="1.8.13"
+OIIO_VERSION_MAX="99.99.0"  # UNKNOWN currently # Not supported by current OSL...
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false

 LLVM_VERSION="9.0.1"
-LLVM_VERSION_SHORT="9.0"
 LLVM_VERSION_MIN="6.0"
-LLVM_VERSION_MAX="11.0"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false

 # OSL needs to be compiled for now!
-OSL_VERSION="1.10.10"
-OSL_VERSION_SHORT="1.10"
-OSL_VERSION_MIN="1.10"
-OSL_VERSION_MAX="2.0"
+OSL_VERSION="1.10.9"
+OSL_VERSION_MIN=$OSL_VERSION
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false

 # OpenSubdiv needs to be compiled for now
 OSD_VERSION="3.4.3"
-OSD_VERSION_SHORT="3.4"
-OSD_VERSION_MIN="3.4"
-OSD_VERSION_MAX="4.0"
+OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
 OSD_SKIP=false
@@ -472,69 +447,46 @@ OSD_SKIP=false
 OPENVDB_BLOSC_VERSION="1.5.0"

 OPENVDB_VERSION="7.0.0"
-OPENVDB_VERSION_SHORT="7.0"
-OPENVDB_VERSION_MIN="7.0"
-OPENVDB_VERSION_MAX="8.0"
+OPENVDB_VERSION_MIN=$OPENVDB_VERSION
 OPENVDB_FORCE_BUILD=false
 OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false

 # Alembic needs to be compiled for now
 ALEMBIC_VERSION="1.7.12"
-ALEMBIC_VERSION_SHORT="1.7"
-ALEMBIC_VERSION_MIN="1.7"
-ALEMBIC_VERSION_MAX="2.0"
+ALEMBIC_VERSION_MIN=$ALEMBIC_VERSION
 ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false

 USD_VERSION="20.05"
-USD_VERSION_SHORT="20.05"
-USD_VERSION_MIN="20.05"
-USD_VERSION_MAX="20.06"
 USD_FORCE_BUILD=false
 USD_FORCE_REBUILD=false
 USD_SKIP=false

 OPENCOLLADA_VERSION="1.6.68"
-OPENCOLLADA_VERSION_SHORT="1.6"
-OPENCOLLADA_VERSION_MIN="1.6.68"
-OPENCOLLADA_VERSION_MAX="1.7"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false

 EMBREE_VERSION="3.10.0"
-EMBREE_VERSION_SHORT="3.10"
-EMBREE_VERSION_MIN="3.10"
-EMBREE_VERSION_MAX="4.0"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false

-OIDN_VERSION="1.2.1"
-OIDN_VERSION_SHORT="1.2"
-OIDN_VERSION_MIN="1.2.0"
-OIDN_VERSION_MAX="1.3"
+OIDN_VERSION="1.0.0"
 OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false

-ISPC_VERSION="1.14.0"
-
 FFMPEG_VERSION="4.2.3"
-FFMPEG_VERSION_SHORT="4.2"
-FFMPEG_VERSION_MIN="3.0"
-FFMPEG_VERSION_MAX="5.0"
+FFMPEG_VERSION_MIN="2.8.4"
 FFMPEG_FORCE_BUILD=false
 FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"

 XR_OPENXR_VERSION="1.0.8"
-XR_OPENXR_VERSION_SHORT="1.0"
-XR_OPENXR_VERSION_MIN="1.0.8"
-XR_OPENXR_VERSION_MAX="2.0"
 XR_OPENXR_FORCE_BUILD=false
 XR_OPENXR_FORCE_REBUILD=false
 XR_OPENXR_SKIP=false
@@ -682,43 +634,36 @@ while true; do
    --ver-ocio)
      OCIO_VERSION="$2"
      OCIO_VERSION_MIN=$OCIO_VERSION
-      OCIO_VERSION_SHORT=$OCIO_VERSION
      shift; shift; continue
    ;;
    --ver-oiio)
      OIIO_VERSION="$2"
      OIIO_VERSION_MIN=$OIIO_VERSION
-      OIIO_VERSION_SHORT=$OIIO_VERSION
      shift; shift; continue
    ;;
    --ver-llvm)
      LLVM_VERSION="$2"
      LLVM_VERSION_MIN=$LLVM_VERSION
-      LLVM_VERSION_SHORT=$LLVM_VERSION
      shift; shift; continue
    ;;
    --ver-osl)
      OSL_VERSION="$2"
      OSL_VERSION_MIN=$OSL_VERSION
-      OSL_VERSION_SHORT=$OSL_VERSION
      shift; shift; continue
    ;;
    --ver-osd)
      OSD_VERSION="$2"
      OSD_VERSION_MIN=$OSD_VERSION
-      OSD_VERSION_SHORT=$OSD_VERSION
      shift; shift; continue
    ;;
    --ver-openvdb)
      OPENVDB_VERSION="$2"
      OPENVDB_VERSION_MIN=$OPENVDB_VERSION
-      OPENVDB_VERSION_SHORT=$OPENVDB_VERSION
      shift; shift; continue
    ;;
    --ver-xr-openxr)
      XR_OPENXR_VERSION="$2"
      XR_OPENXR_VERSION_MIN=$XR_OPENXR_VERSION
-      XR_OPENXR_VERSION_SHORT=$XR_OPENXR_VERSION
      shift; shift; continue
    ;;
    --build-all)
@@ -1060,8 +1005,6 @@ OIDN_SOURCE=( "https://github.com/OpenImageDenoise/oidn/releases/download/v${OID
 #~ OIDN_REPO_UID="dabfd9c80101edae9d25a710160d12d6d963c591"
 #~ OIDN_REPO_BRANCH="master"

-ISPC_BINARY=( "https://github.com/ispc/ispc/releases/download/v${ISPC_VERSION}/ispc-v${ISPC_VERSION}-linux.tar.gz" )
-
 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )

 XR_OPENXR_USE_REPO=false
@@ -1087,7 +1030,7 @@ Those libraries should be available as packages in all recent distributions (opt
    * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
    * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
    * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
-    * libsdl2, libglew, [libgmp], [libglewmx], fontconfig.\""
+    * libsdl2, libglew, [libglewmx].\""

 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:

@@ -1327,7 +1270,7 @@ _init_python() {
  _src=$SRC/Python-$PYTHON_VERSION
  _git=false
  _inst=$INST/python-$PYTHON_VERSION
-  _inst_shortcut=$INST/python-$PYTHON_VERSION_SHORT
+  _inst_shortcut=$INST/python-$PYTHON_VERSION_MIN
 }

 _update_deps_python() {
@@ -1402,7 +1345,7 @@ compile_Python() {
    INFO "If you want to force rebuild of this lib, use the --force-python option."
  fi

-  run_ldconfig "python-$PYTHON_VERSION_SHORT"
+  run_ldconfig "python-$PYTHON_VERSION_MIN"
 }

 # ----------------------------------------------------------------------------
@@ -1412,8 +1355,8 @@ _init_numpy() {
  _src=$SRC/numpy-$NUMPY_VERSION
  _git=false
  _inst=$INST/numpy-$NUMPY_VERSION
-  _python=$INST/python-$PYTHON_VERSION_SHORT
-  _site=lib/python$PYTHON_VERSION_SHORT/site-packages
+  _python=$INST/python-$PYTHON_VERSION
+  _site=lib/python$PYTHON_VERSION_MIN/site-packages
  _inst_shortcut=$_python/$_site/numpy
 }

@@ -1492,7 +1435,7 @@ compile_Numpy() {
 _init_boost() {
  _src=$SRC/boost-$BOOST_VERSION
  _git=false
-  _inst=$INST/boost-$BOOST_VERSION_SHORT
+  _inst=$INST/boost-$BOOST_VERSION
  _inst_shortcut=$INST/boost
 }

@@ -1585,7 +1528,7 @@ compile_Boost() {
 _init_tbb() {
  _src=$SRC/TBB-$TBB_VERSION
  _git=false
-  _inst=$INST/tbb-$TBB_VERSION_SHORT
+  _inst=$INST/tbb-$TBB_VERSION
  _inst_shortcut=$INST/tbb
 }

@@ -1713,7 +1656,7 @@ _init_ocio() {
  else
    _git=false
  fi
-  _inst=$INST/ocio-$OCIO_VERSION_SHORT
+  _inst=$INST/ocio-$OCIO_VERSION
  _inst_shortcut=$INST/ocio
 }

@@ -1838,7 +1781,7 @@ compile_OCIO() {
 _init_openexr() {
  _src=$SRC/OpenEXR-$OPENEXR_VERSION
  _git=false
-  _inst=$INST/openexr-$OPENEXR_VERSION_SHORT
+  _inst=$INST/openexr-$OPENEXR_VERSION
  _inst_shortcut=$INST/openexr
 }

@@ -1968,7 +1911,7 @@ compile_OPENEXR() {
 _init_oiio() {
  _src=$SRC/OpenImageIO-$OIIO_VERSION
  _git=true
-  _inst=$INST/oiio-$OIIO_VERSION_SHORT
+  _inst=$INST/oiio-$OIIO_VERSION
  _inst_shortcut=$INST/oiio
 }

@@ -2123,7 +2066,7 @@ _init_llvm() {
  _src=$SRC/LLVM-$LLVM_VERSION
  _src_clang=$SRC/CLANG-$LLVM_VERSION
  _git=false
-  _inst=$INST/llvm-$LLVM_VERSION_SHORT
+  _inst=$INST/llvm-$LLVM_VERSION
  _inst_shortcut=$INST/llvm
 }

@@ -2235,7 +2178,7 @@ compile_LLVM() {
 _init_osl() {
  _src=$SRC/OpenShadingLanguage-$OSL_VERSION
  _git=true
-  _inst=$INST/osl-$OSL_VERSION_SHORT
+  _inst=$INST/osl-$OSL_VERSION
  _inst_shortcut=$INST/osl
 }

@@ -2380,7 +2323,7 @@ compile_OSL() {
 _init_osd() {
  _src=$SRC/OpenSubdiv-$OSD_VERSION
  _git=true
-  _inst=$INST/osd-$OSD_VERSION_SHORT
+  _inst=$INST/osd-$OSD_VERSION
  _inst_shortcut=$INST/osd
 }

@@ -2594,7 +2537,7 @@ compile_BLOSC() {
 _init_openvdb() {
  _src=$SRC/openvdb-$OPENVDB_VERSION
  _git=false
-  _inst=$INST/openvdb-$OPENVDB_VERSION_SHORT
+  _inst=$INST/openvdb-$OPENVDB_VERSION
  _inst_shortcut=$INST/openvdb
 }

@@ -2712,7 +2655,7 @@ compile_OPENVDB() {
 _init_alembic() {
  _src=$SRC/alembic-$ALEMBIC_VERSION
  _git=false
-  _inst=$INST/alembic-$ALEMBIC_VERSION_SHORT
+  _inst=$INST/alembic-$ALEMBIC_VERSION
  _inst_shortcut=$INST/alembic
 }

@@ -2817,7 +2760,7 @@ compile_ALEMBIC() {
 _init_usd() {
  _src=$SRC/USD-$USD_VERSION
  _git=false
-  _inst=$INST/usd-$USD_VERSION_SHORT
+  _inst=$INST/usd-$USD_VERSION
  _inst_shortcut=$INST/usd
 }

@@ -2916,7 +2859,7 @@ compile_USD() {
 _init_opencollada() {
  _src=$SRC/OpenCOLLADA-$OPENCOLLADA_VERSION
  _git=true
-  _inst=$INST/opencollada-$OPENCOLLADA_VERSION_SHORT
+  _inst=$INST/opencollada-$OPENCOLLADA_VERSION
  _inst_shortcut=$INST/opencollada
 }

@@ -3022,7 +2965,7 @@ compile_OpenCOLLADA() {
 _init_embree() {
  _src=$SRC/embree-$EMBREE_VERSION
  _git=true
-  _inst=$INST/embree-$EMBREE_VERSION_SHORT
+  _inst=$INST/embree-$EMBREE_VERSION
  _inst_shortcut=$INST/embree
 }

@@ -3132,83 +3075,10 @@ compile_Embree() {
 # ----------------------------------------------------------------------------
 # Build OpenImageDenoise

-_init_ispc() {
-  _src=$SRC/ispc-v$ISPC_VERSION
-  _inst=$INST/ispc-v$ISPC_VERSION
-  _inst_shortcut=$INST/ispc
-}
-
-_update_deps_ispc() {
-  OIDN_FORCE_REBUILD=true
-  if [ "$_is_building" = true ]; then
-    OIDN_FORCE_BUILD=true
-  fi
-}
-
-clean_ispc() {
-  _init_ispc
-  if [ -d $_inst ]; then
-    _update_deps_ispc
-  fi
-  _clean
-}
-
-install_ISPC() {
-  # To be changed each time we make edits that would modify the compiled results!
-  ispc_magic=0
-  _init_ispc
-
-  # Clean install if needed!
-  magic_compile_check ispc-$ISPC_VERSION $ispc_magic
-  if [ $? -eq 1 ]; then
-    clean_ispc
-  fi
-
-  if [ ! -d $_inst ]; then
-    INFO "Installing Implicit SPMD Program Compiler v$ISPC_VERSION"
-    _is_building=true
-
-    # Rebuild dependencies as well!
-    _update_deps_ispc
-
-    prepare_opt
-
-    if [ ! -d $_src ]; then
-      mkdir -p $SRC
-      download ISPC_BINARY[@] "$_src.tar.gz"
-      INFO "Unpacking ISPC-v$ISPC_VERSION"
-      tar -C $SRC --transform "s,(.*/?)ispc-v$ISPC_VERSION-linux[^/]*(.*),\1ispc-v$ISPC_VERSION\2,x" \
-          -xf $_src.tar.gz
-    fi
-
-    mkdir -p $_inst
-    cp -r $_src/bin $_inst/bin
-
-    if [ -d $_inst ]; then
-      _create_inst_shortcut
-    else
-      ERROR "ISPC-v$ISPC_VERSION failed to install, exiting"
-      exit 1
-    fi
-
-    magic_compile_set ispc-$ISPC_VERSION $ispc_magic
-
-    cd $CWD
-    INFO "Done compiling ISPC-v$ISPC_VERSION!"
-    _is_building=false
-  else
-    INFO "Own ISPC-v$ISPC_VERSION is up to date, nothing to do!"
-  fi
-
-  _ispc_path_bin=$_inst/bin
-  run_ldconfig "ispc"
-}
-
-
 _init_oidn() {
  _src=$SRC/oidn-$OIDN_VERSION
  _git=true
-  _inst=$INST/oidn-$OIDN_VERSION_SHORT
+  _inst=$INST/oidn-$OIDN_VERSION
  _inst_shortcut=$INST/oidn
 }

@@ -3230,9 +3100,6 @@ compile_OIDN() {
    return
  fi

-  # Latest OIDN requires ISPC compiler tool...
-  install_ISPC
-
  # To be changed each time we make edits that would modify the compiled results!
  oidn_magic=9
  _init_oidn
@@ -3285,7 +3152,6 @@ compile_OIDN() {
    cmake_d="$cmake_d -D WITH_EXAMPLE=OFF"
    cmake_d="$cmake_d -D WITH_TEST=OFF"
    cmake_d="$cmake_d -D OIDN_STATIC_LIB=ON"
-    cmake_d="$cmake_d -D ISPC_DIR_HINT=$_ispc_path_bin"

    if [ -d $INST/tbb ]; then
      make_d="$make_d TBB_ROOT=$INST/tbb"
@@ -3321,7 +3187,7 @@ compile_OIDN() {

 _init_ffmpeg() {
  _src=$SRC/ffmpeg-$FFMPEG_VERSION
-  _inst=$INST/ffmpeg-$FFMPEG_VERSION_SHORT
+  _inst=$INST/ffmpeg-$FFMPEG_VERSION
  _inst_shortcut=$INST/ffmpeg
 }

@@ -3450,7 +3316,7 @@ compile_FFmpeg() {
 _init_xr_openxr_sdk() {
  _src=$SRC/XR-OpenXR-SDK-$XR_OPENXR_VERSION
  _git=true
-  _inst=$INST/xr-openxr-sdk-$XR_OPENXR_VERSION_SHORT
+  _inst=$INST/xr-openxr-sdk-$XR_OPENXR_VERSION
  _inst_shortcut=$INST/xr-openxr-sdk
 }

@@ -3654,12 +3520,11 @@ install_DEB() {
  THEORA_DEV="libtheora-dev"

  _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
-             git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
+             git libfreetype6-dev libx11-dev flex bison libxxf86vm-dev \
             libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
             libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
             libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
-             libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
-             libgmp-dev"
+             libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev"
             # libglewmx-dev  (broken in deb testing currently...)

  VORBIS_USE=true
@@ -3689,18 +3554,13 @@ install_DEB() {

  PRINT ""
  CLANG_FORMAT="clang-format"
-  check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION
+  check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
  if [ $? -eq 0 ]; then
    _packages="$_packages $CLANG_FORMAT"
  else
-    check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
-    if [ $? -eq 0 ]; then
-      _packages="$_packages $CLANG_FORMAT"
-    else
-      PRINT ""
-      WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
-      PRINT ""
-    fi
+    PRINT ""
+    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
+    PRINT ""
  fi

  if [ "$WITH_JACK" = true ]; then
@@ -3815,7 +3675,7 @@ install_DEB() {
    INFO "Forced Python/NumPy building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_DEB python3-dev $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
+    check_package_version_ge_DEB python3-dev $PYTHON_VERSION_MIN
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_DEB python3-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -3857,7 +3717,7 @@ install_DEB() {
    INFO "Forced Boost building, as requested..."
    compile_Boost
  else
-    check_package_version_ge_lt_DEB libboost-dev $BOOST_VERSION_MIN $BOOST_VERSION_MAX
+    check_package_version_ge_DEB libboost-dev $BOOST_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_DEB libboost-dev

@@ -3878,7 +3738,7 @@ install_DEB() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_DEB libtbb-dev $TBB_VERSION_MIN $TBB_VERSION_MAX
+    check_package_version_ge_DEB libtbb-dev $TBB_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_DEB libtbb-dev
      clean_TBB
@@ -3895,13 +3755,14 @@ install_DEB() {
    INFO "Forced OpenColorIO building, as requested..."
    compile_OCIO
  else
-    check_package_version_ge_lt_DEB libopencolorio-dev $OCIO_VERSION_MIN $OCIO_VERSION_MAX
-    if [ $? -eq 0 ]; then
-      install_packages_DEB libopencolorio-dev
-      clean_OCIO
-    else
+    # XXX Always force build of own OCIO, until linux distro guys update their package to default libyaml-cpp ver (0.5)!
+    #check_package_version_ge_DEB libopencolorio-dev $OCIO_VERSION_MIN
+    #if [ $? -eq 0 ]; then
+      #install_packages_DEB libopencolorio-dev
+      #clean_OCIO
+    #else
      compile_OCIO
-    fi
+    #fi
  fi


@@ -3912,7 +3773,7 @@ install_DEB() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_DEB libopenexr-dev $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
+    check_package_version_ge_DEB libopenexr-dev $OPENEXR_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_DEB libopenexr-dev
      OPENEXR_VERSION=`get_package_version_DEB libopenexr-dev`
@@ -3931,13 +3792,14 @@ install_DEB() {
    INFO "Forced OpenImageIO building, as requested..."
    compile_OIIO
  else
-    check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MAX
-    if [ $? -eq 0 -a "$_with_built_openexr" = false ]; then
-      install_packages_DEB libopenimageio-dev
-      clean_OIIO
-    else
+    # XXX Debian Testing / Ubuntu 16.04 pulls in WAY too many deps (gtk2/opencv ?!) incl. OCIO build against libyaml-cpp0.3 so build for now...
+    #check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MAX
+    #if [ $? -eq 0 -a "$_with_built_openexr" = false ]; then
+    #  install_packages_DEB libopenimageio-dev
+    #  clean_OIIO
+    #else
      compile_OIIO
-    fi
+    #fi
  fi


@@ -3951,12 +3813,11 @@ install_DEB() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_version_ge_lt_DEB llvm-dev $LLVM_VERSION_MIN $LLVM_VERSION_MAX
+    check_package_DEB clang-$LLVM_VERSION_MIN
    if [ $? -eq 0 ]; then
-      install_packages_DEB llvm-dev clang
+      install_packages_DEB llvm-$LLVM_VERSION_MIN-dev clang-$LLVM_VERSION_MIN
      have_llvm=true
-      LLVM_VERSION=`get_package_version_DEB llvm-dev`
-      LLVM_VERSION_FOUND=$LLVM_VERSION
+      LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
      clean_LLVM
    else
      _do_compile_llvm=true
@@ -3982,13 +3843,8 @@ install_DEB() {
    INFO "Forced OpenShadingLanguage building, as requested..."
    _do_compile_osl=true
  else
-    check_package_version_ge_lt_DEB  libopenshadinglanguage-dev $OSL_VERSION_MIN $OSL_VERSION_MAX
-    if [ $? -eq 0 ]; then
-      install_packages_DEB libopenshadinglanguage-dev
-      clean_OSL
-    else
-      _do_compile_osl=true
-    fi
+    # No package currently!
+    _do_compile_osl=true
  fi

  if [ "$_do_compile_osl" = true ]; then
@@ -4020,7 +3876,7 @@ install_DEB() {
    INFO "Forced OpenVDB building, as requested..."
    compile_OPENVDB
  else
-    check_package_version_ge_lt_DEB libopenvdb-dev $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MAX
+    check_package_version_ge_DEB libopenvdb-dev $OPENVDB_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_DEB libopenvdb-dev libblosc-dev
      clean_OPENVDB
@@ -4081,14 +3937,8 @@ install_DEB() {
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
-      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_DEB libembree-dev $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
-      #~ if [ $? -eq 0 ]; then
-        #~ install_packages_DEB libembree-dev
-        #~ clean_Embree
-      #~ else
-        _do_compile_embree=true
-      #~ fi
+      # No package currently!
+      _do_compile_embree=true
    fi

    if [ "$_do_compile_embree" = true ]; then
@@ -4124,7 +3974,7 @@ install_DEB() {
    # XXX Debian Testing / Ubuntu 16.04 finally includes FFmpeg, so check as usual
    check_package_DEB ffmpeg
    if [ $? -eq 0 ]; then
-      check_package_version_ge_lt_DEB ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
+      check_package_version_ge_DEB ffmpeg $FFMPEG_VERSION_MIN
      if [ $? -eq 0 ]; then
        install_packages_DEB libavdevice-dev
        clean_FFmpeg
@@ -4320,12 +4170,12 @@ install_RPM() {
  OGG_DEV="libogg-devel"
  THEORA_DEV="libtheora-devel"

-  _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
+  _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison \
             libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
             libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
             wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
             glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
-             libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel gmp-devel"
+             libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel"

  OPENJPEG_USE=true
  VORBIS_USE=true
@@ -4448,7 +4298,7 @@ install_RPM() {
    INFO "Forced Python/NumPy building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_RPM python3-devel $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
+    check_package_version_ge_RPM python3-devel $PYTHON_VERSION_MIN
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_RPM python3-devel` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -4458,7 +4308,7 @@ install_RPM() {
      if [ "$NUMPY_SKIP" = true ]; then
        WARNING "Skipping NumPy installation, as requested..."
      else
-        check_package_version_ge_lt_RPM python3-numpy $NUMPY_VERSION_MIN $NUMPY_VERSION_MAX
+        check_package_version_ge_RPM python3-numpy $NUMPY_VERSION_MIN
        if [ $? -eq 0 ]; then
          install_packages_RPM python3-numpy
        else
@@ -4491,7 +4341,7 @@ install_RPM() {
    INFO "Forced Boost building, as requested..."
    _do_compile_boost=true
  else
-    check_package_version_ge_lt_RPM boost-devel $BOOST_VERSION_MIN $BOOST_VERSION_MAX
+    check_package_version_ge_RPM boost-devel $BOOST_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_RPM boost-devel
      clean_Boost
@@ -4518,7 +4368,7 @@ install_RPM() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_RPM tbb-devel $TBB_VERSION_MIN $TBB_VERSION_MAX
+    check_package_version_ge_RPM tbb-devel $TBB_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_RPM tbb-devel
      clean_TBB
@@ -4536,7 +4386,7 @@ install_RPM() {
    compile_OCIO
  else
    if [ "$RPM" = "SUSE" ]; then
-      check_package_version_ge_lt_RPM OpenColorIO-devel $OCIO_VERSION_MIN $OCIO_VERSION_MAX
+      check_package_version_ge_RPM OpenColorIO-devel $OCIO_VERSION_MIN
      if [ $? -eq 0 ]; then
        install_packages_RPM OpenColorIO-devel
        clean_OCIO
@@ -4556,7 +4406,7 @@ install_RPM() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_RPM openexr-devel $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
+    check_package_version_ge_RPM openexr-devel $OPENEXR_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_RPM openexr-devel
      OPENEXR_VERSION=`get_package_version_RPM openexr-devel`
@@ -4574,6 +4424,7 @@ install_RPM() {
    INFO "Forced OpenImageIO building, as requested..."
    compile_OIIO
  else
+    # XXX RPM distros pulls in too much and depends on old libs, so better to build for now...
    #check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX
    #if [ $? -eq 0 -a $_with_built_openexr == false ]; then
    #  install_packages_RPM OpenImageIO-devel
@@ -4599,11 +4450,10 @@ install_RPM() {
    else
      CLANG_DEV="clang-devel"
    fi
-    check_package_version_ge_lt_RPM llvm-devel $LLVM_VERSION_MIN $LLVM_VERSION_MAX
+    check_package_version_match_RPM $CLANG_DEV $LLVM_VERSION
    if [ $? -eq 0 ]; then
      install_packages_RPM llvm-devel $CLANG_DEV
      have_llvm=true
-      LLVM_VERSION=`get_package_version_RPM llvm-devel`
      LLVM_VERSION_FOUND=$LLVM_VERSION
      clean_LLVM
    else
@@ -4630,18 +4480,8 @@ install_RPM() {
    INFO "Forced OpenShadingLanguage building, as requested..."
    _do_compile_osl=true
  else
-    if [ "$RPM" = "SUSE" ]; then
-      OSL_DEV="OpenShadingLanguage-devel"
-    else
-      OSL_DEV="openshadinglanguage-devel"
-    fi
-    check_package_version_ge_lt_RPM $OSL_DEV $OSL_VERSION_MIN $OSL_VERSION_MAX
-    if [ $? -eq 0 ]; then
-      install_packages_RPM $OSL_DEV
-      clean_OSL
-    else
-      _do_compile_osl=true
-    fi
+    # No package currently!
+    _do_compile_osl=true
  fi

  if [ "$_do_compile_osl" = true ]; then
@@ -4729,14 +4569,8 @@ install_RPM() {
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
-      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_RPM embree-devel $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
-      #~ if [ $? -eq 0 ]; then
-        #~ install_packages_RPM embree-devel
-        #~ clean_Embree
-      #~ else
-        _do_compile_embree=true
-      #~ fi
+      # No package...
+      _do_compile_embree=true
    fi

    if [ "$_do_compile_embree" = true ]; then
@@ -4769,7 +4603,7 @@ install_RPM() {
    INFO "Forced FFMpeg building, as requested..."
    compile_FFmpeg
  else
-    check_package_version_ge_lt_RPM ffmpeg-devel $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
+    check_package_version_ge_RPM ffmpeg-devel $FFMPEG_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_RPM ffmpeg ffmpeg-devel
      clean_FFmpeg
@@ -4898,10 +4732,10 @@ install_ARCH() {
    BASE_DEVEL=`pacman -Sgq base-devel | sed -e 's/^gcc$/gcc-multilib/g' | paste -s -d' '`
  fi

-  _packages="$BASE_DEVEL git cmake fontconfig \
+  _packages="$BASE_DEVEL git cmake \
             libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
             $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl2 fftw \
-             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp"
+             libxml2 yaml-cpp tinyxml python-requests jemalloc"

  OPENJPEG_USE=true
  VORBIS_USE=true
@@ -4989,7 +4823,7 @@ install_ARCH() {
    INFO "Forced Python/NumPy building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_ARCH python $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
+    check_package_version_ge_ARCH python $PYTHON_VERSION_MIN
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_ARCH python` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -4999,7 +4833,7 @@ install_ARCH() {
      if [ "$NUMPY_SKIP" = true ]; then
        WARNING "Skipping NumPy installation, as requested..."
      else
-        check_package_version_ge_ARCH python-numpy $NUMPY_VERSION_MIN $NUMPY_VERSION_MAX
+        check_package_version_ge_ARCH python-numpy $NUMPY_VERSION_MIN
        if [ $? -eq 0 ]; then
          install_packages_ARCH python-numpy
        else
@@ -5031,7 +4865,7 @@ install_ARCH() {
    INFO "Forced Boost building, as requested..."
    compile_Boost
  else
-    check_package_version_ge_lt_ARCH boost $BOOST_VERSION_MIN $BOOST_VERSION_MAX
+    check_package_version_ge_ARCH boost $BOOST_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH boost
      clean_Boost
@@ -5048,7 +4882,7 @@ install_ARCH() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_ARCH intel-tbb $TBB_VERSION_MIN $TBB_VERSION_MAX
+    check_package_version_ge_ARCH intel-tbb $TBB_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH intel-tbb
      clean_TBB
@@ -5065,7 +4899,7 @@ install_ARCH() {
    INFO "Forced OpenColorIO building, as requested..."
    compile_OCIO
  else
-    check_package_version_ge_lt_ARCH opencolorio $OCIO_VERSION_MIN $OCIO_VERSION_MAX
+    check_package_version_ge_ARCH opencolorio $OCIO_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH opencolorio
      clean_OCIO
@@ -5082,7 +4916,7 @@ install_ARCH() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_ARCH openexr $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
+    check_package_version_ge_ARCH openexr $OPENEXR_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH openexr
      OPENEXR_VERSION=`get_package_version_ARCH openexr`
@@ -5121,7 +4955,7 @@ install_ARCH() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_version_ge_lt_ARCH llvm $LLVM_VERSION_MIN $LLVM_VERSION_MAX
+    check_package_version_match_ARCH llvm $LLVM_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH llvm clang
      have_llvm=true
@@ -5152,13 +4986,14 @@ install_ARCH() {
    INFO "Forced OpenShadingLanguage building, as requested..."
    _do_compile_osl=true
  else
-    check_package_version_ge_lt_ARCH openshadinglanguage $OSL_VERSION_MIN $OSL_VERSION_MAX
-    if [ $? -eq 0 ]; then
-      install_packages_ARCH openshadinglanguage
-      clean_OSL
-    else
+    # XXX Compile for now due to requirement of LLVM 3.4 ...
+    #check_package_version_ge_ARCH openshadinglanguage $OSL_VERSION_MIN
+    #if [ $? -eq 0 ]; then
+    #  install_packages_ARCH openshadinglanguage
+    #  clean_OSL
+    #else
      _do_compile_osl=true
-    fi
+    #fi
  fi

  if [ "$_do_compile_osl" = true ]; then
@@ -5178,7 +5013,7 @@ install_ARCH() {
    INFO "Forced OpenSubdiv building, as requested..."
    compile_OSD
  else
-    check_package_version_ge_lt_ARCH opensubdiv $OSD_VERSION_MIN $OSD_VERSION_MAX
+    check_package_version_ge_ARCH opensubdiv $OSD_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH opensubdiv
      clean_OSD
@@ -5195,7 +5030,7 @@ install_ARCH() {
    INFO "Forced OpenVDB building, as requested..."
    compile_OPENVDB
  else
-    check_package_version_ge_lt_ARCH openvdb $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MAX
+    check_package_version_ge_ARCH openvdb $OPENVDB_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH openvdb
      clean_OPENVDB
@@ -5260,14 +5095,13 @@ install_ARCH() {
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
-      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_ARCH embree $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
-      #~ if [ $? -eq 0 ]; then
-        #~ install_packages_ARCH embree
-        #~ clean_Embree
-      #~ else
+      check_package_ARCH embree
+      if [ $? -eq 0 ]; then
+        install_packages_ARCH embree
+        clean_Embree
+      else
        _do_compile_embree=true
-      #~ fi
+      fi
    fi

    if [ "$_do_compile_embree" = true ]; then
@@ -5300,7 +5134,7 @@ install_ARCH() {
    INFO "Forced FFMpeg building, as requested..."
    compile_FFmpeg
  else
-    check_package_version_ge_lt_ARCH ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
+    check_package_version_ge_ARCH ffmpeg $FFMPEG_VERSION_MIN
    if [ $? -eq 0 ]; then
      install_packages_ARCH ffmpeg
      clean_FFmpeg
@@ -5577,8 +5411,7 @@ print_info() {

  _buildargs="-U *SNDFILE* -U PYTHON* -U *BOOST* -U *Boost* -U *TBB*"
  _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
-  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB*  -U *BLOSC* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC* -U *USD*"
-  _buildargs="$_buildargs -U *EMBREE* -U *OPENIMAGEDENOISE* -U *OPENXR*"
+  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC* -U *USD*"

  _1="-D WITH_CODEC_SNDFILE=ON"
  PRINT "  $_1"
--- 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/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/config_gmpxx.h
+++ b/build_files/build_environment/patches/config_gmpxx.h
@@ -1,668 +0,0 @@
-/* config.h.  Generated from config.in by configure.  */
-/* config.in.  Generated from configure.ac by autoheader.  */
-
-/*
-
-Copyright 1996-2020 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of either:
-
-  * the GNU Lesser General Public License as published by the Free
-    Software Foundation; either version 3 of the License, or (at your
-    option) any later version.
-
-or
-
-  * 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.
-
-or both in parallel, as here.
-
-The GNU MP Library 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 copies of the GNU General Public License and the
-GNU Lesser General Public License along with the GNU MP Library.  If not,
-see https://www.gnu.org/licenses/.
-*/
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* The gmp-mparam.h file (a string) the tune program should suggest updating.
-   */
-#define GMP_MPARAM_H_SUGGEST "./mpn/x86_64/coreisbr/gmp-mparam.h"
-
-/* Define to 1 if you have the `alarm' function. */
-#define HAVE_ALARM 1
-
-/* Define to 1 if alloca() works (via gmp-impl.h). */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if the compiler accepts gcc style __attribute__ ((const)) */
-//#define HAVE_ATTRIBUTE_CONST 1
-
-/* Define to 1 if the compiler accepts gcc style __attribute__ ((malloc)) */
-//#define HAVE_ATTRIBUTE_MALLOC 1
-
-/* Define to 1 if the compiler accepts gcc style __attribute__ ((mode (XX)))
-   */
-//#define HAVE_ATTRIBUTE_MODE 1
-
-/* Define to 1 if the compiler accepts gcc style __attribute__ ((noreturn)) */
-//#define HAVE_ATTRIBUTE_NORETURN 1
-
-/* Define to 1 if you have the `attr_get' function. */
-/* #undef HAVE_ATTR_GET */
-
-/* Define to 1 if tests/libtests has calling conventions checking for the CPU
-   */
-/* #undef HAVE_CALLING_CONVENTIONS */
-
-/* Define to 1 if you have the `clock' function. */
-#define HAVE_CLOCK 1
-
-/* Define to 1 if you have the `clock_gettime' function */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* Define to 1 if you have the `cputime' function. */
-/* #undef HAVE_CPUTIME */
-
-/* Define to 1 if you have the declaration of `fgetc', and to 0 if you don't.
-   */
-#define HAVE_DECL_FGETC 1
-
-/* Define to 1 if you have the declaration of `fscanf', and to 0 if you don't.
-   */
-#define HAVE_DECL_FSCANF 1
-
-/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't.
-   */
-#define HAVE_DECL_OPTARG 1
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_ERRLIST 0
-
-/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_NERR 0
-
-/* Define to 1 if you have the declaration of `ungetc', and to 0 if you don't.
-   */
-#define HAVE_DECL_UNGETC 1
-
-/* Define to 1 if you have the declaration of `vfprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL_VFPRINTF 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define one of the following to 1 for the format of a `double'.
-   If your format is not among these choices, or you don't know what it is,
-   then leave all undefined.
-   IEEE_LITTLE_SWAPPED means little endian, but with the two 4-byte halves
-   swapped, as used by ARM CPUs in little endian mode.  */
-/* #undef HAVE_DOUBLE_IEEE_BIG_ENDIAN */
-#define HAVE_DOUBLE_IEEE_LITTLE_ENDIAN 1
-/* #undef HAVE_DOUBLE_IEEE_LITTLE_SWAPPED */
-/* #undef HAVE_DOUBLE_VAX_D */
-/* #undef HAVE_DOUBLE_VAX_G */
-/* #undef HAVE_DOUBLE_CRAY_CFP */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <float.h> header file. */
-#define HAVE_FLOAT_H 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getrusage' function. */
-/* #undef HAVE_GETRUSAGE */
-
-/* Define to 1 if you have the `getsysinfo' function. */
-/* #undef HAVE_GETSYSINFO */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if the compiler accepts gcc style __attribute__ ((visibility))
-   and __attribute__ ((alias)) */
-#define HAVE_HIDDEN_ALIAS 1
-
-/* Define one of these to 1 for the host CPU family.
-   If your CPU is not in any of these families, leave all undefined.
-   For an AMD64 chip, define "x86" in ABI=32, but not in ABI=64. */
-/* #undef HAVE_HOST_CPU_FAMILY_alpha */
-/* #undef HAVE_HOST_CPU_FAMILY_m68k */
-/* #undef HAVE_HOST_CPU_FAMILY_power */
-/* #undef HAVE_HOST_CPU_FAMILY_powerpc */
-/* #undef HAVE_HOST_CPU_FAMILY_x86 */
-#define HAVE_HOST_CPU_FAMILY_x86_64 1
-
-/* Define one of the following to 1 for the host CPU, as per the output of
-   ./config.guess.  If your CPU is not listed here, leave all undefined.  */
-/* #undef HAVE_HOST_CPU_alphaev67 */
-/* #undef HAVE_HOST_CPU_alphaev68 */
-/* #undef HAVE_HOST_CPU_alphaev7 */
-/* #undef HAVE_HOST_CPU_m68020 */
-/* #undef HAVE_HOST_CPU_m68030 */
-/* #undef HAVE_HOST_CPU_m68040 */
-/* #undef HAVE_HOST_CPU_m68060 */
-/* #undef HAVE_HOST_CPU_m68360 */
-/* #undef HAVE_HOST_CPU_powerpc604 */
-/* #undef HAVE_HOST_CPU_powerpc604e */
-/* #undef HAVE_HOST_CPU_powerpc750 */
-/* #undef HAVE_HOST_CPU_powerpc7400 */
-/* #undef HAVE_HOST_CPU_supersparc */
-/* #undef HAVE_HOST_CPU_i386 */
-/* #undef HAVE_HOST_CPU_i586 */
-/* #undef HAVE_HOST_CPU_i686 */
-/* #undef HAVE_HOST_CPU_pentium */
-/* #undef HAVE_HOST_CPU_pentiummmx */
-/* #undef HAVE_HOST_CPU_pentiumpro */
-/* #undef HAVE_HOST_CPU_pentium2 */
-/* #undef HAVE_HOST_CPU_pentium3 */
-/* #undef HAVE_HOST_CPU_pentium4 */
-/* #undef HAVE_HOST_CPU_core2 */
-/* #undef HAVE_HOST_CPU_nehalem */
-/* #undef HAVE_HOST_CPU_westmere */
-/* #undef HAVE_HOST_CPU_sandybridge */
-#define HAVE_HOST_CPU_ivybridge 1
-/* #undef HAVE_HOST_CPU_haswell */
-/* #undef HAVE_HOST_CPU_broadwell */
-/* #undef HAVE_HOST_CPU_skylake */
-/* #undef HAVE_HOST_CPU_silvermont */
-/* #undef HAVE_HOST_CPU_goldmont */
-/* #undef HAVE_HOST_CPU_k8 */
-/* #undef HAVE_HOST_CPU_k10 */
-/* #undef HAVE_HOST_CPU_bulldozer */
-/* #undef HAVE_HOST_CPU_piledriver */
-/* #undef HAVE_HOST_CPU_steamroller */
-/* #undef HAVE_HOST_CPU_excavator */
-/* #undef HAVE_HOST_CPU_zen */
-/* #undef HAVE_HOST_CPU_bobcat */
-/* #undef HAVE_HOST_CPU_jaguar */
-/* #undef HAVE_HOST_CPU_s390_z900 */
-/* #undef HAVE_HOST_CPU_s390_z990 */
-/* #undef HAVE_HOST_CPU_s390_z9 */
-/* #undef HAVE_HOST_CPU_s390_z10 */
-/* #undef HAVE_HOST_CPU_s390_z196 */
-
-/* Define to 1 iff we have a s390 with 64-bit registers.  */
-/* #undef HAVE_HOST_CPU_s390_zarch */
-
-/* Define to 1 if the system has the type `intmax_t'. */
-#define HAVE_INTMAX_T 1
-
-/* Define to 1 if the system has the type `intptr_t'. */
-#define HAVE_INTPTR_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <invent.h> header file. */
-/* #undef HAVE_INVENT_H */
-
-/* Define to 1 if you have the <langinfo.h> header file. */
-/* #undef HAVE_LANGINFO_H */
-
-/* Define one of these to 1 for the endianness of `mp_limb_t'.
-   If the endianness is not a simple big or little, or you don't know what
-   it is, then leave both undefined. */
-/* #undef HAVE_LIMB_BIG_ENDIAN */
-#define HAVE_LIMB_LITTLE_ENDIAN 1
-
-/* Define to 1 if you have the `localeconv' function. */
-#define HAVE_LOCALECONV 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if the system has the type `long double'. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
-/* #undef HAVE_MACHINE_HAL_SYSINFO_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `mprotect' function. */
-#define HAVE_MPROTECT 1
-
-/* Define to 1 each of the following for which a native (ie. CPU specific)
-    implementation of the corresponding routine exists.  */
-#define HAVE_NATIVE_mpn_add_n 1
-/* #undef HAVE_NATIVE_mpn_add_n_sub_n */
-#define HAVE_NATIVE_mpn_add_nc 1
-/* #undef HAVE_NATIVE_mpn_addaddmul_1msb0 */
-#define HAVE_NATIVE_mpn_addlsh1_n 1
-#define HAVE_NATIVE_mpn_addlsh2_n 1
-#define HAVE_NATIVE_mpn_addlsh_n 1
-#define HAVE_NATIVE_mpn_addlsh1_nc 1
-#define HAVE_NATIVE_mpn_addlsh2_nc 1
-#define HAVE_NATIVE_mpn_addlsh_nc 1
-/* #undef HAVE_NATIVE_mpn_addlsh1_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh2_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh1_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh2_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_addlsh1_n_ip2 */
-/* #undef HAVE_NATIVE_mpn_addlsh2_n_ip2 */
-/* #undef HAVE_NATIVE_mpn_addlsh_n_ip2 */
-/* #undef HAVE_NATIVE_mpn_addlsh1_nc_ip2 */
-/* #undef HAVE_NATIVE_mpn_addlsh2_nc_ip2 */
-/* #undef HAVE_NATIVE_mpn_addlsh_nc_ip2 */
-/* #undef HAVE_NATIVE_mpn_addmul_1c */
-#define HAVE_NATIVE_mpn_addmul_2 1
-/* #undef HAVE_NATIVE_mpn_addmul_3 */
-/* #undef HAVE_NATIVE_mpn_addmul_4 */
-/* #undef HAVE_NATIVE_mpn_addmul_5 */
-/* #undef HAVE_NATIVE_mpn_addmul_6 */
-/* #undef HAVE_NATIVE_mpn_addmul_7 */
-/* #undef HAVE_NATIVE_mpn_addmul_8 */
-/* #undef HAVE_NATIVE_mpn_addmul_2s */
-#define HAVE_NATIVE_mpn_and_n 1
-#define HAVE_NATIVE_mpn_andn_n 1
-#define HAVE_NATIVE_mpn_bdiv_dbm1c 1
-#define HAVE_NATIVE_mpn_bdiv_q_1 1
-#define HAVE_NATIVE_mpn_pi1_bdiv_q_1 1
-#define HAVE_NATIVE_mpn_cnd_add_n 1
-#define HAVE_NATIVE_mpn_cnd_sub_n 1
-#define HAVE_NATIVE_mpn_com 1
-#define HAVE_NATIVE_mpn_copyd 1
-#define HAVE_NATIVE_mpn_copyi 1
-/* #undef HAVE_NATIVE_mpn_div_qr_1n_pi1 */
-/* #undef HAVE_NATIVE_mpn_div_qr_2 */
-#define HAVE_NATIVE_mpn_divexact_1 1
-/* #undef HAVE_NATIVE_mpn_divexact_by3c */
-#define HAVE_NATIVE_mpn_divrem_1 1
-/* #undef HAVE_NATIVE_mpn_divrem_1c */
-#define HAVE_NATIVE_mpn_divrem_2 1
-/* #undef HAVE_NATIVE_mpn_gcd_1 */
-#define HAVE_NATIVE_mpn_gcd_11 1
-/* #undef HAVE_NATIVE_mpn_gcd_22 */
-#define HAVE_NATIVE_mpn_hamdist 1
-#define HAVE_NATIVE_mpn_invert_limb 1
-#define HAVE_NATIVE_mpn_ior_n 1
-#define HAVE_NATIVE_mpn_iorn_n 1
-#define HAVE_NATIVE_mpn_lshift 1
-#define HAVE_NATIVE_mpn_lshiftc 1
-/* #undef HAVE_NATIVE_mpn_lshsub_n */
-/* #undef HAVE_NATIVE_mpn_mod_1 */
-#define HAVE_NATIVE_mpn_mod_1_1p 1
-/* #undef HAVE_NATIVE_mpn_mod_1c */
-#define HAVE_NATIVE_mpn_mod_1s_2p 1
-#define HAVE_NATIVE_mpn_mod_1s_4p 1
-#define HAVE_NATIVE_mpn_mod_34lsub1 1
-#define HAVE_NATIVE_mpn_modexact_1_odd 1
-#define HAVE_NATIVE_mpn_modexact_1c_odd 1
-#define HAVE_NATIVE_mpn_mul_1 1
-#define HAVE_NATIVE_mpn_mul_1c 1
-#define HAVE_NATIVE_mpn_mul_2 1
-/* #undef HAVE_NATIVE_mpn_mul_3 */
-/* #undef HAVE_NATIVE_mpn_mul_4 */
-/* #undef HAVE_NATIVE_mpn_mul_5 */
-/* #undef HAVE_NATIVE_mpn_mul_6 */
-#define HAVE_NATIVE_mpn_mul_basecase 1
-#define HAVE_NATIVE_mpn_mullo_basecase 1
-#define HAVE_NATIVE_mpn_nand_n 1
-#define HAVE_NATIVE_mpn_nior_n 1
-#define HAVE_NATIVE_mpn_popcount 1
-#define HAVE_NATIVE_mpn_preinv_divrem_1 1
-/* #undef HAVE_NATIVE_mpn_preinv_mod_1 */
-#define HAVE_NATIVE_mpn_redc_1 1
-/* #undef HAVE_NATIVE_mpn_redc_2 */
-#define HAVE_NATIVE_mpn_rsblsh1_n 1
-#define HAVE_NATIVE_mpn_rsblsh2_n 1
-#define HAVE_NATIVE_mpn_rsblsh_n 1
-#define HAVE_NATIVE_mpn_rsblsh1_nc 1
-/* #undef HAVE_NATIVE_mpn_rsblsh2_nc */
-/* #undef HAVE_NATIVE_mpn_rsblsh_nc */
-#define HAVE_NATIVE_mpn_rsh1add_n 1
-#define HAVE_NATIVE_mpn_rsh1add_nc 1
-#define HAVE_NATIVE_mpn_rsh1sub_n 1
-#define HAVE_NATIVE_mpn_rsh1sub_nc 1
-#define HAVE_NATIVE_mpn_rshift 1
-/* #undef HAVE_NATIVE_mpn_sbpi1_bdiv_r */
-#define HAVE_NATIVE_mpn_sqr_basecase 1
-/* #undef HAVE_NATIVE_mpn_sqr_diagonal */
-#define HAVE_NATIVE_mpn_sqr_diag_addlsh1 1
-#define HAVE_NATIVE_mpn_sub_n 1
-#define HAVE_NATIVE_mpn_sub_nc 1
-#define HAVE_NATIVE_mpn_sublsh1_n 1
-#define HAVE_NATIVE_mpn_sublsh2_n 1
-/* #undef HAVE_NATIVE_mpn_sublsh_n */
-/* #undef HAVE_NATIVE_mpn_sublsh1_nc */
-/* #undef HAVE_NATIVE_mpn_sublsh2_nc */
-/* #undef HAVE_NATIVE_mpn_sublsh_nc */
-/* #undef HAVE_NATIVE_mpn_sublsh1_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_sublsh2_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_sublsh_n_ip1 */
-/* #undef HAVE_NATIVE_mpn_sublsh1_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_sublsh2_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_sublsh_nc_ip1 */
-/* #undef HAVE_NATIVE_mpn_submul_1c */
-/* #undef HAVE_NATIVE_mpn_tabselect */
-/* #undef HAVE_NATIVE_mpn_udiv_qrnnd */
-/* #undef HAVE_NATIVE_mpn_udiv_qrnnd_r */
-/* #undef HAVE_NATIVE_mpn_umul_ppmm */
-/* #undef HAVE_NATIVE_mpn_umul_ppmm_r */
-#define HAVE_NATIVE_mpn_xor_n 1
-#define HAVE_NATIVE_mpn_xnor_n 1
-
-/* Define to 1 if you have the `nl_langinfo' function. */
-/* #undef HAVE_NL_LANGINFO */
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-/* #undef HAVE_NL_TYPES_H */
-
-/* Define to 1 if you have the `obstack_vprintf' function. */
-/* #undef HAVE_OBSTACK_VPRINTF */
-
-/* Define to 1 if you have the `popen' function. */
-#define HAVE_POPEN 1
-
-/* Define to 1 if you have the `processor_info' function. */
-/* #undef HAVE_PROCESSOR_INFO */
-
-/* Define to 1 if <sys/pstat.h> `struct pst_processor' exists and contains
-   `psp_iticksperclktick'. */
-/* #undef HAVE_PSP_ITICKSPERCLKTICK */
-
-/* Define to 1 if you have the `pstat_getprocessor' function. */
-/* #undef HAVE_PSTAT_GETPROCESSOR */
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#define HAVE_PTRDIFF_T 1
-
-/* Define to 1 if the system has the type `quad_t'. */
-/* #undef HAVE_QUAD_T */
-
-/* Define to 1 if you have the `raise' function. */
-#define HAVE_RAISE 1
-
-/* Define to 1 if you have the `read_real_time' function. */
-/* #undef HAVE_READ_REAL_TIME */
-
-/* Define to 1 if you have the `sigaction' function. */
-/* #undef HAVE_SIGACTION */
-
-/* Define to 1 if you have the `sigaltstack' function. */
-/* #undef HAVE_SIGALTSTACK */
-
-/* Define to 1 if you have the `sigstack' function. */
-/* #undef HAVE_SIGSTACK */
-
-/* Tune directory speed_cyclecounter, undef=none, 1=32bits, 2=64bits) */
-#define HAVE_SPEED_CYCLECOUNTER 2
-
-/* Define to 1 if you have the <sstream> header file. */
-#define HAVE_SSTREAM 1
-
-/* Define to 1 if the system has the type `stack_t'. */
-/* #undef HAVE_STACK_T */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if the system has the type `std::locale'. */
-#define HAVE_STD__LOCALE 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if you have the `sysconf' function. */
-/* #undef HAVE_SYSCONF */
-
-/* Define to 1 if you have the `sysctl' function. */
-/* #undef HAVE_SYSCTL */
-
-/* Define to 1 if you have the `sysctlbyname' function. */
-/* #undef HAVE_SYSCTLBYNAME */
-
-/* Define to 1 if you have the `syssgi' function. */
-/* #undef HAVE_SYSSGI */
-
-/* Define to 1 if you have the <sys/attributes.h> header file. */
-/* #undef HAVE_SYS_ATTRIBUTES_H */
-
-/* Define to 1 if you have the <sys/iograph.h> header file. */
-/* #undef HAVE_SYS_IOGRAPH_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/processor.h> header file. */
-/* #undef HAVE_SYS_PROCESSOR_H */
-
-/* Define to 1 if you have the <sys/pstat.h> header file. */
-/* #undef HAVE_SYS_PSTAT_H */
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-/* #undef HAVE_SYS_RESOURCE_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-/* #undef HAVE_SYS_SYSCTL_H */
-
-/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-/* #undef HAVE_SYS_SYSINFO_H */
-
-/* Define to 1 if you have the <sys/syssgi.h> header file. */
-/* #undef HAVE_SYS_SYSSGI_H */
-
-/* Define to 1 if you have the <sys/systemcfg.h> header file. */
-/* #undef HAVE_SYS_SYSTEMCFG_H */
-
-/* Define to 1 if you have the <sys/times.h> header file. */
-/* #undef HAVE_SYS_TIMES_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `times' function. */
-/* #undef HAVE_TIMES */
-
-/* Define to 1 if the system has the type `uint_least32_t'. */
-#define HAVE_UINT_LEAST32_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vsnprintf' function and it works properly. */
-/* #undef HAVE_VSNPRINTF */
-
-/* Define to 1 for Windos/64 */
-#define HOST_DOS64 1
-
-/* Assembler local label prefix */
-#define LSYM_PREFIX "L"
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 to disable the use of inline assembly */
-/* #undef NO_ASM */
-
-/* Name of package */
-#define PACKAGE "gmp"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "gmp-bugs@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "GNU MP"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU MP 6.2.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gmp"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.gnu.org/software/gmp/"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "6.2.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* The size of `mp_limb_t', as computed by sizeof. */
-#define SIZEOF_MP_LIMB_T 8
-
-/* The size of `unsigned', as computed by sizeof. */
-#define SIZEOF_UNSIGNED 4
-
-/* The size of `unsigned long', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG 4
-
-/* The size of `unsigned short', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_SHORT 2
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 8
-
-/* Define to 1 if sscanf requires writable inputs */
-/* #undef SSCANF_WRITABLE_INPUT */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Maximum size the tune program can test for SQR_TOOM2_THRESHOLD */
-/* #undef TUNE_SQR_TOOM2_MAX */
-
-/* Version number of package */
-#define VERSION "6.2.0"
-
-/* Define to 1 to enable ASSERT checking, per --enable-assert */
-/* #undef WANT_ASSERT */
-
-/* Define to 1 to enable GMP_CPU_TYPE faking cpuid, per --enable-fake-cpuid */
-/* #undef WANT_FAKE_CPUID */
-
-/* Define to 1 when building a fat binary. */
-/* #undef WANT_FAT_BINARY */
-
-/* Define to 1 to enable FFTs for multiplication, per --enable-fft */
-#define WANT_FFT 1
-
-/* Define to 1 to enable old mpn_mul_fft_full for multiplication, per
-   --enable-old-fft-full */
-/* #undef WANT_OLD_FFT_FULL */
-
-/* Define to 1 if --enable-profiling=gprof */
-/* #undef WANT_PROFILING_GPROF */
-
-/* Define to 1 if --enable-profiling=instrument */
-/* #undef WANT_PROFILING_INSTRUMENT */
-
-/* Define to 1 if --enable-profiling=prof */
-/* #undef WANT_PROFILING_PROF */
-
-/* Define one of these to 1 for the desired temporary memory allocation
-   method, per --enable-alloca. */
-#define WANT_TMP_ALLOCA 1
-/* #undef WANT_TMP_REENTRANT */
-/* #undef WANT_TMP_NOTREENTRANT */
-/* #undef WANT_TMP_DEBUG */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if the assembler understands the mulx instruction */
-/* #undef X86_ASM_MULX */
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-/* #undef YYTEXT_POINTER */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#define restrict __restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
--- a/build_files/build_environment/patches/hdf5.diff
+++ b/build_files/build_environment/patches/hdf5.diff
@@ -0,0 +1,11 @@
+--- UserMacros.cmake
+++ UserMacros.cmake
+@@ -16,6 +16,8 @@
+ if (BUILD_USER_DEFINED_LIBS)
+   MACRO_USER_DEFINED_LIBS ()
+ endif (BUILD_USER_DEFINED_LIBS)
+
+include(Config/cmake/usermacros/windows_mt.cmake)
+ #-----------------------------------------------------------------------------
+ #------------------- E X A M P L E   E N D -----------------------------------
+ #-----------------------------------------------------------------------------
--- a/build_files/build_environment/patches/numpy.diff
+++ b/build_files/build_environment/patches/numpy.diff
@@ -1,27 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index ba2b1f4..b10f7df 100644
--- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -2164,8 +2164,8 @@ class accelerate_info(system_info):
-                     'accelerate' in libraries):
-                 if intel:
-                     args.extend(['-msse3'])
-                else:
-                    args.extend(['-faltivec'])
-+#                else:
-+#                    args.extend(['-faltivec'])
-                 args.extend([
-                     '-I/System/Library/Frameworks/vecLib.framework/Headers'])
-                 link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
-@@ -2174,8 +2174,8 @@ class accelerate_info(system_info):
-                       'veclib' in libraries):
-                 if intel:
-                     args.extend(['-msse3'])
-                else:
-                    args.extend(['-faltivec'])
-+#                else:
-+#                    args.extend(['-faltivec'])
-                 args.extend([
-                     '-I/System/Library/Frameworks/vecLib.framework/Headers'])
-                 link_args.extend(['-Wl,-framework', '-Wl,vecLib'])
-
--- a/build_files/build_environment/patches/opencollada.diff
+++ b/build_files/build_environment/patches/opencollada.diff
@@ -86,47 +86,3 @@ index 1f9a3ee..d151e9a 100644
         return isnan( value );
 #else
         return std::isnan(value);
-
-
-diff --git a/DAEValidator/library/src/Dae.cpp b/DAEValidator/library/src/Dae.cpp
-index 9256ee1..241ad67 100644
--- a/DAEValidator/library/src/Dae.cpp
-+++ b/DAEValidator/library/src/Dae.cpp
-@@ -304,7 +304,7 @@ namespace opencollada
- 			if (auto root_node = root())
- 			{
- 				const auto & nodes = root_node.selectNodes("//*[@id]");
-				for (const auto & node : nodes)
-+				for (const auto node : nodes)
- 				{
- 					string id = node.attribute("id").value();
- 					mIdCache.insert(id);
-@@ -312,4 +312,4 @@ namespace opencollada
- 			}
- 		}
- 	}
-}
-\ No newline at end of file
-+}
-diff --git a/DAEValidator/library/src/DaeValidator.cpp b/DAEValidator/library/src/DaeValidator.cpp
-index 715d903..24423ce 100644
--- a/DAEValidator/library/src/DaeValidator.cpp
-+++ b/DAEValidator/library/src/DaeValidator.cpp
-@@ -162,7 +162,7 @@ namespace opencollada
- 
- 		// Find xsi:schemaLocation attributes in dae and try to validate against specified xsd documents
- 		const auto & elements = dae.root().selectNodes("//*[@xsi:schemaLocation]");
-		for (const auto & element : elements)
-+		for (const auto element : elements)
- 		{
- 			if (auto schemaLocation = element.attribute("schemaLocation"))
- 			{
-@@ -274,7 +274,7 @@ namespace opencollada
- 		int result = 0;
- 		map<string, size_t> ids;
- 		const auto & nodes = dae.root().selectNodes("//*[@id]");
-		for (const auto & node : nodes)
-+		for (const auto node : nodes)
- 		{
- 			string id = node.attribute("id").value();
- 			size_t line = node.line();
--- a/build_files/build_environment/patches/openmp.diff
+++ b/build_files/build_environment/patches/openmp.diff
@@ -1,23 +0,0 @@
-diff --git a/runtime/src/z_Linux_asm.S b/runtime/src/z_Linux_asm.S
-index 0d8885e..42aa5ad 100644
--- a/runtime/src/z_Linux_asm.S
-+++ b/runtime/src/z_Linux_asm.S
-@@ -1540,10 +1540,12 @@ __kmp_unnamed_critical_addr:
-     .comm .gomp_critical_user_,32,8
-     .data
-     .align 8
-    .global __kmp_unnamed_critical_addr
-__kmp_unnamed_critical_addr:
-+    .global ___kmp_unnamed_critical_addr
-+___kmp_unnamed_critical_addr:
-     .8byte .gomp_critical_user_
-    .size __kmp_unnamed_critical_addr,8
-+#  if !(KMP_OS_DARWIN)
-+    .size ___kmp_unnamed_critical_addr,8
-+#  endif
- #endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 */
- 
- #if KMP_OS_LINUX
-
-
-
--- a/build_files/build_environment/patches/openvdb.diff
+++ b/build_files/build_environment/patches/openvdb.diff
@@ -1,6 +1,6 @@
 diff -Naur orig/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
--- orig/cmake/FindIlmBase.cmake	2019-12-06 12:11:33 -0700
-+++ openvdb/cmake/FindIlmBase.cmake	2020-08-12 12:48:44 -0600
+--- orig/cmake/FindIlmBase.cmake	2019-12-06 13:11:33 -0700
+++ openvdb/cmake/FindIlmBase.cmake	2020-01-16 09:06:32 -0700
@@ -225,6 +225,12 @@
   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
     "-${IlmBase_VERSION_MAJOR}_${IlmBase_VERSION_MINOR}.lib"
@@ -15,8 +15,8 @@ diff -Naur orig/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
   if(ILMBASE_USE_STATIC_LIBS)
     list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
 diff -Naur orig/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
--- orig/cmake/FindOpenEXR.cmake	2019-12-06 12:11:33 -0700
-+++ openvdb/cmake/FindOpenEXR.cmake	2020-08-12 12:48:44 -0600
+--- orig/cmake/FindOpenEXR.cmake	2019-12-06 13:11:33 -0700
+++ openvdb/cmake/FindOpenEXR.cmake	2020-01-16 09:06:39 -0700
@@ -218,6 +218,12 @@
   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
     "-${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}.lib"
@@ -31,20 +31,9 @@ diff -Naur orig/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
   if(OPENEXR_USE_STATIC_LIBS)
     list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
 diff -Naur orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
--- orig/openvdb/CMakeLists.txt	2019-12-06 12:11:33 -0700
-+++ openvdb/openvdb/CMakeLists.txt	2020-08-12 14:12:26 -0600
-@@ -105,7 +105,9 @@
-   #        http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
-   #        https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
-   set(BUILD_SHARED_LIBS ON)
-  set(Boost_USE_STATIC_LIBS OFF)
-+  if(NOT WIN32) # blender links boost statically on windows
-+    set(Boost_USE_STATIC_LIBS OFF)
-+  endif()
- endif()
- 
- find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
-@@ -193,6 +195,7 @@
+--- orig/openvdb/CMakeLists.txt	2019-12-06 13:11:33 -0700
+++ openvdb/openvdb/CMakeLists.txt	2020-01-16 08:56:25 -0700
+@@ -193,11 +193,12 @@
   if(OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
     add_definitions(-DBOOST_ALL_NO_LIB)
   endif()
@@ -52,69 +41,33 @@ diff -Naur orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
 endif()
 
 # @todo Should be target definitions
-@@ -383,7 +386,12 @@
- # imported targets.
- 
- if(OPENVDB_CORE_SHARED)
-  add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES})
-+  if(WIN32)
-+    configure_file(version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
-+    add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-+  else()
-+    add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES})
-+  endif()
+ if(WIN32)
+-  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
 endif()
 
- if(OPENVDB_CORE_STATIC)
-diff -Naur orig/openvdb/version.rc.in openvdb/openvdb/version.rc.in
--- orig/openvdb/version.rc.in	1969-12-31 17:00:00 -0700
-+++ openvdb/openvdb/version.rc.in	2020-08-12 14:15:01 -0600
-@@ -0,0 +1,48 @@
-+#include <winver.h>
-+
-+#define VER_FILEVERSION             @OpenVDB_MAJOR_VERSION@,@OpenVDB_MINOR_VERSION@,@OpenVDB_PATCH_VERSION@,0
-+#define VER_FILEVERSION_STR         "@OpenVDB_MAJOR_VERSION@.@OpenVDB_MINOR_VERSION@.@OpenVDB_PATCH_VERSION@.0\0"
-+
-+#define VER_PRODUCTVERSION          @OpenVDB_MAJOR_VERSION@,@OpenVDB_MINOR_VERSION@,@OpenVDB_PATCH_VERSION@,0
-+#define VER_PRODUCTVERSION_STR      "@OpenVDB_MAJOR_VERSION@.@OpenVDB_MINOR_VERSION@\0"
-+
-+#ifndef DEBUG
-+#define VER_DEBUG                   0
-+#else
-+#define VER_DEBUG                   VS_FF_DEBUG
-+#endif
-+
-+VS_VERSION_INFO VERSIONINFO
-+FILEVERSION     VER_FILEVERSION
-+PRODUCTVERSION  VER_PRODUCTVERSION
-+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-+FILEFLAGS       (VER_DEBUG)
-+FILEOS          VOS__WINDOWS32
-+FILETYPE        VFT_DLL
-+FILESUBTYPE     VFT2_UNKNOWN
-+BEGIN
-+    BLOCK "StringFileInfo"
-+    BEGIN
-+        BLOCK "040904E4"
-+        BEGIN
-+            VALUE "FileDescription",  "OpenVDB"
-+            VALUE "FileVersion",      VER_FILEVERSION_STR
-+            VALUE "InternalName",     "OpenVDB"
-+            VALUE "ProductName",      "OpenVDB"
-+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
-+        END
-+    END
-+
-+    BLOCK "VarFileInfo"
-+    BEGIN
-+        /* The following line should only be modified for localized versions.     */
-+        /* It consists of any number of WORD,WORD pairs, with each pair           */
-+        /* describing a language,codepage combination supported by the file.      */
-+        /*                                                                        */
-+        /* For example, a file might have values "0x409,1252" indicating that it  */
-+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
-+
-+        VALUE "Translation", 0x409, 1252
-+
-+    END
-+END
+ ##### Core library configuration
+diff -Naur orig/openvdb/cmd/CMakeLists.txt openvdb/openvdb/cmd/CMakeLists.txt
+--- orig/openvdb/cmd/CMakeLists.txt	2019-12-06 13:11:33 -0700
+++ openvdb/openvdb/cmd/CMakeLists.txt	2020-01-16 08:56:25 -0700
+@@ -53,7 +53,7 @@
+ endif()
+ 
+ if(WIN32)
+-  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
+ endif()
+ 
+ # rpath handling
+diff -Naur orig/openvdb/unittest/CMakeLists.txt openvdb/openvdb/unittest/CMakeLists.txt
+--- orig/openvdb/unittest/CMakeLists.txt	2019-12-06 13:11:33 -0700
+++ openvdb/openvdb/unittest/CMakeLists.txt	2020-01-16 08:56:25 -0700
+@@ -49,7 +49,7 @@
+ endif()
+ 
+ if(WIN32)
+-  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
+ endif()
+ 
+ ##### VDB unit tests
--- a/build_files/build_environment/patches/python_macos.diff
+++ b/build_files/build_environment/patches/python_macos.diff
@@ -1,289 +0,0 @@
-diff -ru a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
--- a/Doc/library/ctypes.rst	2020-03-10 07:11:12.000000000 +0100
-+++ b/Doc/library/ctypes.rst	2020-07-14 08:10:10.000000000 +0200
-@@ -1551,6 +1551,13 @@
-       value usable as argument (integer, string, ctypes instance).  This allows
-       defining adapters that can adapt custom objects as function parameters.
- 
-+   .. attribute:: variadic
-+
-+      Assign a boolean to specify that the function takes a variable number of
-+      arguments.   This does not matter on most platforms, but for Apple arm64
-+      platforms variadic functions have a different calling convention than
-+      normal functions.
-+
-    .. attribute:: errcheck
- 
-       Assign a Python function or another callable to this attribute. The
-diff -ru a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c	2020-03-10 07:11:12.000000000 +0100
-+++ b/Modules/_ctypes/_ctypes.c	2020-07-14 08:14:41.000000000 +0200
-@@ -3175,6 +3175,35 @@
- }
- 
- static int
-+PyCFuncPtr_set_variadic(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
-+{
-+    StgDictObject *dict = PyObject_stgdict((PyObject *)self);
-+    assert(dict);
-+    int r = PyObject_IsTrue(ob);
-+    if (r == 1) {
-+        dict->flags |= FUNCFLAG_VARIADIC;
-+        return 0;
-+    } else if (r == 0) {
-+        dict->flags &= ~FUNCFLAG_VARIADIC;
-+        return 0;
-+    } else {
-+        return -1;
-+    }
-+}
-+
-+static PyObject *
-+PyCFuncPtr_get_variadic(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
-+{
-+    StgDictObject *dict = PyObject_stgdict((PyObject *)self);
-+    assert(dict); /* Cannot be NULL for PyCFuncPtrObject instances */
-+    if (dict->flags & FUNCFLAG_VARIADIC)
-+        Py_RETURN_TRUE;
-+    else
-+        Py_RETURN_FALSE;
-+}
-+
-+
-+static int
- PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
- {
-     PyObject *converters;
-@@ -5632,6 +5661,7 @@
-     PyModule_AddObject(m, "FUNCFLAG_USE_ERRNO", PyLong_FromLong(FUNCFLAG_USE_ERRNO));
-     PyModule_AddObject(m, "FUNCFLAG_USE_LASTERROR", PyLong_FromLong(FUNCFLAG_USE_LASTERROR));
-     PyModule_AddObject(m, "FUNCFLAG_PYTHONAPI", PyLong_FromLong(FUNCFLAG_PYTHONAPI));
-+    PyModule_AddObject(m, "FUNCFLAG_VARIADIC", PyLong_FromLong(FUNCFLAG_VARIADIC));
-     PyModule_AddStringConstant(m, "__version__", "1.1.0");
- 
-     PyModule_AddObject(m, "_memmove_addr", PyLong_FromVoidPtr(memmove));
-diff -ru a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
--- a/Modules/_ctypes/callproc.c	2020-03-10 07:11:12.000000000 +0100
-+++ b/Modules/_ctypes/callproc.c	2020-07-14 08:18:33.000000000 +0200
-@@ -767,7 +767,8 @@
-                                   ffi_type **atypes,
-                                   ffi_type *restype,
-                                   void *resmem,
-                                  int argcount)
-+                                  int argcount,
-+                                  int argtypecount)
- {
-     PyThreadState *_save = NULL; /* For Py_BLOCK_THREADS and Py_UNBLOCK_THREADS */
-     PyObject *error_object = NULL;
-@@ -793,15 +794,38 @@
-     if ((flags & FUNCFLAG_CDECL) == 0)
-         cc = FFI_STDCALL;
- #endif
-    if (FFI_OK != ffi_prep_cif(&cif,
-                               cc,
-                               argcount,
-                               restype,
-                               atypes)) {
-        PyErr_SetString(PyExc_RuntimeError,
-                        "ffi_prep_cif failed");
-        return -1;
-    }
-+#if HAVE_FFI_PREP_CIF_VAR
-+    /* Everyone SHOULD set f.variadic=True on variadic function pointers, but
-+     * lots of existing code will not.  If there's at least one arg and more
-+     * args are passed than are defined in the prototype, then it must be a
-+     * variadic function. */
-+    if ((flags & FUNCFLAG_VARIADIC) ||
-+        (argtypecount != 0 && argcount > argtypecount))
-+    {
-+        if (FFI_OK != ffi_prep_cif_var(&cif,
-+                                       cc,
-+                                       argtypecount,
-+                                       argcount,
-+                                       restype,
-+                                       atypes)) {
-+            PyErr_SetString(PyExc_RuntimeError,
-+                            "ffi_prep_cif_var failed");
-+            return -1;
-+        }
-+    } else {
-+#endif
-+        if (FFI_OK != ffi_prep_cif(&cif,
-+                                   cc,
-+                                   argcount,
-+                                   restype,
-+                                   atypes)) {
-+            PyErr_SetString(PyExc_RuntimeError,
-+                            "ffi_prep_cif failed");
-+            return -1;
-+        }
-+#if HAVE_FFI_PREP_CIF_VAR
-+     }
-+#endif
- 
-     if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) {
-         error_object = _ctypes_get_errobj(&space);
-@@ -1185,9 +1209,8 @@
- 
-     if (-1 == _call_function_pointer(flags, pProc, avalues, atypes,
-                                      rtype, resbuf,
-                                     Py_SAFE_DOWNCAST(argcount,
-                                                      Py_ssize_t,
-                                                      int)))
-+                                     Py_SAFE_DOWNCAST(argcount, Py_ssize_t, int),
-+                                     Py_SAFE_DOWNCAST(argtype_count, Py_ssize_t, int)))
-         goto cleanup;
- 
- #ifdef WORDS_BIGENDIAN
-diff -ru a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
--- a/Modules/_ctypes/ctypes.h	2020-03-10 07:11:12.000000000 +0100
-+++ b/Modules/_ctypes/ctypes.h	2020-07-14 08:30:53.000000000 +0200
-@@ -285,6 +285,7 @@
- #define FUNCFLAG_PYTHONAPI 0x4
- #define FUNCFLAG_USE_ERRNO 0x8
- #define FUNCFLAG_USE_LASTERROR 0x10
-+#define FUNCFLAG_VARIADIC 0x20
- 
- #define TYPEFLAG_ISPOINTER 0x100
- #define TYPEFLAG_HASPOINTER 0x200
-diff -ru a/configure b/configure
--- a/configure	2020-03-10 07:11:12.000000000 +0100
-+++ b/configure	2020-07-14 08:03:27.000000000 +0200
-@@ -3374,7 +3374,7 @@
-   # has no effect, don't bother defining them
-   Darwin/[6789].*)
-     define_xopen_source=no;;
-  Darwin/1[0-9].*)
-+  Darwin/[12][0-9].*)
-     define_xopen_source=no;;
-   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
-   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
-@@ -9251,6 +9251,9 @@
-     	ppc)
-     		MACOSX_DEFAULT_ARCH="ppc64"
-     		;;
-+        arm64)
-+            MACOSX_DEFAULT_ARCH="arm64"
-+            ;;
-     	*)
-     		as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
-     		;;
-diff -ru a/configure.ac b/configure.ac
--- a/configure.ac	2020-03-10 07:11:12.000000000 +0100
-+++ b/configure.ac	2020-07-14 08:03:27.000000000 +0200
-@@ -2456,6 +2456,9 @@
-     	ppc)
-     		MACOSX_DEFAULT_ARCH="ppc64"
-     		;;
-+        arm64)
-+            MACOSX_DEFAULT_ARCH="arm64"
-+            ;;
-     	*)
-     		AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
-     		;;
-diff -ru a/setup.py b/setup.py
--- a/setup.py	2020-03-10 07:11:12.000000000 +0100
-+++ b/setup.py	2020-07-14 08:28:12.000000000 +0200
-@@ -141,6 +141,13 @@
-             os.unlink(tmpfile)
- 
-     return MACOS_SDK_ROOT
-+ 
-+def is_macosx_at_least(vers):
-+    if host_platform == 'darwin':
-+        dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-+        if dep_target:
-+            return tuple(map(int, dep_target.split('.'))) >= vers
-+    return False
- 
- def is_macosx_sdk_path(path):
-     """
-@@ -150,6 +157,13 @@
-                 or path.startswith('/System/')
-                 or path.startswith('/Library/') )
- 
-+def grep_headers_for(function, headers):
-+    for header in headers:
-+        with open(header, 'r') as f:
-+            if function in f.read():
-+                return True
-+    return False
-+
- def find_file(filename, std_dirs, paths):
-     """Searches for the directory where a given file is located,
-     and returns a possibly-empty list of additional directories, or None
-@@ -1972,7 +1986,11 @@
-         return True
- 
-     def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-+        if not sysconfig.get_config_var("LIBFFI_INCLUDEDIR") and is_macosx_at_least((10,15)):
-+            self.use_system_libffi = True
-+        else:
-+            self.use_system_libffi = '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")
-+
-         include_dirs = []
-         extra_compile_args = []
-         extra_link_args = []
-@@ -2016,32 +2034,48 @@
-         ext_test = Extension('_ctypes_test',
-                      sources=['_ctypes/_ctypes_test.c'],
-                      libraries=['m'])
-+        ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
-+        ffi_lib = None
-+
-         self.extensions.extend([ext, ext_test])
- 
-         if host_platform == 'darwin':
-            if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"):
-+            if not self.use_system_libffi:
-                 return
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-+            ffi_in_sdk = os.path.join(macosx_sdk_root(), "usr/include/ffi")
-+            if os.path.exists(ffi_in_sdk):
-+                ffi_inc = ffi_in_sdk
-+                ffi_lib = 'ffi'
-+            else:
-+                # OS X 10.5 comes with libffi.dylib; the include files are
-+                # in /usr/include/ffi
-+                ffi_inc_dirs.append('/usr/include/ffi')
-+
-+        if not ffi_inc:
-+            found = find_file('ffi.h', [], ffi_inc_dirs)
-+            if found:
-+                ffi_inc = found[0]
-+        if ffi_inc:
-+            ffi_h = ffi_inc + '/ffi.h'
-             if not os.path.exists(ffi_h):
-                 ffi_inc = None
-                 print('Header file {} does not exist'.format(ffi_h))
-        ffi_lib = None
-        if ffi_inc is not None:
-+        if ffi_lib is None and ffi_inc:
-             for lib_name in ('ffi', 'ffi_pic'):
-                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                     ffi_lib = lib_name
-                     break
- 
-         if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-+            ffi_headers = glob(os.path.join(ffi_inc, '*.h'))
-+            if grep_headers_for('ffi_closure_alloc', ffi_headers):
-+                try:
-+                    sources.remove('_ctypes/malloc_closure.c')
-+                except ValueError:
-+                    pass
-+            if grep_headers_for('ffi_prep_cif_var', ffi_headers):
-+                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
-+            ext.include_dirs.append(ffi_inc)
-             ext.libraries.append(ffi_lib)
-             self.use_system_libffi = True
- 
--- a/build_files/build_environment/patches/sqlite.diff
+++ b/build_files/build_environment/patches/sqlite.diff
@@ -1,14 +0,0 @@
-Only in external_sqlite_orig: config.log
-diff -ru external_sqlite_orig/config.sub external_sqlite/config.sub
--- external_sqlite_orig/config.sub	2020-07-10 14:06:42.000000000 +0200
-+++ external_sqlite/config.sub	2020-07-10 14:10:24.000000000 +0200
-@@ -314,6 +314,7 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+	| aarch64-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-Only in external_sqlite: mksourceid
-Only in external_sqlite: sqlite3session.h
--- a/build_files/build_environment/patches/theora.diff
+++ b/build_files/build_environment/patches/theora.diff
@@ -1,18 +0,0 @@
--- config.sub
-+++ config.sub
-@@ -226,6 +226,7 @@
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
-+    | aarch64 \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-@@ -286,6 +287,7 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+    | aarch64-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
--- a/build_files/build_environment/patches/usd.diff
+++ b/build_files/build_environment/patches/usd.diff
@@ -10,6 +10,77 @@ diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defau
 add_definitions(${TBB_DEFINITIONS})
 
 # --math
+diff -x .git -ur usd.orig/pxr/base/plug/initConfig.cpp external_usd/pxr/base/plug/initConfig.cpp
+--- usd.orig/pxr/base/plug/initConfig.cpp.orig	2020-06-12 17:20:07.478199779 +0200
+++ external_usd/pxr/base/plug/initConfig.cpp	2020-06-12 17:25:28.648588552 +0200
+@@ -69,10 +69,40 @@
+
+ ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void)
+ {
+    /* The contents of this constructor have been moved to usd_initialise_plugin_path(...) */
+}
+
+}; // end of anonymous namespace
+
+/**
+ * The contents of this function used to be in the static constructor Plug_InitConfig.
+ * This static constructor made it impossible for Blender to pass a path to the USD
+ * library at runtime, as the constructor would run before Blender's main() function.
+ *
+ * This function is wrapped in a C function of the same name (defined below),
+ * so that it can be called from Blender's main() function.
+ *
+ * The datafiles_usd_path path is used to point to the USD plugin path when Blender
+ * has been installed. The fallback_usd_path path should point to the build-time
+ * location of the USD plugin files so that Blender can be run on a development machine
+ * without requiring an installation step.
+ */
+void
+usd_initialise_plugin_path(const char *datafiles_usd_path)
+{
+     std::vector<std::string> result;
+
+     std::vector<std::string> debugMessages;
+
+    // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory.
+    if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') {
+        std::string datafiles_usd_path_str(datafiles_usd_path);
+        if (datafiles_usd_path_str.back() != '/') {
+            datafiles_usd_path_str += "/";
+        }
+        result.push_back(datafiles_usd_path_str);
+    }
+
+     // Determine the absolute path to the Plug shared library.  Any relative
+     // paths specified in the plugin search path will be anchored to this
+     // directory, to allow for relocatability.  Note that this can fail when pxr
+@@ -114,9 +144,24 @@
+     _AppendPathList(&result, installLocation, binaryPath);
+ #endif // PXR_INSTALL_LOCATION
+
+-    Plug_SetPaths(result, debugMessages);
+-}
+    if (!TfGetenv("PXR_PATH_DEBUG").empty()) {
+        printf("USD Plugin paths: (%zu in total):\n", result.size());
+        for(const std::string &path : result) {
+            printf("    %s\n", path.c_str());
+        }
+    }
+
+    Plug_SetPaths(result, debugMessages);
+ }
+
+ PXR_NAMESPACE_CLOSE_SCOPE
+
+/* Workaround to make it possible to pass a path at runtime to USD. */
+extern "C" {
+void
+usd_initialise_plugin_path(
+    const char *datafiles_usd_path)
+{
+    PXR_NS::usd_initialise_plugin_path(datafiles_usd_path);
+}
+}
 diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros/Public.cmake
 --- external_usd_base/cmake/macros/Public.cmake	2019-10-24 14:39:53 -0600
 +++ external_usd/cmake/macros/Public.cmake	2020-01-11 13:33:29 -0700
@@ -26,36 +97,3 @@ diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros
     endforeach()
     foreach(lib ${PXR_OBJECT_LIBS})
         set(objects "${objects};\$<TARGET_OBJECTS:${lib}>")
-
-diff --git a/pxr/base/arch/align.h b/pxr/base/arch/align.h
-index f3cabf4..ebc8a69 100644
--- a/pxr/base/arch/align.h
-+++ b/pxr/base/arch/align.h
-@@ -77,7 +77,11 @@ ArchAlignMemory(void *base)
- /// The size of a CPU cache line on the current processor architecture in bytes.
- ///
- /// \hideinitializer
-+#if defined(ARCH_OS_DARWIN) && defined(ARCH_CPU_ARM)
-+#define ARCH_CACHE_LINE_SIZE 128
-+#else
- #define ARCH_CACHE_LINE_SIZE 64
-+#endif
- 
- ///@}
- 
-diff --git a/pxr/base/arch/math.h b/pxr/base/arch/math.h
-index 3e66c37..64a052c 100644
--- a/pxr/base/arch/math.h
-+++ b/pxr/base/arch/math.h
-@@ -42,7 +42,7 @@ PXR_NAMESPACE_OPEN_SCOPE
- /// \addtogroup group_arch_Math
- ///@{
- 
-#if defined (ARCH_CPU_INTEL) || defined(doxygen)
-+#if defined (ARCH_CPU_INTEL) || defined(ARCH_CPU_ARM) || defined(doxygen)
- 
- /// This is the smallest value e such that 1+e^2 == 1, using floats.
- /// True for all IEEE754 chipsets.
-
-
-
--- a/build_files/buildbot/buildbot_utils.py
+++ b/build_files/buildbot/buildbot_utils.py
@@ -33,11 +33,10 @@ def is_tool(name):
    return which(name) is not None

 class Builder:
-    def __init__(self, name, branch, codesign):
+    def __init__(self, name, branch):
        self.name = name
        self.branch = branch
        self.is_release_branch = re.match("^blender-v(.*)-release$", branch) is not None
-        self.codesign = codesign

        # Buildbot runs from build/ directory
        self.blender_dir = os.path.abspath(os.path.join('..', 'blender.git'))
@@ -68,9 +67,8 @@ def create_builder_from_arguments():
    parser = argparse.ArgumentParser()
    parser.add_argument('builder_name')
    parser.add_argument('branch', default='master', nargs='?')
-    parser.add_argument("--codesign", action="store_true")
    args = parser.parse_args()
-    return Builder(args.builder_name, args.branch, args.codesign)
+    return Builder(args.builder_name, args.branch)


 class VersionInfo:
--- a/build_files/buildbot/worker_bundle_dmg.py
+++ b/build_files/buildbot/worker_bundle_dmg.py
@@ -82,10 +82,6 @@ def create_argument_parser():
        type=Path,
        help="Optional path to applescript to set up folder looks of DMG."
             "If not provided default Blender's one is used.")
-    parser.add_argument(
-        '--codesign',
-        action="store_true",
-        help="Code sign and notarize DMG contents.")
    return parser


@@ -399,8 +395,7 @@ def create_final_dmg(app_bundles: List[Path],
                     dmg_filepath: Path,
                     background_image_filepath: Path,
                     volume_name: str,
-                     applescript: Path,
-                     codesign: bool) -> None:
+                     applescript: Path) -> None:
    """
    Create DMG with all app bundles

@@ -426,8 +421,7 @@ def create_final_dmg(app_bundles: List[Path],
    #
    # This allows to recurs into the content of bundles without worrying about
    # possible interfereice of Application symlink.
-    if codesign:
-        codesign_app_bundles_in_dmg(mount_directory)
+    codesign_app_bundles_in_dmg(mount_directory)

    copy_background_if_needed(background_image_filepath, mount_directory)
    create_applications_link(mount_directory)
@@ -440,8 +434,7 @@ def create_final_dmg(app_bundles: List[Path],
    compress_dmg(writable_dmg_filepath, dmg_filepath)
    writable_dmg_filepath.unlink()

-    if codesign:
-        codesign_and_notarize_dmg(dmg_filepath)
+    codesign_and_notarize_dmg(dmg_filepath)


 def ensure_dmg_extension(filepath: Path) -> Path:
@@ -528,7 +521,6 @@ def main():
    source_dir = args.source_dir.absolute()
    background_image_filepath = get_background_image(args.background_image)
    applescript = get_applescript(args.applescript)
-    codesign = args.codesign

    app_bundles = collect_and_log_app_bundles(source_dir)
    if not app_bundles:
@@ -543,8 +535,7 @@ def main():
                     dmg_filepath,
                     background_image_filepath,
                     volume_name,
-                     applescript,
-                     codesign)
+                     applescript)


 if __name__ == "__main__":
--- a/build_files/buildbot/worker_compile.py
+++ b/build_files/buildbot/worker_compile.py
@@ -24,7 +24,7 @@ import shutil
 import buildbot_utils

 def get_cmake_options(builder):
-    codesign_script = os.path.join(
+    post_install_script = os.path.join(
        builder.blender_dir, 'build_files', 'buildbot', 'worker_codesign.cmake')

    config_file = "build_files/cmake/config/blender_release.cmake"
@@ -36,8 +36,7 @@ def get_cmake_options(builder):
        options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
    elif builder.platform == 'win':
        options.extend(['-G', 'Visual Studio 16 2019', '-A', 'x64'])
-        if builder.codesign:
-            options.extend(['-DPOSTINSTALL_SCRIPT:PATH=' + codesign_script])
+        options.extend(['-DPOSTINSTALL_SCRIPT:PATH=' + post_install_script])
    elif builder.platform == 'linux':
        config_file = "build_files/buildbot/config/blender_linux.cmake"

--- a/build_files/buildbot/worker_pack.py
+++ b/build_files/buildbot/worker_pack.py
@@ -117,8 +117,6 @@ def pack_mac(builder):
    if info.is_development_build:
        background_image = os.path.join(release_dir, 'buildbot', 'background.tif')
        command += ['--background-image', background_image]
-    if builder.codesign:
-        command += ['--codesign']
    command += [builder.install_dir]
    buildbot_utils.call(command)

@@ -152,8 +150,7 @@ def pack_win(builder):

        package_filename = package_name + '.msi'
        package_filepath = os.path.join(builder.build_dir, package_filename)
-        if builder.codesign:
-            sign_file_or_directory(package_filepath)
+        sign_file_or_directory(package_filepath)

        package_files += [(package_filepath, package_filename)]

--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -12,8 +12,12 @@
 #=============================================================================
 # Copyright 2016 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If ALEMBIC_ROOT_DIR was defined in the environment, use it.
@@ -47,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)

 IF(ALEMBIC_FOUND)
  SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@@ -11,13 +11,6 @@
 #  AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories
 #  AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding

-#=============================================================================
-# Copyright 2014 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
 IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
 SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
 ENDIF()
--- a/build_files/cmake/Modules/FindBlosc.cmake
+++ b/build_files/cmake/Modules/FindBlosc.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2018 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If BLOSC_ROOT_DIR was defined in the environment, use it.
@@ -49,7 +53,7 @@ FIND_LIBRARY(BLOSC_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Blosc DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BLOSC DEFAULT_MSG
    BLOSC_LIBRARY BLOSC_INCLUDE_DIR)

 IF(BLOSC_FOUND)
--- a/build_files/cmake/Modules/FindClangTidy.cmake
+++ b/build_files/cmake/Modules/FindClangTidy.cmake
@@ -17,8 +17,12 @@
 #=============================================================================
 # Copyright 2020 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If CLANG_TIDY_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindEigen3.cmake
+++ b/build_files/cmake/Modules/FindEigen3.cmake
@@ -10,8 +10,12 @@
 #=============================================================================
 # Copyright 2015 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If EIGEN3_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -7,12 +7,19 @@
 #  EMBREE_ROOT_DIR, The base directory to search for Embree.
 #                        This can also be an environment variable.
 #  EMBREEFOUND, If false, do not try to use Embree.
+#
+# also defined, but not for general use are
+#  EMBREE_LIBRARY, where to find the Embree library.

 #=============================================================================
 # Copyright 2018 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If EMBREE_ROOT_DIR was defined in the environment, use it.
@@ -59,18 +66,19 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
    PATH_SUFFIXES
      lib64 lib
    )
-  IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
-    IF (EMBREE_EMBREE3_LIBRARY)
-      # If we can't find all the static libraries, try to fall back to the shared library if found.
-      # This allows building with a shared embree library
-      SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
-      BREAK()
-    ENDIF ()
-  ENDIF ()
  LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()


+FIND_LIBRARY(EMBREE_LIBRARY
+  NAMES
+    libembree3
+  HINTS
+    ${_embree_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+
 # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
--- a/build_files/cmake/Modules/FindFftw3.cmake
+++ b/build_files/cmake/Modules/FindFftw3.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If FFTW3_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -13,8 +13,12 @@
 #=============================================================================
 # Copyright 2014 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If GLEW_ROOT_DIR was defined in the environment, use it.
@@ -47,7 +51,7 @@ FIND_LIBRARY(GLEW_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
    GLEW_LIBRARY GLEW_INCLUDE_DIR)

 IF(GLEW_FOUND)
--- a/build_files/cmake/Modules/FindGMP.cmake
+++ b/build_files/cmake/Modules/FindGMP.cmake
@@ -1,92 +0,0 @@
-# - Find GMP library
-# Find the native GMP includes and library
-# This module defines
-#  GMP_INCLUDE_DIRS, where to find gmp.h, Set when
-#                        GMP_INCLUDE_DIR is found.
-#  GMP_LIBRARIES, libraries to link against to use GMP.
-#  GMP_ROOT_DIR, The base directory to search for GMP.
-#                    This can also be an environment variable.
-#  GMP_FOUND, If false, do not try to use GMP.
-#
-# also defined, but not for general use are
-#  GMP_LIBRARY, where to find the GMP library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
-# If GMP_ROOT_DIR was defined in the environment, use it.
-IF(NOT GMP_ROOT_DIR AND NOT $ENV{GMP_ROOT_DIR} STREQUAL "")
-  SET(GMP_ROOT_DIR $ENV{GMP_ROOT_DIR})
-ENDIF()
-
-SET(_gmp_SEARCH_DIRS
-  ${GMP_ROOT_DIR}
-  /opt/lib/gmp
-)
-
-FIND_PATH(GMP_INCLUDE_DIR
-  NAMES
-    gmp.h
-  HINTS
-    ${_gmp_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/gmp
-)
-
-FIND_PATH(GMPXX_INCLUDE_DIR
-  NAMES
-    gmpxx.h
-  HINTS
-    ${_gmp_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/gmp
-)
-
-FIND_LIBRARY(GMP_LIBRARY
-  NAMES
-    gmp
-  HINTS
-    ${_gmp_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(GMPXX_LIBRARY
-  NAMES
-    gmpxx
-  HINTS
-    ${_gmp_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-if(GMP_INCLUDE_DIR)
-  SET(_version_regex "^#define[ \t]+__GNU_MP_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${GMP_INCLUDE_DIR}/gmp.h"
-    GMP_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    GMP_VERSION "${GMP_VERSION}")
-  unset(_version_regex)
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set GMP_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG
-    GMP_LIBRARY GMPXX_LIBRARY GMP_INCLUDE_DIR GMPXX_INCLUDE_DIR)
-
-IF(GMP_FOUND)
-  SET(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY})
-  SET(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR} ${GMPXX_INCLUDE_DIR})
-ENDIF(GMP_FOUND)
-
-MARK_AS_ADVANCED(
-  GMP_INCLUDE_DIR
-  GMP_LIBRARY
-  GMPXX_INCLUDE_DIR
-  GMPXX_LIBRARY
-)
--- a/build_files/cmake/Modules/FindIcuLinux.cmake
+++ b/build_files/cmake/Modules/FindIcuLinux.cmake
@@ -12,8 +12,12 @@
 #=============================================================================
 # Copyright 2012 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If ICU_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindJack.cmake
+++ b/build_files/cmake/Modules/FindJack.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If JACK_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindJeMalloc.cmake
+++ b/build_files/cmake/Modules/FindJeMalloc.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If JEMALLOC_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindLLVM.cmake
+++ b/build_files/cmake/Modules/FindLLVM.cmake
@@ -13,8 +13,12 @@
 #=============================================================================
 # Copyright 2015 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 if(LLVM_ROOT_DIR)
--- a/build_files/cmake/Modules/FindLZO.cmake
+++ b/build_files/cmake/Modules/FindLZO.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2015 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If LZO_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake
+++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
@@ -7,12 +7,19 @@
 #  OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
 #                    This can also be an environment variable.
 #  OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
+#
+# also defined, but not for general use are
+#  OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library.

 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # note about include paths, there are 2 ways includes are set
--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2012 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENCOLORIO_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -21,8 +21,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENEXR_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenGLES.cmake
+++ b/build_files/cmake/Modules/FindOpenGLES.cmake
@@ -10,13 +10,6 @@
 #  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
 #  OPENGLES_INCLUDES        - all includes needed for OpenGLES

-#=============================================================================
-# Copyright 2014 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
 # If OPENGLES_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENGLES_ROOT_DIR AND NOT $ENV{OPENGLES_ROOT_DIR} STREQUAL "")
  SET(OPENGLES_ROOT_DIR $ENV{OPENGLES_ROOT_DIR})
--- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake
+++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2019 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENIMAGEDENOISE_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -16,8 +16,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENIMAGEIO_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENJPEG_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake
+++ b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2014 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OSL_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenSubdiv.cmake
+++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake
@@ -7,12 +7,19 @@
 #  OPENSUBDIV_ROOT_DIR, the base directory to search for OpenSubdiv.
 #                        This can also be an environment variable.
 #  OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv.
+#
+# also defined, but not for general use are
+#  OPENSUBDIV_LIBRARY, where to find the OpenSubdiv library.

 #=============================================================================
 # Copyright 2013 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENSUBDIV_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindOpenVDB.cmake
+++ b/build_files/cmake/Modules/FindOpenVDB.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2015 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPENVDB_ROOT_DIR was defined in the environment, use it.
@@ -49,7 +53,7 @@ FIND_LIBRARY(OPENVDB_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENVDB DEFAULT_MSG
    OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR)

 IF(OPENVDB_FOUND)
--- a/build_files/cmake/Modules/FindOptiX.cmake
+++ b/build_files/cmake/Modules/FindOptiX.cmake
@@ -10,8 +10,12 @@
 #=============================================================================
 # Copyright 2019 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If OPTIX_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindPCRE.cmake
+++ b/build_files/cmake/Modules/FindPCRE.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If PCRE_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindPugiXML.cmake
+++ b/build_files/cmake/Modules/FindPugiXML.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2014 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If PUGIXML_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -25,8 +25,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If PYTHON_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindSDL2.cmake
+++ b/build_files/cmake/Modules/FindSDL2.cmake
@@ -13,8 +13,12 @@
 #=============================================================================
 # Copyright 2015 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If SDL2_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindSpacenav.cmake
+++ b/build_files/cmake/Modules/FindSpacenav.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If SPACENAV_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindTBB.cmake
+++ b/build_files/cmake/Modules/FindTBB.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2016 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If TBB_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindUSD.cmake
+++ b/build_files/cmake/Modules/FindUSD.cmake
@@ -12,8 +12,12 @@
 #=============================================================================
 # Copyright 2019 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If USD_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindXML2.cmake
+++ b/build_files/cmake/Modules/FindXML2.cmake
@@ -14,8 +14,12 @@
 #=============================================================================
 # Copyright 2011 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If XML2_ROOT_DIR was defined in the environment, use it.
--- a/build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake
+++ b/build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake
@@ -20,8 +20,12 @@
 #  XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library.

 #=============================================================================
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #=============================================================================

 # If XR_OPENXR_SDK_ROOT_DIR was defined in the environment, use it.
@@ -55,7 +59,7 @@ FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set XR_OPENXR_SDK_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OpenXR_SDK DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OPENXR_SDK DEFAULT_MSG
    XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR)

 IF(XR_OPENXR_SDK_FOUND)
--- a/build_files/cmake/Modules/GTest.cmake
+++ b/build_files/cmake/Modules/GTest.cmake
@@ -1,550 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-
-#[=======================================================================[.rst:
-GoogleTest
----------
-
-.. versionadded:: 3.9
-
-This module defines functions to help use the Google Test infrastructure.  Two
-mechanisms for adding tests are provided. :command:`gtest_add_tests` has been
-around for some time, originally via ``find_package(GTest)``.
-:command:`gtest_discover_tests` was introduced in CMake 3.10.
-
-The (older) :command:`gtest_add_tests` scans source files to identify tests.
-This is usually effective, with some caveats, including in cross-compiling
-environments, and makes setting additional properties on tests more convenient.
-However, its handling of parameterized tests is less comprehensive, and it
-requires re-running CMake to detect changes to the list of tests.
-
-The (newer) :command:`gtest_discover_tests` discovers tests by asking the
-compiled test executable to enumerate its tests.  This is more robust and
-provides better handling of parameterized tests, and does not require CMake
-to be re-run when tests change.  However, it may not work in a cross-compiling
-environment, and setting test properties is less convenient.
-
-More details can be found in the documentation of the respective functions.
-
-Both commands are intended to replace use of :command:`add_test` to register
-tests, and will create a separate CTest test for each Google Test test case.
-Note that this is in some cases less efficient, as common set-up and tear-down
-logic cannot be shared by multiple test cases executing in the same instance.
-However, it provides more fine-grained pass/fail information to CTest, which is
-usually considered as more beneficial.  By default, the CTest test name is the
-same as the Google Test name (i.e. ``suite.testcase``); see also
-``TEST_PREFIX`` and ``TEST_SUFFIX``.
-
-.. command:: gtest_add_tests
-
-  Automatically add tests with CTest by scanning source code for Google Test
-  macros::
-
-    gtest_add_tests(TARGET target
-                    [SOURCES src1...]
-                    [EXTRA_ARGS arg1...]
-                    [WORKING_DIRECTORY dir]
-                    [TEST_PREFIX prefix]
-                    [TEST_SUFFIX suffix]
-                    [SKIP_DEPENDENCY]
-                    [TEST_LIST outVar]
-    )
-
-  ``gtest_add_tests`` attempts to identify tests by scanning source files.
-  Although this is generally effective, it uses only a basic regular expression
-  match, which can be defeated by atypical test declarations, and is unable to
-  fully "split" parameterized tests.  Additionally, it requires that CMake be
-  re-run to discover any newly added, removed or renamed tests (by default,
-  this means that CMake is re-run when any test source file is changed, but see
-  ``SKIP_DEPENDENCY``).  However, it has the advantage of declaring tests at
-  CMake time, which somewhat simplifies setting additional properties on tests,
-  and always works in a cross-compiling environment.
-
-  The options are:
-
-  ``TARGET target``
-    Specifies the Google Test executable, which must be a known CMake
-    executable target.  CMake will substitute the location of the built
-    executable when running the test.
-
-  ``SOURCES src1...``
-    When provided, only the listed files will be scanned for test cases.  If
-    this option is not given, the :prop_tgt:`SOURCES` property of the
-    specified ``target`` will be used to obtain the list of sources.
-
-  ``EXTRA_ARGS arg1...``
-    Any extra arguments to pass on the command line to each test case.
-
-  ``WORKING_DIRECTORY dir``
-    Specifies the directory in which to run the discovered test cases.  If this
-    option is not provided, the current binary directory is used.
-
-  ``TEST_PREFIX prefix``
-    Specifies a ``prefix`` to be prepended to the name of each discovered test
-    case.  This can be useful when the same source files are being used in
-    multiple calls to ``gtest_add_test()`` but with different ``EXTRA_ARGS``.
-
-  ``TEST_SUFFIX suffix``
-    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
-    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
-    be specified.
-
-  ``SKIP_DEPENDENCY``
-    Normally, the function creates a dependency which will cause CMake to be
-    re-run if any of the sources being scanned are changed.  This is to ensure
-    that the list of discovered tests is updated.  If this behavior is not
-    desired (as may be the case while actually writing the test cases), this
-    option can be used to prevent the dependency from being added.
-
-  ``TEST_LIST outVar``
-    The variable named by ``outVar`` will be populated in the calling scope
-    with the list of discovered test cases.  This allows the caller to do
-    things like manipulate test properties of the discovered tests.
-
-  .. code-block:: cmake
-
-    include(GoogleTest)
-    add_executable(FooTest FooUnitTest.cxx)
-    gtest_add_tests(TARGET      FooTest
-                    TEST_SUFFIX .noArgs
-                    TEST_LIST   noArgsTests
-    )
-    gtest_add_tests(TARGET      FooTest
-                    EXTRA_ARGS  --someArg someValue
-                    TEST_SUFFIX .withArgs
-                    TEST_LIST   withArgsTests
-    )
-    set_tests_properties(${noArgsTests}   PROPERTIES TIMEOUT 10)
-    set_tests_properties(${withArgsTests} PROPERTIES TIMEOUT 20)
-
-  For backward compatibility, the following form is also supported::
-
-    gtest_add_tests(exe args files...)
-
-  ``exe``
-    The path to the test executable or the name of a CMake target.
-  ``args``
-    A ;-list of extra arguments to be passed to executable.  The entire
-    list must be passed as a single argument.  Enclose it in quotes,
-    or pass ``""`` for no arguments.
-  ``files...``
-    A list of source files to search for tests and test fixtures.
-    Alternatively, use ``AUTO`` to specify that ``exe`` is the name
-    of a CMake executable target whose sources should be scanned.
-
-  .. code-block:: cmake
-
-    include(GoogleTest)
-    set(FooTestArgs --foo 1 --bar 2)
-    add_executable(FooTest FooUnitTest.cxx)
-    gtest_add_tests(FooTest "${FooTestArgs}" AUTO)
-
-.. command:: gtest_discover_tests
-
-  Automatically add tests with CTest by querying the compiled test executable
-  for available tests::
-
-    gtest_discover_tests(target
-                         [EXTRA_ARGS arg1...]
-                         [WORKING_DIRECTORY dir]
-                         [TEST_PREFIX prefix]
-                         [TEST_SUFFIX suffix]
-                         [NO_PRETTY_TYPES] [NO_PRETTY_VALUES]
-                         [PROPERTIES name1 value1...]
-                         [TEST_LIST var]
-                         [DISCOVERY_TIMEOUT seconds]
-                         [XML_OUTPUT_DIR dir]
-                         [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
-    )
-
-  ``gtest_discover_tests()`` sets up a post-build command on the test executable
-  that generates the list of tests by parsing the output from running the test
-  with the ``--gtest_list_tests`` argument.  Compared to the source parsing
-  approach of :command:`gtest_add_tests`, this ensures that the full list of
-  tests, including instantiations of parameterized tests, is obtained.  Since
-  test discovery occurs at build time, it is not necessary to re-run CMake when
-  the list of tests changes.
-  However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set
-  in order to function in a cross-compiling environment.
-
-  Additionally, setting properties on tests is somewhat less convenient, since
-  the tests are not available at CMake time.  Additional test properties may be
-  assigned to the set of tests as a whole using the ``PROPERTIES`` option.  If
-  more fine-grained test control is needed, custom content may be provided
-  through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES`
-  directory property.  The set of discovered tests is made accessible to such a
-  script via the ``<target>_TESTS`` variable.
-
-  The options are:
-
-  ``target``
-    Specifies the Google Test executable, which must be a known CMake
-    executable target.  CMake will substitute the location of the built
-    executable when running the test.
-
-  ``EXTRA_ARGS arg1...``
-    Any extra arguments to pass on the command line to each test case.
-
-  ``WORKING_DIRECTORY dir``
-    Specifies the directory in which to run the discovered test cases.  If this
-    option is not provided, the current binary directory is used.
-
-  ``TEST_PREFIX prefix``
-    Specifies a ``prefix`` to be prepended to the name of each discovered test
-    case.  This can be useful when the same test executable is being used in
-    multiple calls to ``gtest_discover_tests()`` but with different
-    ``EXTRA_ARGS``.
-
-  ``TEST_SUFFIX suffix``
-    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
-    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
-    be specified.
-
-  ``NO_PRETTY_TYPES``
-    By default, the type index of type-parameterized tests is replaced by the
-    actual type name in the CTest test name.  If this behavior is undesirable
-    (e.g. because the type names are unwieldy), this option will suppress this
-    behavior.
-
-  ``NO_PRETTY_VALUES``
-    By default, the value index of value-parameterized tests is replaced by the
-    actual value in the CTest test name.  If this behavior is undesirable
-    (e.g. because the value strings are unwieldy), this option will suppress
-    this behavior.
-
-  ``PROPERTIES name1 value1...``
-    Specifies additional properties to be set on all tests discovered by this
-    invocation of ``gtest_discover_tests()``.
-
-  ``TEST_LIST var``
-    Make the list of tests available in the variable ``var``, rather than the
-    default ``<target>_TESTS``.  This can be useful when the same test
-    executable is being used in multiple calls to ``gtest_discover_tests()``.
-    Note that this variable is only available in CTest.
-
-  ``DISCOVERY_TIMEOUT num``
-    Specifies how long (in seconds) CMake will wait for the test to enumerate
-    available tests.  If the test takes longer than this, discovery (and your
-    build) will fail.  Most test executables will enumerate their tests very
-    quickly, but under some exceptional circumstances, a test may require a
-    longer timeout.  The default is 5.  See also the ``TIMEOUT`` option of
-    :command:`execute_process`.
-
-    .. note::
-
-      In CMake versions 3.10.1 and 3.10.2, this option was called ``TIMEOUT``.
-      This clashed with the ``TIMEOUT`` test property, which is one of the
-      common properties that would be set with the ``PROPERTIES`` keyword,
-      usually leading to legal but unintended behavior.  The keyword was
-      changed to ``DISCOVERY_TIMEOUT`` in CMake 3.10.3 to address this
-      problem.  The ambiguous behavior of the ``TIMEOUT`` keyword in 3.10.1
-      and 3.10.2 has not been preserved.
-
-  ``XML_OUTPUT_DIR dir``
-    If specified, the parameter is passed along with ``--gtest_output=xml:``
-    to test executable. The actual file name is the same as the test target,
-    including prefix and suffix. This should be used instead of
-    ``EXTRA_ARGS --gtest_output=xml`` to avoid race conditions writing the
-    XML result output when using parallel test execution.
-
-  ``DISCOVERY_MODE``
-    Provides greater control over when ``gtest_discover_tests()`` performs test
-    discovery. By default, ``POST_BUILD`` sets up a post-build command
-    to perform test discovery at build time. In certain scenarios, like
-    cross-compiling, this ``POST_BUILD`` behavior is not desirable.
-    By contrast, ``PRE_TEST`` delays test discovery until just prior to test
-    execution. This way test discovery occurs in the target environment
-    where the test has a better chance at finding appropriate runtime
-    dependencies.
-
-    ``DISCOVERY_MODE`` defaults to the value of the
-    ``CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not
-    passed when calling ``gtest_discover_tests()``. This provides a mechanism
-    for globally selecting a preferred test discovery behavior without having
-    to modify each call site.
-
-#]=======================================================================]
-
-# Save project's policies
-cmake_policy(PUSH)
-cmake_policy(SET CMP0057 NEW) # if IN_LIST
-
-#------------------------------------------------------------------------------
-function(gtest_add_tests)
-
-  if (ARGC LESS 1)
-    message(FATAL_ERROR "No arguments supplied to gtest_add_tests()")
-  endif()
-
-  set(options
-      SKIP_DEPENDENCY
-  )
-  set(oneValueArgs
-      TARGET
-      WORKING_DIRECTORY
-      TEST_PREFIX
-      TEST_SUFFIX
-      TEST_LIST
-  )
-  set(multiValueArgs
-      SOURCES
-      EXTRA_ARGS
-  )
-  set(allKeywords ${options} ${oneValueArgs} ${multiValueArgs})
-
-  unset(sources)
-  if("${ARGV0}" IN_LIST allKeywords)
-    cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(autoAddSources YES)
-  else()
-    # Non-keyword syntax, convert to keyword form
-    if (ARGC LESS 3)
-      message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments")
-    endif()
-    set(ARGS_TARGET     "${ARGV0}")
-    set(ARGS_EXTRA_ARGS "${ARGV1}")
-    if(NOT "${ARGV2}" STREQUAL "AUTO")
-      set(ARGS_SOURCES "${ARGV}")
-      list(REMOVE_AT ARGS_SOURCES 0 1)
-    endif()
-  endif()
-
-  # The non-keyword syntax allows the first argument to be an arbitrary
-  # executable rather than a target if source files are also provided. In all
-  # other cases, both forms require a target.
-  if(NOT TARGET "${ARGS_TARGET}" AND NOT ARGS_SOURCES)
-    message(FATAL_ERROR "${ARGS_TARGET} does not define an existing CMake target")
-  endif()
-  if(NOT ARGS_WORKING_DIRECTORY)
-    unset(workDir)
-  else()
-    set(workDir WORKING_DIRECTORY "${ARGS_WORKING_DIRECTORY}")
-  endif()
-
-  if(NOT ARGS_SOURCES)
-    get_property(ARGS_SOURCES TARGET ${ARGS_TARGET} PROPERTY SOURCES)
-  endif()
-
-  unset(testList)
-
-  set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+) *, *([A-Za-z_0-9]+) *\\).*")
-  set(gtest_test_type_regex "(TYPED_TEST|TEST_?[FP]?)")
-
-  foreach(source IN LISTS ARGS_SOURCES)
-    if(NOT ARGS_SKIP_DEPENDENCY)
-      set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${source})
-    endif()
-    file(READ "${source}" contents)
-    string(REGEX MATCHALL "${gtest_test_type_regex} *\\(([A-Za-z_0-9 ,]+)\\)" found_tests "${contents}")
-    foreach(hit ${found_tests})
-      string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit})
-
-      # Parameterized tests have a different signature for the filter
-      if("x${test_type}" STREQUAL "xTEST_P")
-        string(REGEX REPLACE ${gtest_case_name_regex}  "*/\\1.\\2/*" gtest_test_name ${hit})
-      elseif("x${test_type}" STREQUAL "xTEST_F" OR "x${test_type}" STREQUAL "xTEST")
-        string(REGEX REPLACE ${gtest_case_name_regex} "\\1.\\2" gtest_test_name ${hit})
-      elseif("x${test_type}" STREQUAL "xTYPED_TEST")
-        string(REGEX REPLACE ${gtest_case_name_regex} "\\1/*.\\2" gtest_test_name ${hit})
-      else()
-        message(WARNING "Could not parse GTest ${hit} for adding to CTest.")
-        continue()
-      endif()
-
-      # Make sure tests disabled in GTest get disabled in CTest
-      if(gtest_test_name MATCHES "(^|\\.)DISABLED_")
-        # Add the disabled test if CMake is new enough
-        # Note that this check is to allow backwards compatibility so this
-        # module can be copied locally in projects to use with older CMake
-        # versions
-        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.8.20170401)
-          string(REGEX REPLACE
-                 "(^|\\.)DISABLED_" "\\1"
-                 orig_test_name "${gtest_test_name}"
-          )
-          set(ctest_test_name
-              ${ARGS_TEST_PREFIX}${orig_test_name}${ARGS_TEST_SUFFIX}
-          )
-          add_test(NAME ${ctest_test_name}
-                   ${workDir}
-                   COMMAND ${ARGS_TARGET}
-                     --gtest_also_run_disabled_tests
-                     --gtest_filter=${gtest_test_name}
-                     ${ARGS_EXTRA_ARGS}
-          )
-          set_tests_properties(${ctest_test_name} PROPERTIES DISABLED TRUE)
-          list(APPEND testList ${ctest_test_name})
-        endif()
-      else()
-        set(ctest_test_name ${ARGS_TEST_PREFIX}${gtest_test_name}${ARGS_TEST_SUFFIX})
-        add_test(NAME ${ctest_test_name}
-                 ${workDir}
-                 COMMAND ${ARGS_TARGET}
-                   --gtest_filter=${gtest_test_name}
-                   ${ARGS_EXTRA_ARGS}
-        )
-        list(APPEND testList ${ctest_test_name})
-      endif()
-    endforeach()
-  endforeach()
-
-  if(ARGS_TEST_LIST)
-    set(${ARGS_TEST_LIST} ${testList} PARENT_SCOPE)
-  endif()
-
-endfunction()
-
-#------------------------------------------------------------------------------
-
-function(gtest_discover_tests TARGET)
-  cmake_parse_arguments(
-    ""
-    "NO_PRETTY_TYPES;NO_PRETTY_VALUES"
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;DISCOVERY_TIMEOUT;XML_OUTPUT_DIR;DISCOVERY_MODE"
-    "EXTRA_ARGS;PROPERTIES"
-    ${ARGN}
-  )
-
-  if(NOT _WORKING_DIRECTORY)
-    set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endif()
-  if(NOT _TEST_LIST)
-    set(_TEST_LIST ${TARGET}_TESTS)
-  endif()
-  if(NOT _DISCOVERY_TIMEOUT)
-    set(_DISCOVERY_TIMEOUT 5)
-  endif()
-  if(NOT _DISCOVERY_MODE)
-    if(NOT CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE)
-      set(CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE "POST_BUILD")
-    endif()
-    set(_DISCOVERY_MODE ${CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE})
-  endif()
-
-  get_property(
-    has_counter
-    TARGET ${TARGET}
-    PROPERTY CTEST_DISCOVERED_TEST_COUNTER
-    SET
-  )
-  if(has_counter)
-    get_property(
-      counter
-      TARGET ${TARGET}
-      PROPERTY CTEST_DISCOVERED_TEST_COUNTER
-    )
-    math(EXPR counter "${counter} + 1")
-  else()
-    set(counter 1)
-  endif()
-  set_property(
-    TARGET ${TARGET}
-    PROPERTY CTEST_DISCOVERED_TEST_COUNTER
-    ${counter}
-  )
-
-  # Define rule to generate test list for aforementioned test executable
-  # Blender: use _ instead of [] to avoid problems with zsh regex.
-  set(ctest_file_base "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_${counter}_")
-  set(ctest_include_file "${ctest_file_base}_include.cmake")
-  set(ctest_tests_file "${ctest_file_base}_tests.cmake")
-  get_property(crosscompiling_emulator
-    TARGET ${TARGET}
-    PROPERTY CROSSCOMPILING_EMULATOR
-  )
-
-  if(_DISCOVERY_MODE STREQUAL "POST_BUILD")
-    add_custom_command(
-      TARGET ${TARGET} POST_BUILD
-      BYPRODUCTS "${ctest_tests_file}"
-      COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_TARGET=${TARGET}"
-              -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-              -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-              -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-              -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-              -D "TEST_PROPERTIES=${_PROPERTIES}"
-              -D "TEST_PREFIX=${_TEST_PREFIX}"
-              -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-              -D "NO_PRETTY_TYPES=${_NO_PRETTY_TYPES}"
-              -D "NO_PRETTY_VALUES=${_NO_PRETTY_VALUES}"
-              -D "TEST_LIST=${_TEST_LIST}"
-              -D "CTEST_FILE=${ctest_tests_file}"
-              -D "TEST_DISCOVERY_TIMEOUT=${_DISCOVERY_TIMEOUT}"
-              -D "TEST_XML_OUTPUT_DIR=${_XML_OUTPUT_DIR}"
-              -P "${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}"
-      VERBATIM
-    )
-
-    file(WRITE "${ctest_include_file}"
-      "if(EXISTS \"${ctest_tests_file}\")\n"
-      "  include(\"${ctest_tests_file}\")\n"
-      "else()\n"
-      "  add_test(${TARGET}_NOT_BUILT ${TARGET}_NOT_BUILT)\n"
-      "endif()\n"
-    )
-  elseif(_DISCOVERY_MODE STREQUAL "PRE_TEST")
-
-    get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL
-        PROPERTY GENERATOR_IS_MULTI_CONFIG
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      set(ctest_tests_file "${ctest_file_base}_tests-$<CONFIG>.cmake")
-    endif()
-
-    string(CONCAT ctest_include_content
-      "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")"                                    "\n"
-      "  if(\"$<TARGET_FILE:${TARGET}>\" IS_NEWER_THAN \"${ctest_tests_file}\")"   "\n"
-      "    include(\"${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}\")"                      "\n"
-      "    gtest_discover_tests_impl("                                             "\n"
-      "      TEST_EXECUTABLE"        " [==[" "$<TARGET_FILE:${TARGET}>"   "]==]"   "\n"
-      "      TEST_EXECUTOR"          " [==[" "${crosscompiling_emulator}" "]==]"   "\n"
-      "      TEST_WORKING_DIR"       " [==[" "${_WORKING_DIRECTORY}"      "]==]"   "\n"
-      "      TEST_EXTRA_ARGS"        " [==[" "${_EXTRA_ARGS}"             "]==]"   "\n"
-      "      TEST_PROPERTIES"        " [==[" "${_PROPERTIES}"             "]==]"   "\n"
-      "      TEST_PREFIX"            " [==[" "${_TEST_PREFIX}"            "]==]"   "\n"
-      "      TEST_SUFFIX"            " [==[" "${_TEST_SUFFIX}"            "]==]"   "\n"
-      "      NO_PRETTY_TYPES"        " [==[" "${_NO_PRETTY_TYPES}"        "]==]"   "\n"
-      "      NO_PRETTY_VALUES"       " [==[" "${_NO_PRETTY_VALUES}"       "]==]"   "\n"
-      "      TEST_LIST"              " [==[" "${_TEST_LIST}"              "]==]"   "\n"
-      "      CTEST_FILE"             " [==[" "${ctest_tests_file}"        "]==]"   "\n"
-      "      TEST_DISCOVERY_TIMEOUT" " [==[" "${_DISCOVERY_TIMEOUT}"      "]==]"   "\n"
-      "      TEST_XML_OUTPUT_DIR"    " [==[" "${_XML_OUTPUT_DIR}"         "]==]"   "\n"
-      "    )"                                                                      "\n"
-      "  endif()"                                                                  "\n"
-      "  include(\"${ctest_tests_file}\")"                                         "\n"
-      "else()"                                                                     "\n"
-      "  add_test(${TARGET}_NOT_BUILT ${TARGET}_NOT_BUILT)"                        "\n"
-      "endif()"                                                                    "\n"
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      foreach(_config ${CMAKE_CONFIGURATION_TYPES})
-        file(GENERATE OUTPUT "${ctest_file_base}_include-${_config}.cmake" CONTENT "${ctest_include_content}" CONDITION $<CONFIG:${_config}>)
-      endforeach()
-      file(WRITE "${ctest_include_file}" "include(\"${ctest_file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")")
-    else()
-      file(GENERATE OUTPUT "${ctest_file_base}_include.cmake" CONTENT "${ctest_include_content}")
-      file(WRITE "${ctest_include_file}" "include(\"${ctest_file_base}_include.cmake\")")
-    endif()
-
-  else()
-    message(FATAL_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
-  endif()
-
-  # Add discovered tests to directory TEST_INCLUDE_FILES
-  set_property(DIRECTORY
-    APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
-  )
-
-endfunction()
-
-###############################################################################
-
-set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT
-  ${CMAKE_CURRENT_LIST_DIR}/GTestAddTests.cmake
-)
-
-# Restore project's policies
-cmake_policy(POP)
--- a/build_files/cmake/Modules/GTestAddTests.cmake
+++ b/build_files/cmake/Modules/GTestAddTests.cmake
@@ -1,191 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-
-# Blender: disable ASAN leak detection when trying to discover tests.
-set(ENV{ASAN_OPTIONS} "detect_leaks=0")
-
-cmake_minimum_required(VERSION ${CMAKE_VERSION})
-
-# Overwrite possibly existing ${_CTEST_FILE} with empty file
-set(flush_tests_MODE WRITE)
-
-# Flushes script to ${_CTEST_FILE}
-macro(flush_script)
-  file(${flush_tests_MODE} "${_CTEST_FILE}" "${script}")
-  set(flush_tests_MODE APPEND)
-
-  set(script "")
-endmacro()
-
-# Flushes tests_buffer to tests
-macro(flush_tests_buffer)
-  list(APPEND tests "${tests_buffer}")
-  set(tests_buffer "")
-endmacro()
-
-macro(add_command NAME)
-  set(_args "")
-  foreach(_arg ${ARGN})
-    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
-      string(APPEND _args " [==[${_arg}]==]")
-    else()
-      string(APPEND _args " ${_arg}")
-    endif()
-  endforeach()
-  string(APPEND script "${NAME}(${_args})\n")
-  string(LENGTH "${script}" _script_len)
-  if(${_script_len} GREATER "50000")
-    flush_script()
-  endif()
-  # Unsets macro local variables to prevent leakage outside of this macro.
-  unset(_args)
-  unset(_script_len)
-endmacro()
-
-function(gtest_discover_tests_impl)
-
-  cmake_parse_arguments(
-    ""
-    ""
-    "NO_PRETTY_TYPES;NO_PRETTY_VALUES;TEST_EXECUTABLE;TEST_EXECUTOR;TEST_WORKING_DIR;TEST_PREFIX;TEST_SUFFIX;TEST_LIST;CTEST_FILE;TEST_DISCOVERY_TIMEOUT;TEST_XML_OUTPUT_DIR"
-    "TEST_EXTRA_ARGS;TEST_PROPERTIES"
-    ${ARGN}
-  )
-
-  set(prefix "${_TEST_PREFIX}")
-  set(suffix "${_TEST_SUFFIX}")
-  set(extra_args ${_TEST_EXTRA_ARGS})
-  set(properties ${_TEST_PROPERTIES})
-  set(script)
-  set(suite)
-  set(tests)
-  set(tests_buffer)
-
-  # Run test executable to get list of available tests
-  if(NOT EXISTS "${_TEST_EXECUTABLE}")
-    message(FATAL_ERROR
-      "Specified test executable does not exist.\n"
-      "  Path: '${_TEST_EXECUTABLE}'"
-    )
-  endif()
-  execute_process(
-    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" --gtest_list_tests
-    WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-    TIMEOUT ${_TEST_DISCOVERY_TIMEOUT}
-    OUTPUT_VARIABLE output
-    RESULT_VARIABLE result
-  )
-  if(NOT ${result} EQUAL 0)
-    string(REPLACE "\n" "\n    " output "${output}")
-    message(FATAL_ERROR
-      "Error running test executable.\n"
-      "  Path: '${_TEST_EXECUTABLE}'\n"
-      "  Result: ${result}\n"
-      "  Output:\n"
-      "    ${output}\n"
-    )
-  endif()
-
-  # Preserve semicolon in test-parameters
-  string(REPLACE [[;]] [[\;]] output "${output}")
-  string(REPLACE "\n" ";" output "${output}")
-
-  # Parse output
-  foreach(line ${output})
-    # Skip header
-    if(NOT line MATCHES "gtest_main\\.cc")
-      # Do we have a module name or a test name?
-      if(NOT line MATCHES "^  ")
-        # Module; remove trailing '.' to get just the name...
-        string(REGEX REPLACE "\\.( *#.*)?" "" suite "${line}")
-        if(line MATCHES "#" AND NOT _NO_PRETTY_TYPES)
-          string(REGEX REPLACE "/[0-9]\\.+ +#.*= +" "/" pretty_suite "${line}")
-        else()
-          set(pretty_suite "${suite}")
-        endif()
-        string(REGEX REPLACE "^DISABLED_" "" pretty_suite "${pretty_suite}")
-      else()
-        # Test name; strip spaces and comments to get just the name...
-        string(REGEX REPLACE " +" "" test "${line}")
-        if(test MATCHES "#" AND NOT _NO_PRETTY_VALUES)
-          string(REGEX REPLACE "/[0-9]+#GetParam..=" "/" pretty_test "${test}")
-        else()
-          string(REGEX REPLACE "#.*" "" pretty_test "${test}")
-        endif()
-        string(REGEX REPLACE "^DISABLED_" "" pretty_test "${pretty_test}")
-        string(REGEX REPLACE "#.*" "" test "${test}")
-        if(NOT "${_TEST_XML_OUTPUT_DIR}" STREQUAL "")
-          set(TEST_XML_OUTPUT_PARAM "--gtest_output=xml:${_TEST_XML_OUTPUT_DIR}/${prefix}${suite}.${test}${suffix}.xml")
-        else()
-          unset(TEST_XML_OUTPUT_PARAM)
-        endif()
-
-        # sanitize test name for further processing downstream
-        set(testname "${prefix}${pretty_suite}.${pretty_test}${suffix}")
-        # escape \
-        string(REPLACE [[\]] [[\\]] testname "${testname}")
-        # escape ;
-        string(REPLACE [[;]] [[\;]] testname "${testname}")
-        # escape $
-        string(REPLACE [[$]] [[\$]] testname "${testname}")
-
-        # ...and add to script
-        add_command(add_test
-          "${testname}"
-          ${_TEST_EXECUTOR}
-          "${_TEST_EXECUTABLE}"
-          "--gtest_filter=${suite}.${test}"
-          "--gtest_also_run_disabled_tests"
-          ${TEST_XML_OUTPUT_PARAM}
-          ${extra_args}
-        )
-        if(suite MATCHES "^DISABLED" OR test MATCHES "^DISABLED")
-          add_command(set_tests_properties
-            "${testname}"
-            PROPERTIES DISABLED TRUE
-          )
-        endif()
-        add_command(set_tests_properties
-          "${testname}"
-          PROPERTIES
-          WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-          SKIP_REGULAR_EXPRESSION "\\\\[  SKIPPED \\\\]"
-          ${properties}
-        )
-        list(APPEND tests_buffer "${testname}")
-        list(LENGTH tests_buffer tests_buffer_length)
-        if(${tests_buffer_length} GREATER "250")
-          flush_tests_buffer()
-        endif()
-      endif()
-    endif()
-  endforeach()
-
-
-  # Create a list of all discovered tests, which users may use to e.g. set
-  # properties on the tests
-  flush_tests_buffer()
-  add_command(set ${_TEST_LIST} ${tests})
-
-  # Write CTest script
-  flush_script()
-
-endfunction()
-
-if(CMAKE_SCRIPT_MODE_FILE)
-  gtest_discover_tests_impl(
-    NO_PRETTY_TYPES ${NO_PRETTY_TYPES}
-    NO_PRETTY_VALUES ${NO_PRETTY_VALUES}
-    TEST_EXECUTABLE ${TEST_EXECUTABLE}
-    TEST_EXECUTOR ${TEST_EXECUTOR}
-    TEST_WORKING_DIR ${TEST_WORKING_DIR}
-    TEST_PREFIX ${TEST_PREFIX}
-    TEST_SUFFIX ${TEST_SUFFIX}
-    TEST_LIST ${TEST_LIST}
-    CTEST_FILE ${CTEST_FILE}
-    TEST_DISCOVERY_TIMEOUT ${TEST_DISCOVERY_TIMEOUT}
-    TEST_XML_OUTPUT_DIR ${TEST_XML_OUTPUT_DIR}
-    TEST_EXTRA_ARGS ${TEST_EXTRA_ARGS}
-    TEST_PROPERTIES ${TEST_PROPERTIES}
-  )
-endif()
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -1,8 +1,12 @@
 #=============================================================================
 # Copyright 2014 Blender Foundation.
 #
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
 #
 # Inspired on the Testing.cmake from Libmv
 #
@@ -33,11 +37,6 @@ macro(BLENDER_SRC_GTEST_EX)
    if(WIN32)
      set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest")
    endif()
-
-    add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
-    add_definitions(${GFLAGS_DEFINES})
-    add_definitions(${GLOG_DEFINES})
-
    add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST})
    target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}")
    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}")
@@ -70,9 +69,6 @@ macro(BLENDER_SRC_GTEST_EX)
    if(WITH_TBB)
      target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
    endif()
-    if(WITH_GMP)
-      target_link_libraries(${TARGET_NAME} ${GMP_LIBRARIES})
-    endif()

    get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
    if(GENERATOR_IS_MULTI_CONFIG)
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -21,7 +21,7 @@
 # <pep8 compliant>

 import sys
-if sys.version_info.major < 3:
+if not sys.version.startswith("3"):
    print("\nPython3.x needed, found %s.\nAborting!\n" %
          sys.version.partition(" ")[0])
    sys.exit(1)
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -15,12 +15,10 @@ set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
 set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
-set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
-set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -20,12 +20,10 @@ set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE)
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
-set(WITH_GMP                 OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
-set(WITH_GMP                 OFF CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -16,12 +16,10 @@ set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
 set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
-set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
-set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
@@ -55,7 +53,7 @@ set(WITH_USD                 ON  CACHE BOOL "" FORCE)
 set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_CUDA_BINARIES  ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75 CACHE STRING "" FORCE)
+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 "" FORCE)
 set(WITH_CYCLES_DEVICE_OPTIX   ON CACHE BOOL "" FORCE)

 # platform dependent options
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -33,9 +33,18 @@ set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 # Depends on Python install, do this to quiet warning.
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)

-# Jemalloc does not work with dlopen() of Python modules:
-# https://github.com/jemalloc/jemalloc/issues/1237
-set(WITH_MEM_JEMALLOC        OFF CACHE BOOL "" FORCE)
+# Note, if linking errors can be resolved, lines below can be removed.
+# Until then, disable configurations known to fail.
+
+if(UNIX AND NOT APPLE)
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    # jemalloc causes linking error on import, disable.
+    set(WITH_MEM_JEMALLOC    OFF CACHE BOOL "" FORCE)
+  endif()
+elseif(APPLE)
+  # OpenMP causes linking error on build, disable.
+  set(WITH_MEM_JEMALLOC        OFF CACHE BOOL "" FORCE)
+endif()

 if(WIN32)
  set(WITH_WINDOWS_BUNDLE_CRT  OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -169,26 +169,6 @@ function(blender_include_dirs_sys
  include_directories(SYSTEM ${_ALL_INCS})
 endfunction()

-# Set include paths for header files included with "*.h" syntax.
-# This enables auto-complete suggestions for user header files on Xcode.
-# Build process is not affected since the include paths are the same
-# as in HEADER_SEARCH_PATHS.
-function(blender_user_header_search_paths
-  name
-  includes
-  )
-
-  if(XCODE)
-    set(_ALL_INCS "")
-    foreach(_INC ${includes})
-      get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
-      # _ALL_INCS is a space-separated string of file paths in quotes.
-      set(_ALL_INCS "${_ALL_INCS} \"${_ABS_INC}\"")
-    endforeach()
-    set_target_properties(${name} PROPERTIES XCODE_ATTRIBUTE_USER_HEADER_SEARCH_PATHS "${_ALL_INCS}")
-  endif()
-endfunction()
-
 function(blender_source_group
  name
  sources
@@ -337,7 +317,6 @@ function(blender_add_lib__impl
  # works fine without having the includes
  # listed is helpful for IDE's (QtCreator/MSVC)
  blender_source_group("${name}" "${sources}")
-  blender_user_header_search_paths("${name}" "${includes}")

  list_assert_duplicates("${sources}")
  list_assert_duplicates("${includes}")
@@ -375,42 +354,6 @@ function(blender_add_lib
  set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()

-# blender_add_test_lib() is used to define a test library. It is intended to be
-# called in tandem with blender_add_lib(). The test library will be linked into
-# the bf_gtest_runner_test executable (see tests/gtests/CMakeLists.txt).
-function(blender_add_test_lib
-  name
-  sources
-  includes
-  includes_sys
-  library_deps
-  )
-
-  add_cc_flags_custom_test(${name} PARENT_SCOPE)
-
-  # Otherwise external projects will produce warnings that we cannot fix.
-  remove_strict_flags()
-
-  # This duplicates logic that's also in GTestTesting.cmake, macro BLENDER_SRC_GTEST_EX.
-  # TODO(Sybren): deduplicate after the general approach in D7649 has been approved.
-  LIST(APPEND includes
-    ${CMAKE_SOURCE_DIR}/tests/gtests
-  )
-  LIST(APPEND includes_sys
-    ${GLOG_INCLUDE_DIRS}
-    ${GFLAGS_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/extern/gtest/include
-    ${CMAKE_SOURCE_DIR}/extern/gmock/include
-  )
-  add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
-  add_definitions(${GFLAGS_DEFINES})
-  add_definitions(${GLOG_DEFINES})
-
-  blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
-
-  set_property(GLOBAL APPEND PROPERTY BLENDER_TEST_LIBS ${name})
-endfunction()
-
 # Ninja only: assign 'heavy pool' to some targets that are especially RAM-consuming to build.
 function(setup_heavy_lib_pool)
  if(WITH_NINJA_POOL_JOBS AND NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS)
@@ -418,7 +361,7 @@ function(setup_heavy_lib_pool)
      list(APPEND _HEAVY_LIBS "cycles_device" "cycles_kernel")
    endif()
    if(WITH_LIBMV)
-      list(APPEND _HEAVY_LIBS "extern_ceres" "bf_intern_libmv")
+      list(APPEND _HEAVY_LIBS "bf_intern_libmv")
    endif()
    if(WITH_OPENVDB)
      list(APPEND _HEAVY_LIBS "bf_intern_openvdb")
@@ -496,10 +439,6 @@ function(SETUP_LIBDIRS)
      link_directories(${ALEMBIC_LIBPATH})
    endif()

-    if(WITH_GMP)
-      link_directories(${GMP_LIBPATH})
-    endif()
-
    if(WITH_GHOST_WAYLAND)
      link_directories(
        ${wayland-client_LIBRARY_DIRS}
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -20,11 +20,7 @@

 # Libraries configuration for Apple.

-if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  set(MACOSX_DEPLOYMENT_TARGET 11.00)
-else()
-  set(MACOSX_DEPLOYMENT_TARGET 10.13)
-endif()
+set(MACOSX_DEPLOYMENT_TARGET "10.13")

 macro(find_package_wrapper)
 # do nothing, just satisfy the macro
@@ -373,9 +369,8 @@ if(WITH_CYCLES_OSL)
  list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
  find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
  find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
-  find_path(OSL_SHADER_DIR NAMES stdosl.h PATHS ${CYCLES_OSL}/shaders)

-  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR)
+  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
    set(OSL_FOUND TRUE)
  else()
    message(STATUS "OSL not found")
@@ -383,12 +378,6 @@ if(WITH_CYCLES_OSL)
  endif()
 endif()

-if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  set(WITH_CYCLES_EMBREE OFF)
-  set(WITH_OPENIMAGEDENOISE OFF)
-  set(WITH_CPU_SSE OFF)
-endif()
-
 if(WITH_CYCLES_EMBREE)
  find_package(Embree 3.8.0 REQUIRED)
  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
@@ -407,15 +396,6 @@ if(WITH_TBB)
  find_package(TBB)
 endif()

-if(WITH_GMP)
-  find_package(GMP)
-
-  if(NOT GMP_FOUND)
-    set(WITH_GMP OFF)
-    message(STATUS "GMP not found")
-  endif()
-endif()
-
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
  if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
@@ -440,21 +420,13 @@ if(WITH_OPENMP)
 endif()

 if(WITH_XR_OPENXR)
-  find_package(XR_OpenXR_SDK)
-  if(NOT XR_OPENXR_SDK_FOUND)
+  find_package(OpenXR-SDK)
+  if(NOT OPENXR_SDK_FOUND)
    message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR")
    set(WITH_XR_OPENXR OFF)
  endif()
 endif()

-if(WITH_GMP)
-  find_package(GMP)
-  if(NOT GMP_FOUND)
-    message(WARNING "GMP not found, disabling WITH_GMP")
-    set(WITH_GMP OFF)
-  endif()
-endif()
-
 set(EXETYPE MACOSX_BUNDLE)

 set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -467,8 +439,8 @@ if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
  endif()
 else()
-  set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic -fno-strict-aliasing")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -fno-strict-aliasing")
+  set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+  set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 endif()

 if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -21,10 +21,8 @@
 # Xcode and system configuration for Apple.

 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} CACHE STRING
-    "Choose the architecture you want to build Blender for: arm64 or x86_64"
+  set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
+    "Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
    FORCE)
 endif()

@@ -131,21 +129,14 @@ if(${CMAKE_GENERATOR} MATCHES "Xcode")
 endif()
 unset(OSX_SDKROOT)

-
 # 10.13 is our min. target, if you use higher sdk, weak linking happens
-if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  set(OSX_MIN_DEPLOYMENT_TARGET 11.00)
-else()
-  set(OSX_MIN_DEPLOYMENT_TARGET 10.13)
-endif()
-
 if(CMAKE_OSX_DEPLOYMENT_TARGET)
-  if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS ${OSX_MIN_DEPLOYMENT_TARGET})
-    message(STATUS "Setting deployment target to ${OSX_MIN_DEPLOYMENT_TARGET}, lower versions are not supported")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE)
+  if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.13)
+    message(STATUS "Setting deployment target to 10.13, lower versions are not supported")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "" FORCE)
  endif()
 else()
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "" FORCE)
 endif()

 if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -154,11 +145,3 @@ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
  add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
 endif()
-
-if(${CMAKE_GENERATOR} MATCHES "Xcode")
-  # Generate schemes in Blender.xcodeproj/xcshareddata/xcschemes/ early, at
-  # configuration time, not when Xcode is opened.
-  # This gets rid of "Manage schemes automatically" confirmation dialog that
-  # appears whenever CMake is run.
-  set(CMAKE_XCODE_GENERATE_SCHEME ON)
-endif()
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -36,11 +36,6 @@ if(NOT DEFINED LIBDIR)
  elseif(EXISTS ${LIBDIR_CENTOS7_ABI})
    set(LIBDIR ${LIBDIR_CENTOS7_ABI})
    set(WITH_CXX11_ABI OFF)
-
-    if(CMAKE_COMPILER_IS_GNUCC AND
-       CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
-      message(FATAL_ERROR "GCC version must be at least 9.3 for precompiled libraries, found ${CMAKE_C_COMPILER_VERSION}")
-    endif()
  endif()

  # Avoid namespace pollustion.
@@ -52,19 +47,12 @@ if(EXISTS ${LIBDIR})
  message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")

  file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
-  # Ignore Mesa software OpenGL libraries, they are not intended to be
-  # linked against but to optionally override at runtime.
-  list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/mesa)
  # NOTE: Make sure "proper" compiled zlib comes first before the one
  # which is a part of OpenCollada. They have different ABI, and we
  # do need to use the official one.
  set(CMAKE_PREFIX_PATH ${LIBDIR}/zlib ${LIB_SUBDIRS})
  set(WITH_STATIC_LIBS ON)
-  # OpenMP usually can't be statically linked into shared libraries,
-  # due to not being compiled with position independent code.
-  if(NOT WITH_PYTHON_MODULE)
-    set(WITH_OPENMP_STATIC ON)
-  endif()
+  set(WITH_OPENMP_STATIC ON)
  set(Boost_NO_BOOST_CMAKE ON)
  set(BOOST_ROOT ${LIBDIR}/boost)
  set(BOOST_LIBRARYDIR ${LIBDIR}/boost/lib)
@@ -241,10 +229,10 @@ endif()

 if(WITH_CYCLES_OSL)
  set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-  if(EXISTS ${CYCLES_OSL} AND NOT OSL_ROOT)
+  if(NOT OSL_ROOT)
    set(OSL_ROOT ${CYCLES_OSL})
  endif()
-  find_package_wrapper(OSL)
+  find_package_wrapper(OpenShadingLanguage)
  if(OSL_FOUND)
    if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")
      # Note: --whole-archive is needed to force loading of all symbols in liboslexec,
@@ -434,31 +422,14 @@ if(WITH_TBB)
  find_package_wrapper(TBB)
 endif()

-if(WITH_GMP)
-  find_package(GMP)
-
-  if(NOT GMP_FOUND)
-    set(WITH_GMP OFF)
-    message(STATUS "GMP not found")
-  endif()
-endif()
-
 if(WITH_XR_OPENXR)
-  find_package(XR_OpenXR_SDK)
+  find_package(XR-OpenXR-SDK)
  if(NOT XR_OPENXR_SDK_FOUND)
    message(WARNING "OpenXR-SDK not found, disabling WITH_XR_OPENXR")
    set(WITH_XR_OPENXR OFF)
  endif()
 endif()

-if(WITH_GMP)
-  find_package_wrapper(GMP)
-  if(NOT GMP_FOUND)
-    message(WARNING "GMP not found, disabling WITH_GMP")
-    set(WITH_GMP OFF)
-  endif()
-endif()
-
 if(EXISTS ${LIBDIR})
  without_system_libs_end()
 endif()
@@ -606,14 +577,6 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCC)
  set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")

-  # `maybe-uninitialized` is unreliable in release builds, but fine in debug builds.
-  set(GCC_EXTRA_FLAGS_RELEASE "-Wno-maybe-uninitialized")
-  set(CMAKE_C_FLAGS_RELEASE          "${GCC_EXTRA_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "${GCC_EXTRA_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  set(CMAKE_CXX_FLAGS_RELEASE        "${GCC_EXTRA_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${GCC_EXTRA_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-  unset(GCC_EXTRA_FLAGS_RELEASE)
-
  if(WITH_LINKER_GOLD)
    execute_process(
      COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -136,21 +136,14 @@ add_definitions(
 # MSVC11 needs _ALLOW_KEYWORD_MACROS to build
 add_definitions(-D_ALLOW_KEYWORD_MACROS)

-# RTTI is on by default even without this switch
-# however having it in the CXX Flags makes it difficult
-# to remove for individual files that want to disable it
-# using the /GR- flag without generating a build warning
-# that both /GR and /GR- are specified.
-remove_cc_flag("/GR")
-
 # We want to support Windows 7 level ABI
 add_definitions(-D_WIN32_WINNT=0x601)
 include(build_files/cmake/platform/platform_win32_bundle_crt.cmake)
 remove_cc_flag("/MDd" "/MD" "/Zi")

 if(WITH_WINDOWS_PDB)
-  set(PDB_INFO_OVERRIDE_FLAGS "/Z7")
-  set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+	set(PDB_INFO_OVERRIDE_FLAGS "/Z7")
+	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
 endif()

 if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
@@ -423,6 +416,9 @@ if(WITH_BOOST)
  if(WITH_INTERNATIONAL)
    list(APPEND boost_extra_libs locale)
  endif()
+  if(WITH_OPENVDB)
+    list(APPEND boost_extra_libs iostreams)
+  endif()
  set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
  set(Boost_USE_MULTITHREADED ON) # suffix -mt
  set(Boost_USE_STATIC_LIBS ON) # suffix -s
@@ -528,11 +524,12 @@ if(WITH_OPENCOLORIO)
 endif()

 if(WITH_OPENVDB)
+  set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib)
  set(OPENVDB ${LIBDIR}/openVDB)
  set(OPENVDB_LIBPATH ${OPENVDB}/lib)
  set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-  set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib )
-  set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
+  set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${BLOSC_LIBRARIES})
+  set(OPENVDB_DEFINITIONS -DNOMINMAX -DOPENVDB_STATICLIB -D_USE_MATH_DEFINES)
 endif()

 if(WITH_OPENIMAGEDENOISE)
@@ -753,10 +750,3 @@ if(WITH_XR_OPENXR)
    set(WITH_XR_OPENXR OFF)
  endif()
 endif()
-
-if(WITH_GMP)
-  set(GMP_INCLUDE_DIRS ${LIBDIR}/gmp/include)
-  set(GMP_LIBRARIES ${LIBDIR}/gmp/lib/libgmp-10.lib optimized ${LIBDIR}/gmp/lib/libgmpxx.lib debug ${LIBDIR}/gmp/lib/libgmpxx_d.lib)
-  set(GMP_ROOT_DIR ${LIBDIR}/gmp)
-  set(GMP_FOUND On)
-endif()
--- a/build_files/cmake/platform/platform_win32_bundle_crt.cmake
+++ b/build_files/cmake/platform/platform_win32_bundle_crt.cmake
@@ -5,14 +5,6 @@ if(WITH_WINDOWS_BUNDLE_CRT)
  set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
  set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
  set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
-
-  # This sometimes can change when updates are installed and the compiler version
-  # changes, so test if it exists and if not, give InstallRequiredSystemLibraries
-  # another chance to figure out the path.
-  if(MSVC_REDIST_DIR AND NOT EXISTS "${MSVC_REDIST_DIR}")
-    unset(MSVC_REDIST_DIR CACHE)
-  endif()
-
  include(InstallRequiredSystemLibraries)

  # Install the CRT to the blender.crt Sub folder.
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -25,8 +25,8 @@ __all__ = (


 import sys
-if not sys.version_info.major < 3:
-    print("\nPython3.x or newer needed, found %s.\nAborting!\n" %
+if not sys.version.startswith("3"):
+    print("\nPython3.x needed, found %s.\nAborting!\n" %
          sys.version.partition(" ")[0])
    sys.exit(1)

--- a/build_files/utils/make_utils.py
+++ b/build_files/utils/make_utils.py
@@ -48,7 +48,7 @@ def git_branch(git_command):
 def git_tag(git_command):
    # Get current tag name.
    try:
-        tag = subprocess.check_output([git_command, "describe", "--exact-match"], stderr=subprocess.STDOUT)
+        tag = subprocess.check_output([git_command, "describe", "--exact-match"])
    except subprocess.CalledProcessError as e:
        return None

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

-PROJECT_NUMBER         = "V2.91"
+PROJECT_NUMBER         = "V2.90"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/doc/license/BSD-3-Clause-license.txt
+++ b/doc/license/BSD-3-Clause-license.txt
@@ -1,26 +0,0 @@
-BSD 3-Clause License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/doc/python_api/examples/gpu.7.py
+++ b/doc/python_api/examples/gpu.7.py
@@ -20,7 +20,6 @@ from gpu_extras.presets import draw_circle_2d
 offscreen = gpu.types.GPUOffScreen(512, 512)

 with offscreen.bind():
-    bgl.glClearColor(0.0, 0.0, 0.0, 0.0)
    bgl.glClear(bgl.GL_COLOR_BUFFER_BIT)
    with gpu.matrix.push_pop():
        # reset matrices -> use normalized device coordinates [-1, 1]
--- a/doc/python_api/examples/gpu.8.py
+++ b/doc/python_api/examples/gpu.8.py
@@ -25,7 +25,6 @@ RING_AMOUNT = 10
 offscreen = gpu.types.GPUOffScreen(WIDTH, HEIGHT)

 with offscreen.bind():
-    bgl.glClearColor(0.0, 0.0, 0.0, 0.0)
    bgl.glClear(bgl.GL_COLOR_BUFFER_BIT)
    with gpu.matrix.push_pop():
        # reset matrices -> use normalized device coordinates [-1, 1]
--- a/doc/python_api/rst/change_log.rst
+++ b/doc/python_api/rst/change_log.rst
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clément Foucault	e8f8c13d4b	PointCloud: Initial rendering support for Workbench Also includes outline overlays. Removes the temp overlay drawing We make the geometry follow camera like billboards this uses less geometry. Currently we use half octahedron for now. Goal would be to use icospheres. This patch also optimize the case when pointcloud has uniform radius. However we should premultiply the radius prop by the default radius beforehand to avoid a multiplication on CPU. Differential Revision: https://developer.blender.org/D8301	2020-07-15 14:23:35 +02:00
Clément Foucault	0c062a9e08	PointCloud: Change visualization to use octahedron This reduces the number of polygon needed. Also optimize the case when pointcloud has uniform radius.	2020-07-15 14:08:32 +02:00
Clément Foucault	38655c43fb	PointCloud: Make geometry follow camera A bit like billboards. This will allow to use less geometry in the future.	2020-07-15 13:23:22 +02:00
Clément Foucault	102f66c0a4	PointCloud: Initial rendering support for Workbench Also includes outline overlays. Removes the temp overlay drawing	2020-07-14 16:47:45 +02:00
Clément Foucault	5e12123685	DRW: Add common point cloud rendering functions	2020-07-11 14:46:02 +02:00