replace std::variant with std::any

2021-03-21 12:33:18 +01:00
1951 changed files with 27383 additions and 68251 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,7 @@
 # Configuration of clang-format
 # =============================
 #
-# Tested to work with versions: 8 to 11.
+# Tested to work with versions: 6 to 8.

 # This causes parameters on continuations to align to the opening brace.
 #
@@ -255,7 +255,7 @@ ForEachMacros:
  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
  - SEQ_ALL_BEGIN
-  - SEQ_ITERATOR_FOREACH
+  - SEQ_CURRENT_BEGIN
  - SURFACE_QUAD_ITER_BEGIN
  - foreach
  - ED_screen_areas_iter
@@ -264,5 +264,8 @@ ForEachMacros:
  - MAP_SLOT_PROBING_BEGIN
  - VECTOR_SET_SLOT_PROBING_BEGIN

-StatementMacros:
-  - PyObject_VAR_HEAD
+# Use once we bump the minimum version to version 8.
+# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
+# StatementMacros:
+#   - PyObject_VAR_HEAD
+#   - STRINGIFY
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -35,13 +35,12 @@ Checks:  >
  -modernize-use-auto,
  -modernize-use-trailing-return-type,
  -modernize-avoid-c-arrays,
+  -modernize-use-equals-default,
  -modernize-use-nodiscard,
  -modernize-loop-convert,
  -modernize-pass-by-value,
-  # Cannot be enabled yet, because using raw string literals in tests breaks
-  # the windows compiler currently.
-  -modernize-raw-string-literal

+WarningsAsErrors: '*'
 CheckOptions:
  - key: modernize-use-default-member-init.UseAssignment
    value: 1
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,3 @@ Desktop.ini

 # smoke simulation noise tile (generated)
 waveletNoiseTile.bin
-
-# testing environment
-/Testing
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,9 @@ option(WITH_SYSTEM_AUDASPACE "Build with external audaspace library installed on
 mark_as_advanced(WITH_AUDASPACE)
 mark_as_advanced(WITH_SYSTEM_AUDASPACE)

-set_and_warn_dependency(WITH_AUDASPACE WITH_SYSTEM_AUDASPACE OFF)
+if(NOT WITH_AUDASPACE)
+  set(WITH_SYSTEM_AUDASPACE OFF)
+endif()

 option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
 if(UNIX AND NOT APPLE)
@@ -520,10 +522,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
  mark_as_advanced(WITH_LINKER_LLD)
 endif()

-option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
-mark_as_advanced(WITH_COMPILER_ASAN)
-
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
+  mark_as_advanced(WITH_COMPILER_ASAN)
+
  if(WITH_COMPILER_ASAN)
    set(_asan_defaults "\
 -fsanitize=address \
@@ -702,8 +704,10 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
  message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()

-set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
-set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
+if(NOT WITH_PYTHON)
+  set(WITH_CYCLES OFF)
+  set(WITH_DRACO OFF)
+endif()

 if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
  message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
@@ -775,7 +779,6 @@ if(WITH_INSTALL_PORTABLE)
 endif()

 if(WITH_GHOST_SDL OR WITH_HEADLESS)
-  message(STATUS "Disabling Ghost Wayland, X11, Input IME, and OpenXR")
  set(WITH_GHOST_WAYLAND OFF)
  set(WITH_GHOST_X11     OFF)
  set(WITH_X11_XINPUT    OFF)
@@ -806,7 +809,7 @@ endif()
 if(NOT WITH_CUDA_DYNLOAD)
  find_package(CUDA)
  if(NOT CUDA_FOUND)
-    message(STATUS "CUDA toolkit not found, using dynamic runtime loading of libraries (WITH_CUDA_DYNLOAD) instead")
+    message("CUDA toolkit not found, using dynamic runtime loading of libraries instead")
    set(WITH_CUDA_DYNLOAD ON)
  endif()
 endif()
@@ -1232,7 +1235,6 @@ if(WITH_OPENMP)
      string(APPEND CMAKE_C_FLAGS " ${OpenMP_C_FLAGS}")
      string(APPEND CMAKE_CXX_FLAGS " ${OpenMP_CXX_FLAGS}")
      string(APPEND CMAKE_EXE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
    else()
      # Typically avoid adding flags as defines but we can't
      # pass OpenMP flags to the linker for static builds, meaning
@@ -1243,7 +1245,6 @@ if(WITH_OPENMP)
      find_library_static(OpenMP_LIBRARIES gomp ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
    endif()
  else()
-    message(STATUS "OpenMP not found, disabling WITH_OPENMP")
    set(WITH_OPENMP OFF)
  endif()

@@ -1319,7 +1320,6 @@ list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
 if(WITH_BULLET AND WITH_SYSTEM_BULLET)
  find_package(Bullet)
  if(NOT BULLET_FOUND)
-    message(STATUS "Bullet not found, disabling WITH_BULLET")
    set(WITH_BULLET OFF)
  endif()
 else()
@@ -1526,7 +1526,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_RESTRICT -Wrestrict)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE  -Wno-suggest-override)

  # gcc 4.2 gives annoying warnings on every file with this
  if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1590,8 +1589,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL  -Wno-overloaded-virtual)  # we get a lot of these, if its a problem a dev needs to look into it.
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE        -Wno-sign-compare)
  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF    -Wno-invalid-offsetof)
-  # Apple Clang (tested on version 12) doesn't support this flag while LLVM Clang 11 does.
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SUGGEST_OVERRIDE    -Wno-suggest-override)

  # gives too many unfixable warnings
  # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
@@ -1958,10 +1955,10 @@ if(FIRST_RUN)
  info_cfg_option(WITH_JACK)
  info_cfg_option(WITH_JACK_DYNLOAD)
  info_cfg_option(WITH_OPENAL)
-  info_cfg_option(WITH_PULSEAUDIO)
-  info_cfg_option(WITH_PULSEAUDIO_DYNLOAD)
  info_cfg_option(WITH_SDL)
  info_cfg_option(WITH_SDL_DYNLOAD)
+  info_cfg_option(WITH_PULSEAUDIO)
+  info_cfg_option(WITH_PULSEAUDIO_DYNLOAD)
  info_cfg_option(WITH_WASAPI)

  info_cfg_text("Compression:")
--- a/21
+++ b/21
@@ -128,14 +128,8 @@ Utilities
   * source_archive:
     Create a compressed archive of the source code.

-   * source_archive_complete:
-     Create a compressed archive of the source code and all the libraries of dependencies.
-
   * update:
-     Updates git and all submodules and svn.
-
-   * update_code:
-     Updates git and all submodules but not svn.
+     updates git and all submodules

   * format:
     Format source code using clang (uses PATHS if passed in). For example::
@@ -480,9 +474,6 @@ check_smatch: .FORCE
 	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"

-check_mypy: .FORCE
-	$(PYTHON) "$(BLENDER_DIR)/source/tools/check_source/check_mypy.py"
-
 check_spelling_py: .FORCE
 	cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
@@ -517,13 +508,6 @@ check_descriptions: .FORCE
 source_archive: .FORCE
 	python3 ./build_files/utils/make_source_archive.py

-source_archive_complete: .FORCE
-	cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-		-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
-# This assumes CMake is still using a default `PACKAGE_DIR` variable:
-	python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
-
-
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
@@ -538,9 +522,6 @@ icons_geom: .FORCE
 update: .FORCE
 	$(PYTHON) ./build_files/utils/make_update.py

-update_code: .FORCE
-	$(PYTHON) ./build_files/utils/make_update.py --no-libraries
-
 format: .FORCE
 	PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
 		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -113,7 +113,7 @@ include(cmake/expat.cmake)
 include(cmake/yamlcpp.cmake)
 include(cmake/opencolorio.cmake)

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
  include(cmake/sse2neon.cmake)
 endif()

--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -18,12 +18,6 @@

 set(BOOST_ADDRESS_MODEL 64)

-if(BLENDER_PLATFORM_ARM)
-  set(BOOST_ARCHITECTURE arm)
-else()
-  set(BOOST_ARCHITECTURE x86)
-endif()
-
 if(WIN32)
  set(BOOST_TOOLSET toolset=msvc-14.1)
  set(BOOST_COMPILER_STRING -vc141)
@@ -35,6 +29,7 @@ if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
  endif()
+
 elseif(APPLE)
  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
  set(BOOST_BUILD_COMMAND ./b2)
@@ -98,7 +93,7 @@ ExternalProject_Add(external_boost
  UPDATE_COMMAND  ""
  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
  CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
  BUILD_IN_SOURCE 1
  INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -12,7 +12,7 @@ function(download_source dep)
  if(NOT EXISTS ${TARGET_FILE})
    message("Checking source : ${dep} - source not found downloading from ${TARGET_URI}")
    file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
-         TIMEOUT 1800  # seconds
+         TIMEOUT 60  # seconds
         EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
         TLS_VERIFY ON
         SHOW_PROGRESS
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -47,7 +47,7 @@ else()
  set(EMBREE_BUILD_DIR)
 endif()

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
  ExternalProject_Add(external_embree
    GIT_REPOSITORY ${EMBREE_ARM_GIT}
    GIT_TAG "blender-arm"
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -25,12 +25,19 @@ else()
  set(GMP_OPTIONS --enable-static --disable-shared )
 endif()

-if(APPLE AND NOT BLENDER_PLATFORM_ARM)
-  set(GMP_OPTIONS
-    ${GMP_OPTIONS}
-    --with-pic
-  )
-elseif(UNIX AND NOT APPLE)
+if(APPLE)
+  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+    set(GMP_OPTIONS
+      ${GMP_OPTIONS}
+      --disable-assembly
+    )
+  else()
+    set(GMP_OPTIONS
+      ${GMP_OPTIONS}
+      --with-pic
+    )
+  endif()
+elseif(UNIX)
  set(GMP_OPTIONS
    ${GMP_OPTIONS}
    --with-pic
@@ -38,13 +45,6 @@ elseif(UNIX AND NOT APPLE)
  )
 endif()

-if(BLENDER_PLATFORM_ARM)
-  set(GMP_OPTIONS
-    ${GMP_OPTIONS}
-    --disable-assembly
-  )
-endif()
-
 ExternalProject_Add(external_gmp
  URL file://${PACKAGE_DIR}/${GMP_FILE}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -109,9 +109,9 @@ harvest(llvm/lib llvm/lib "libclang*.a")
 if(APPLE)
  harvest(openmp/lib openmp/lib "*")
  harvest(openmp/include openmp/include "*.h")
-endif()
-if(BLENDER_PLATFORM_ARM)
-  harvest(sse2neon sse2neon "*.h")
+  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+    harvest(sse2neon sse2neon "*.h")
+  endif()
 endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -16,7 +16,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
  set(LLVM_TARGETS AArch64$<SEMICOLON>ARM)
 else()
  set(LLVM_TARGETS X86)
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -36,7 +36,7 @@ set(OPENCOLORIO_EXTRA_ARGS
  -Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
 )

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
  set(OPENCOLORIO_EXTRA_ARGS
    ${OPENCOLORIO_EXTRA_ARGS}
    -DOCIO_USE_SSE=OFF
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -68,6 +68,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
  -DBoost_NO_SYSTEM_PATHS=ON
  -DBoost_NO_BOOST_CMAKE=ON
+  -OIIO_BUILD_CPP11=ON
  -DUSE_LIBSQUISH=OFF
  -DUSE_QT5=OFF
  -DUSE_NUKE=OFF
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -21,8 +21,7 @@ if(WIN32)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
-cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
-set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
+set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")

 if(NOT BUILD_MODE)
  set(BUILD_MODE "Release")
@@ -37,8 +36,14 @@ else(BUILD_MODE STREQUAL "Debug")
 endif()

 set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
-# This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py:
-set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages")
+# look in blenders source folder for packages directory, if that exists
+# it will our package folder, otherwise it will be in the build folder
+if(EXISTS "${CMAKE_SOURCE_DIR}/../../packages")
+  set(PACKAGE_DIR_DEFAULT "${CMAKE_SOURCE_DIR}/../../packages")
+else()
+  set(PACKAGE_DIR_DEFAULT "${CMAKE_CURRENT_BINARY_DIR}/packages")
+endif()
+set(PACKAGE_DIR ${PACKAGE_DIR_DEFAULT} CACHE STRING "Path for downloaded source files")
 option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON)

 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
@@ -137,10 +142,6 @@ else()
    endif()
    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)

-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      set(BLENDER_PLATFORM_ARM ON)
-    endif()
-
    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
@@ -155,10 +156,6 @@ else()
      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
    )
  else()
-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
-      set(BLENDER_PLATFORM_ARM ON)
-    endif()
-
    set(PLATFORM_CFLAGS "-fPIC")
    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
    set(PLATFORM_LDFLAGS)
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -22,8 +22,8 @@ set(PNG_EXTRA_ARGS
  -DPNG_STATIC=ON
 )

-if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR="aarch64")
+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
--- a/build_files/build_environment/cmake/sse2neon.cmake
+++ b/build_files/build_environment/cmake/sse2neon.cmake
@@ -16,13 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-ExternalProject_Add(external_sse2neon
-  GIT_REPOSITORY  ${SSE2NEON_GIT}
-  GIT_TAG ${SSE2NEON_GIT_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/sse2neon
-  CONFIGURE_COMMAND echo sse2neon - Nothing to configure
-  BUILD_COMMAND echo sse2neon - nothing to build
-  INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon && cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
-  INSTALL_DIR ${LIBDIR}/sse2neon
-)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
+  ExternalProject_Add(external_sse2neon
+    GIT_REPOSITORY  ${SSE2NEON_GIT}
+    GIT_TAG ${SSE2NEON_GIT_HASH}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    PREFIX ${BUILD_DIR}/sse2neon
+    CONFIGURE_COMMAND echo sse2neon - Nothing to configure
+    BUILD_COMMAND echo sse2neon - nothing to build
+    INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon && cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
+    INSTALL_DIR ${LIBDIR}/sse2neon
+  )
+endif()
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -22,9 +22,7 @@ set(SSL_PATCH_CMD echo .)
 if(APPLE)
  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
 else()
-  if(BLENDER_PLATFORM_ARM)
-    set(SSL_OS_COMPILER "blender-linux-aarch64")
-  elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
    set(SSL_OS_COMPILER "blender-linux-x86_64")
  else()
--- a/build_files/build_environment/cmake/ssl.conf
+++ b/build_files/build_environment/cmake/ssl.conf
@@ -8,11 +8,6 @@ my %targets = (
    inherit_from     => [ "linux-x86_64" ],
    cflags => add("-fPIC"),
  },
-  "blender-linux-aarch64" => {
-    inherit_from     => [ "linux-aarch64" ],
-    cxxflags => add("-fPIC"),
-    cflags => add("-fPIC"),
-  },
  "blender-darwin-x86_64" => {
    inherit_from     => [ "darwin64-x86_64-cc" ],
    cflags => add("-fPIC"),
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -21,7 +21,6 @@ if(WIN32)
    -DTBB_BUILD_TBBMALLOC=On
    -DTBB_BUILD_TBBMALLOC_PROXY=On
    -DTBB_BUILD_STATIC=Off
-    -DTBB_BUILD_TESTS=Off
  )
  set(TBB_LIBRARY tbb)
  set(TBB_STATIC_LIBRARY Off)
@@ -31,7 +30,6 @@ else()
    -DTBB_BUILD_TBBMALLOC=On
    -DTBB_BUILD_TBBMALLOC_PROXY=Off
    -DTBB_BUILD_STATIC=On
-    -DTBB_BUILD_TESTS=Off
  )
  set(TBB_LIBRARY tbb_static)
  set(TBB_STATIC_LIBRARY On)
@@ -44,7 +42,7 @@ ExternalProject_Add(external_tbb
  URL_HASH ${TBB_HASH_TYPE}=${TBB_HASH}
  PREFIX ${BUILD_DIR}/tbb
  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/build/version_string.ver.in &&
+  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver &&
  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/tbb/src/external_tbb < ${PATCH_DIR}/tbb.diff
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/tbb
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -152,7 +152,7 @@ set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
  # Newer version required by ISPC with arm support.
  set(LLVM_VERSION 11.0.1)
  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
@@ -398,20 +398,11 @@ set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
 set(LZMA_HASH_TYPE SHA256)
 set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)

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

 set(SQLITE_VERSION 3.31.1)
 set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
@@ -462,7 +453,7 @@ set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
 set(XR_OPENXR_SDK_HASH_TYPE MD5)
 set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)

-if(BLENDER_PLATFORM_ARM)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
  # Unreleased version with macOS arm support.
  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -20,16 +20,24 @@ if(WIN32)
  set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
 endif()

-if(BLENDER_PLATFORM_ARM)
-  set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm")
+
+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()
+else()
+  set(X264_CONFIGURE_ENV echo .)
 endif()

-if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE))
+if(UNIX AND NOT APPLE)
  set(X264_CONFIGURE_ENV
    export AS=${LIBDIR}/nasm/bin/nasm
  )
-else()
-  set(X264_CONFIGURE_ENV echo .)
 endif()

 ExternalProject_Add(external_x264
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1797,10 +1797,6 @@ compile_OCIO() {
    cmake_d="$cmake_d -D OCIO_BUILD_PYTHON=OFF"
    cmake_d="$cmake_d -D OCIO_BUILD_GPU_TESTS=OFF"

-    if [ $(uname -m) == "aarch64" ]; then
-      cmake_d="$cmake_d -D OCIO_USE_SSE=OFF"
-    fi
-
    if file /bin/cp | grep -q '32-bit'; then
      cflags="-fPIC -m32 -march=i686"
    else
@@ -2063,10 +2059,7 @@ compile_OIIO() {
    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
    cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
    cmake_d="$cmake_d -D LINKSTATIC=OFF"
-
-    if [ $(uname -m) != "aarch64" ]; then
-      cmake_d="$cmake_d -D USE_SIMD=sse2"
-    fi
+    cmake_d="$cmake_d -D USE_SIMD=sse2"

    cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION"

@@ -2086,7 +2079,7 @@ compile_OIIO() {
    cmake_d="$cmake_d -D USE_OPENCV=OFF"
    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
    cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
-    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
+    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=ON"
    cmake_d="$cmake_d -D TXT2MAN="
    #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
    #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
@@ -2216,15 +2209,10 @@ compile_LLVM() {
    mkdir build
    cd build

-    LLVM_TARGETS="X86"
-    if [ $(uname -m) == "aarch64" ]; then
-      LLVM_TARGETS="AArch64"
-    fi
-
    cmake_d="-D CMAKE_BUILD_TYPE=Release"
    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
    cmake_d="$cmake_d -D LLVM_ENABLE_FFI=ON"
-    cmake_d="$cmake_d -D LLVM_TARGETS_TO_BUILD=$LLVM_TARGETS"
+    cmake_d="$cmake_d -D LLVM_TARGETS_TO_BUILD=X86"
    cmake_d="$cmake_d -D LLVM_ENABLE_TERMINFO=OFF"

    if [ -d $_FFI_INCLUDE_DIR ]; then
@@ -2341,16 +2329,13 @@ compile_OSL() {
    cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
    cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
    cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
+    cmake_d="$cmake_d -D USE_SIMD=sse2"
    cmake_d="$cmake_d -D USE_LLVM_BITCODE=OFF"
    cmake_d="$cmake_d -D USE_PARTIO=OFF"
    cmake_d="$cmake_d -D OSL_BUILD_MATERIALX=OFF"
    cmake_d="$cmake_d -D USE_QT=OFF"
    cmake_d="$cmake_d -D USE_PYTHON=OFF"

-    if [ $(uname -m) != "aarch64" ]; then
-      cmake_d="$cmake_d -D USE_SIMD=sse2"
-    fi
-
    cmake_d="$cmake_d -D CMAKE_CXX_STANDARD=14"

    #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
--- a/build_files/build_environment/patches/cmakelists_tbb.txt
+++ b/build_files/build_environment/patches/cmakelists_tbb.txt
@@ -1,32 +1,5 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-if (POLICY CMP0048)
-  # cmake warns if loaded from a min-3.0-required parent dir, so silence the warning:
-  cmake_policy(SET CMP0048 NEW)
-endif()
-
-project (tbb CXX)
-
-include(CheckCXXCompilerFlag)
-include(CheckCXXSourceRuns)
-
-if(POLICY CMP0058)
-  cmake_policy(SET CMP0058 NEW)
-endif()
-
-if(POLICY CMP0068)
-  cmake_policy(SET CMP0068 NEW)
-endif()
-
-if (POLICY CMP0078)
-  # swig standard target names
-  cmake_policy(SET CMP0078 NEW)
-endif ()
-
-if (POLICY CMP0086)
-  # UseSWIG honors SWIG_MODULE_NAME via -module flag
-  cmake_policy(SET CMP0086 NEW)
-endif ()
+cmake_minimum_required (VERSION 2.8)
+project(tbb CXX)

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

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

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

 if(APPLE)
  set(CMAKE_MACOSX_RPATH ON)
@@ -90,143 +39,66 @@ set(tbbmalloc_proxy_src
  src/tbbmalloc/proxy.cpp
  src/tbbmalloc/tbb_function_replacement.cpp)

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

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

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

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

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

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

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

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

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

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

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

-if (TBB_INSTALL_TARGETS)
-  install(DIRECTORY include/tbb DESTINATION ${TBB_INSTALL_INCLUDE_DIR})
-  if (TBB_BUILD_SHARED)
-    install(EXPORT TBB DESTINATION ${TBB_CMAKE_PACKAGE_INSTALL_DIR} NAMESPACE TBB:: FILE TBBConfig.cmake)
-  endif()
-endif()
-
-# version file
-if (TBB_INSTALL_TARGETS)
-  set (_VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/include/tbb/tbb_stddef.h)
-  file (STRINGS ${_VERSION_FILE} _VERSION_MAJOR_STRING REGEX ".*define[ ]+TBB_VERSION_MAJOR[ ]+[0-9]+.*")
-  file (STRINGS ${_VERSION_FILE} _VERSION_MINOR_STRING REGEX ".*define[ ]+TBB_VERSION_MINOR[ ]+[0-9]+.*")
-  string (REGEX REPLACE ".*TBB_VERSION_MAJOR[ ]+([0-9]+)" "\\1" TBB_MAJOR_VERSION ${_VERSION_MAJOR_STRING})
-  string (REGEX REPLACE ".*TBB_VERSION_MINOR[ ]+([0-9]+)" "\\1" TBB_MINOR_VERSION ${_VERSION_MINOR_STRING})
-  set (TBB_VERSION_STRING "${TBB_MAJOR_VERSION}.${TBB_MINOR_VERSION}")
-  include (CMakePackageConfigHelpers)
-  write_basic_package_version_file (TBBConfigVersion.cmake VERSION "${TBB_VERSION_STRING}" COMPATIBILITY AnyNewerVersion)
-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/TBBConfigVersion.cmake DESTINATION "${TBB_CMAKE_PACKAGE_INSTALL_DIR}")
-endif()
-
-# version_string.ver
-if (UNIX AND NOT TBB_NO_DATE)
-  execute_process (COMMAND date "+%a, %d %b %Y %H:%M:%S %z"
-                   OUTPUT_VARIABLE _configure_date
-                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-elseif (WIN32 AND NOT TBB_NO_DATE)
-  execute_process (COMMAND cmd " /C date /T"
-                   OUTPUT_VARIABLE _configure_date
-                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-else ()
-  set (_configure_date "Unknown")
-endif()
-set (TBB_CONFIG_DATE "${_configure_date}" CACHE STRING "First time that TBB was configured")
-set (_configure_date "${TBB_CONFIG_DATE}")
-include_directories (${CMAKE_BINARY_DIR})
-configure_file (build/version_string.ver.in version_string.ver @ONLY)
-
-if (TBB_BUILD_TESTS)
-  enable_language (C)
-  enable_testing ()
-
-  find_library (LIBRT_LIBRARIES rt)
-  find_library (LIDL_LIBRARIES dl)
-  find_package (Threads)
-  if (NOT APPLE)
-    find_package (OpenMP)
-  endif()
-
-  macro (tbb_add_test testname)
-    set (full_testname tbb_test_${testname})
-    add_executable (${full_testname} src/test/test_${testname}.cpp)
-    target_link_libraries(${full_testname} PRIVATE tbb_interface)
-    if (TBB_BUILD_SHARED)
-      target_link_libraries (${full_testname} PRIVATE tbb tbbmalloc)
-      target_compile_definitions (${full_testname} PRIVATE __TBB_LIB_NAME=tbb)
-    else ()
-      target_link_libraries (${full_testname} PRIVATE tbb_static tbbmalloc_static)
-      target_compile_definitions (${full_testname} PRIVATE __TBB_LIB_NAME=tbb_static)
-    endif ()
-    if (LIBRT_LIBRARIES)
-      target_link_libraries (${full_testname} PRIVATE ${LIBRT_LIBRARIES})
-    endif ()
-    if (LIDL_LIBRARIES)
-      target_link_libraries (${full_testname} PRIVATE ${LIDL_LIBRARIES})
-    endif ()
-    if (Threads_FOUND)
-      target_link_libraries (${full_testname} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-    endif ()
-    if (OPENMP_FOUND AND "${testname}" MATCHES "openmp")
-      set_target_properties (${full_testname} PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
-      set_target_properties (${full_testname} PROPERTIES LINK_FLAGS "${OpenMP_CXX_FLAGS}")
-    endif()
-    if (MINGW)
-      target_link_libraries (${full_testname} PRIVATE psapi)
-    endif ()
-    add_test (NAME ${full_testname} COMMAND ${full_testname})
-  endmacro ()
-
-  tbb_add_test (aggregator)
-  tbb_add_test (aligned_space)
-  tbb_add_test (assembly)
-  if (NOT WIN32)
-    tbb_add_test (async_msg) # msvc64/debug timeouts
-  endif()
-  tbb_add_test (async_node)
-  # tbb_add_test (atomic) # msvc64/debug timeouts: Compile-time initialization fails for static tbb::atomic variables
-  tbb_add_test (blocked_range2d)
-  tbb_add_test (blocked_range3d)
-  tbb_add_test (blocked_range)
-  tbb_add_test (broadcast_node)
-  tbb_add_test (buffer_node)
-  tbb_add_test (cache_aligned_allocator)
-  if (NOT WIN32)
-    tbb_add_test (cache_aligned_allocator_STL)
-  endif()
-  tbb_add_test (cilk_dynamic_load)
-  tbb_add_test (cilk_interop)
-  tbb_add_test (combinable)
-  tbb_add_test (composite_node)
-  tbb_add_test (concurrent_hash_map)
-  tbb_add_test (concurrent_lru_cache)
-  # tbb_add_test (concurrent_monitor) # too long
-  # tbb_add_test (concurrent_priority_queue)
-  if (NOT WIN32)
-    tbb_add_test (concurrent_queue) # msvc64/debug timeouts
-  endif()
-  # tbb_add_test (concurrent_queue_whitebox)
-  tbb_add_test (concurrent_unordered_map)
-  # tbb_add_test (concurrent_unordered_set)
-  tbb_add_test (concurrent_vector)
-  tbb_add_test (continue_node)
-  tbb_add_test (critical_section)
-  tbb_add_test (dynamic_link)
-  # tbb_add_test (eh_algorithms)
-  tbb_add_test (eh_flow_graph)
-  # tbb_add_test (eh_tasks)
-  tbb_add_test (enumerable_thread_specific)
-  tbb_add_test (examples_common_utility)
-  # tbb_add_test (fast_random)
-  tbb_add_test (flow_graph)
-  tbb_add_test (flow_graph_whitebox)
-  # tbb_add_test (fp) # mingw: harness_fp.h:66, assertion !checkConsistency || (ctl.mxcsr & SSE_RND_MODE_MASK) >> 3 == (ctl.x87cw & FE_RND_MODE_MASK): failed
-  # tbb_add_test (function_node) # mingw:random timeout
-  # tbb_add_test (global_control)
-  # tbb_add_test (global_control_whitebox)
-  tbb_add_test (halt)
-  tbb_add_test (handle_perror)
-  # tbb_add_test (hw_concurrency)
-  tbb_add_test (indexer_node)
-  tbb_add_test (inits_loop)
-  tbb_add_test (intrusive_list)
-  tbb_add_test (ittnotify)
-  # tbb_add_test (join_node) #msvc/64: fatal error C1128: number of sections exceeded object file format limit: compile with /bigob
-  tbb_add_test (lambda)
-  tbb_add_test (limiter_node)
-  # tbb_add_test (malloc_atexit)
-  # tbb_add_test (malloc_compliance) #mingw: Limits should be decreased for the test to work
-  tbb_add_test (malloc_init_shutdown)
-  # tbb_add_test (malloc_lib_unload)
-  # tbb_add_test (malloc_overload)
-  tbb_add_test (malloc_pools)
-  tbb_add_test (malloc_regression)
-  # tbb_add_test (malloc_used_by_lib)
-  # tbb_add_test (malloc_whitebox)
-  tbb_add_test (model_plugin)
-  # tbb_add_test (multifunction_node) # too long
-  tbb_add_test (mutex)
-  tbb_add_test (mutex_native_threads)
-  # tbb_add_test (opencl_node)
-  if (OPENMP_FOUND)
-    tbb_add_test (openmp)
-  endif ()
-  tbb_add_test (overwrite_node)
-  # tbb_add_test (parallel_do)
-  # This seems to fail on CI platforms (AppVeyor/Travis), perhaps because the VM exposes just 1 core?
-  tbb_add_test (parallel_for)
-  tbb_add_test (parallel_for_each)
-  tbb_add_test (parallel_for_vectorization)
-  tbb_add_test (parallel_invoke)
-  tbb_add_test (parallel_pipeline)
-  tbb_add_test (parallel_reduce)
-  tbb_add_test (parallel_scan)
-  tbb_add_test (parallel_sort)
-  tbb_add_test (parallel_while)
-  # tbb_add_test (partitioner_whitebox) # too long
-  tbb_add_test (pipeline)
-  # tbb_add_test (pipeline_with_tbf) # takes forever on appveyor
-  tbb_add_test (priority_queue_node)
-  tbb_add_test (queue_node)
-  tbb_add_test (reader_writer_lock)
-  # tbb_add_test (runtime_loader) # LINK : fatal error LNK1104: cannot open file 'tbbproxy.lib' [C:\projects\tbb\test_runtime_loader.vcxproj]
-  tbb_add_test (rwm_upgrade_downgrade)
-  # tbb_add_test (ScalableAllocator)
-  if (NOT WIN32)
-    tbb_add_test (ScalableAllocator_STL)
-  endif()
-  tbb_add_test (semaphore)
-  # tbb_add_test (sequencer_node) # msvc: timeout
-  tbb_add_test (source_node)
-  tbb_add_test (split_node)
-  tbb_add_test (static_assert)
-  tbb_add_test (std_thread)
-  tbb_add_test (tagged_msg)
-  # tbb_add_test (task_arena) # LINK : fatal error LNK1104: cannot open file '__TBB_LIB_NAME.lib' [C:\projects\tbb\test_task_arena.vcxproj]
-  # tbb_add_test (task_assertions)
-  tbb_add_test (task_auto_init)
-  tbb_add_test (task)
-  # tbb_add_test (task_enqueue) # too long
-  tbb_add_test (task_group)
-  # tbb_add_test (task_leaks)
-  # tbb_add_test (task_priority)
-  # tbb_add_test (task_scheduler_init) # msvc: test_task_scheduler_init.cpp:68, assertion !test_mandatory_parallelism || Harness::CanReachConcurrencyLevel(threads): failed
-  tbb_add_test (task_scheduler_observer)
-  tbb_add_test (task_steal_limit)
-  tbb_add_test (tbb_condition_variable)
-  tbb_add_test (tbb_fork)
-  # tbb_add_test (tbb_header)
-  tbb_add_test (tbb_thread)
-  # tbb_add_test (tbb_version)
-  tbb_add_test (tick_count)
-  tbb_add_test (tuple)
-  tbb_add_test (write_once_node)
-  tbb_add_test (yield)
-endif ()
-
-if (TBB_BUILD_PYTHON)
-  find_package(PythonInterp)
-  find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-  find_package(SWIG 3)
-  if (PythonLibs_FOUND AND SWIG_FOUND AND TBB_BUILD_SHARED)
-    include (${SWIG_USE_FILE})
-    set_source_files_properties (python/tbb/api.i PROPERTIES CPLUSPLUS ON)
-    set (CMAKE_SWIG_FLAGS "-threads")
-
-    # swig_add_module is deprecated
-    if (CMAKE_VERSION VERSION_LESS 3.8)
-      swig_add_module (api python python/tbb/api.i)
-    else ()
-      swig_add_library (api LANGUAGE python SOURCES python/tbb/api.i)
-    endif ()
-
-    # UseSWIG generates now standard target names
-    if (CMAKE_VERSION VERSION_LESS 3.13)
-      set (module_target ${SWIG_MODULE_api_REAL_NAME})
-    else ()
-      set (module_target api)
-    endif ()
-
-    target_include_directories(${module_target} PRIVATE ${PYTHON_INCLUDE_DIRS})
-    target_link_libraries(${module_target} PRIVATE tbb)
-    if(WIN32)
-      target_link_libraries(${module_target} ${PYTHON_LIBRARIES})
-    elseif(APPLE)
-      set_target_properties(${module_target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-    endif()
-
-    if (WIN32)
-      set (PYTHON_SITE_PACKAGES Lib/site-packages)
-    else ()
-      set (PYTHON_SITE_PACKAGES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-    endif ()
-    if (TBB_INSTALL_TARGETS)
-      install(FILES python/TBB.py
-              DESTINATION ${PYTHON_SITE_PACKAGES})
-      install(FILES python/tbb/__init__.py python/tbb/pool.py python/tbb/test.py python/tbb/__main__.py ${CMAKE_CURRENT_BINARY_DIR}/api.py
-              DESTINATION ${PYTHON_SITE_PACKAGES}/tbb)
-      install(TARGETS ${module_target}
-              DESTINATION ${PYTHON_SITE_PACKAGES}/tbb)
-    endif()
-
-    if(UNIX AND NOT APPLE)
-      add_library(irml SHARED python/rml/ipc_server.cpp python/rml/ipc_utils.cpp src/tbb/cache_aligned_allocator.cpp src/tbb/dynamic_link.cpp src/tbb/tbb_misc_ex.cpp src/tbb/tbb_misc.cpp)
-      target_compile_definitions(irml PRIVATE DO_ITT_NOTIFY=0 USE_PTHREAD=1)
-      target_link_libraries(irml PRIVATE tbb)
-      set_target_properties(irml PROPERTIES VERSION 1)
-      if (TBB_INSTALL_TARGETS)
-        install(TARGETS irml DESTINATION ${TBB_INSTALL_LIBRARY_DIR})
-      endif()
-    endif ()
-  endif ()
-endif ()
+install(DIRECTORY include/tbb DESTINATION include)
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@ -63,19 +63,3 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt

 set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
 if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 445f6400..3d468de2 100644
--- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
- #endif
-     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
- #if OSL_LLVM_VERSION >= 110
-    OSL_DASSERT(llvm::isa<llvm::Function>(func));
-    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
-+    llvm::Value* r = builder().CreateCall(
-+        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
-+        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
- #else
-     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
- #endif
--- a/build_files/build_environment/patches/tbb.diff
+++ b/build_files/build_environment/patches/tbb.diff
@@ -10,15 +10,4 @@ index 7a8d06a0..886699d8 100644
 +    #if (__cplusplus >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
         #define __TBB_DEPRECATED [[deprecated]]
         #define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
-     #elif _MSC_VER
--- a/src/tbb/tools_api/ittnotify_config.h
-+++ b/src/tbb/tools_api/ittnotify_config.h
-@@ -162,7 +162,7 @@
- #    define ITT_ARCH ITT_ARCH_IA32E
- #  elif defined _M_IA64 || defined __ia64__
- #    define ITT_ARCH ITT_ARCH_IA64
-#  elif defined _M_ARM || defined __arm__
-+#  elif defined _M_ARM || defined __arm__ || defined __aarch64__
- #    define ITT_ARCH ITT_ARCH_ARM
- #  elif defined __powerpc64__
- #    define ITT_ARCH ITT_ARCH_PPC64
+     #elif _MSC_VER
--- a/build_files/build_environment/patches/theora.diff
+++ b/build_files/build_environment/patches/theora.diff
@@ -4,7 +4,7 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-+	| aarch64 \
+    | 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 \
@@ -12,7 +12,7 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-+	| aarch64-* \
+    | 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
@@ -53,147 +53,3 @@ diff -ru USD-20.11/pxr/base/tf/pxrLZ4/lz4.cpp external_usd/pxr/base/tf/pxrLZ4/lz
 
 /*-******************************
 *  Compression functions
-
-From 442d087962f762deeb8b6e49a0955753fcf9aeb9 Mon Sep 17 00:00:00 2001
-From: Tsahi Zidenberg <tsahee@amazon.com>
-Date: Sun, 15 Nov 2020 15:18:24 +0000
-Subject: [PATCH 1/2] stackTrace: support aarch64/linux
-
-stacktrace calls syscall directly via assembler. Create compatible
-aarch64 code.
---
- pxr/base/arch/stackTrace.cpp | 30 ++++++++++++++++++++++++------
- 1 file changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/pxr/base/arch/stackTrace.cpp b/pxr/base/arch/stackTrace.cpp
-index dcc1dfd46..c11aabeb1 100644
--- a/pxr/base/arch/stackTrace.cpp
-+++ b/pxr/base/arch/stackTrace.cpp
-@@ -583,7 +583,6 @@ nonLockingLinux__execve (const char *file,
-                          char *const argv[],
-                          char *const envp[])
- {
-#if defined(ARCH_BITS_64)
-     /*
-      * We make a direct system call here, because we can't find an
-      * execve which corresponds with the non-locking fork we call
-@@ -594,7 +593,27 @@ nonLockingLinux__execve (const char *file,
-      * hangs in a threaded app.  (We use the non-locking fork to get
-      * around problems with forking when we have had memory
-      * corruption.)  whew.
-     *
-+     */
-+
-+    unsigned long result;
-+
-+#if defined (__aarch64__)
-+    {
-+        register long __file_result asm ("x0") = (long)file;
-+        register char* const* __argv asm ("x1") = argv;
-+        register char* const* __envp asm ("x2") = envp;
-+        register long __num_execve asm ("x8") = 221;
-+        __asm__ __volatile__ (
-+            "svc 0"
-+            : "=r" (__file_result)
-+            : "r"(__num_execve), "r" (__file_result), "r" (__argv), "r" (__envp)
-+            : "memory"
-+        );
-+        result = __file_result;
-+    }
-+#elif defined(ARCH_CPU_INTEL) && defined(ARCH_BITS_64)
-+
-+    /*
-      * %rdi, %rsi, %rdx, %rcx, %r8, %r9 are args 0-5
-      * syscall clobbers %rcx and %r11
-      *
-@@ -603,7 +622,6 @@ nonLockingLinux__execve (const char *file,
-      * constraints to gcc.
-      */
- 
-    unsigned long result;
-     __asm__ __volatile__ (
-         "mov    %0, %%rdi    \n\t"
-         "mov    %%rcx, %%rsi \n\t"
-@@ -614,6 +632,9 @@ nonLockingLinux__execve (const char *file,
-         : "0" (file), "c" (argv), "d" (envp)
-         : "memory", "cc", "r11"
-     );
-+#else
-+#error Unknown architecture
-+#endif
- 
-     if (result >= 0xfffffffffffff000) {
-         errno = -result;
-@@ -621,9 +642,6 @@ nonLockingLinux__execve (const char *file,
-     }
- 
-     return result;
-#else
-#error Unknown architecture
-#endif
- }
- 
- #endif
-
-From a1dffe02519bb3c6ccbbe8c6c58304da5db98995 Mon Sep 17 00:00:00 2001
-From: Tsahi Zidenberg <tsahee@amazon.com>
-Date: Sun, 15 Nov 2020 15:22:52 +0000
-Subject: [PATCH 2/2] timing: support aarch64/linux
-
-The aarch64 arch-timer is directly accessible to userspace via two
-registers:
-CNTVCT_EL0 - holds the current counter value
-CNTFRQ_EL0 - holds the counter frequency (in Hz)
---
- pxr/base/arch/timing.cpp | 6 ++++++
- pxr/base/arch/timing.h   | 6 +++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/pxr/base/arch/timing.cpp b/pxr/base/arch/timing.cpp
-index 27ad58fed..9022950c1 100644
--- a/pxr/base/arch/timing.cpp
-+++ b/pxr/base/arch/timing.cpp
-@@ -59,6 +59,11 @@ ARCH_HIDDEN
- void
- Arch_InitTickTimer()
- {
-+#ifdef __aarch64__
-+    uint64_t counter_hz;
-+    __asm __volatile("mrs	%0, CNTFRQ_EL0" : "=&r" (counter_hz));
-+    Arch_NanosecondsPerTick = double(1e9) / double(counter_hz);
-+#else
-     // NOTE: Normally ifstream would be cleaner, but it causes crashes when
-     //       used in conjunction with DSOs and the Intel Compiler.
-     FILE *in;
-@@ -135,6 +140,7 @@ Arch_InitTickTimer()
-     }
- 
-     Arch_NanosecondsPerTick = double(1e9) / double(cpuHz);
-+#endif
- }
- #elif defined(ARCH_OS_WINDOWS)
- 
-diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
-index 67ec0d15f..6dc3e85a0 100644
--- a/pxr/base/arch/timing.h
-+++ b/pxr/base/arch/timing.h
-@@ -36,7 +36,7 @@
- /// \addtogroup group_arch_SystemFunctions
- ///@{
- 
-#if defined(ARCH_OS_LINUX)
-+#if defined(ARCH_OS_LINUX) && defined(ARCH_CPU_INTEL)
- #include <x86intrin.h>
- #elif defined(ARCH_OS_DARWIN)
- #include <mach/mach_time.h>
-@@ -69,6 +69,10 @@ ArchGetTickTime()
- #elif defined(ARCH_CPU_INTEL)
-     // On Intel we'll use the rdtsc instruction.
-     return __rdtsc();
-+#elif defined (__aarch64__)
-+    uint64_t result;
-+    __asm __volatile("mrs	%0, CNTVCT_EL0" : "=&r" (result));
-+    return result;
- #else
- #error Unknown architecture.
- #endif
--- a/build_files/buildbot/buildbot_utils.py
+++ b/build_files/buildbot/buildbot_utils.py
@@ -85,8 +85,8 @@ class VersionInfo:
        version_number = int(self._parse_header_file(blender_h, 'BLENDER_VERSION'))
        version_number_patch = int(self._parse_header_file(blender_h, 'BLENDER_VERSION_PATCH'))
        version_numbers = (version_number // 100, version_number % 100, version_number_patch)
-        self.short_version = "%d.%d" % (version_numbers[0], version_numbers[1])
-        self.version = "%d.%d.%d" % version_numbers
+        self.short_version = "%d.%02d" % (version_numbers[0], version_numbers[1])
+        self.version = "%d.%02d.%d" % version_numbers
        self.version_cycle = self._parse_header_file(blender_h, 'BLENDER_VERSION_CYCLE')
        self.hash = self._parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]

--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -34,7 +34,7 @@ FIND_PATH(EMBREE_INCLUDE_DIR
    include
 )

-IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))))
+IF(NOT (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))
  SET(_embree_SIMD_COMPONENTS
    embree_sse42
    embree_avx
--- a/build_files/cmake/Modules/FindOSL.cmake
+++ b/build_files/cmake/Modules/FindOSL.cmake
@@ -75,7 +75,7 @@ FIND_PATH(OSL_SHADER_DIR
    /usr/share/OSL/
    /usr/include/OSL/
  PATH_SUFFIXES
-    share/OSL/shaders
+    shaders
 )

 # handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -28,14 +28,6 @@ if sys.version_info.major < 3:
          sys.version.partition(" ")[0])
    sys.exit(1)

-import os
-from os.path import (
-    dirname,
-    join,
-    normpath,
-    splitext,
-)
-
 from cmake_consistency_check_config import (
    IGNORE_SOURCE,
    IGNORE_SOURCE_MISSING,
@@ -45,35 +37,32 @@ from cmake_consistency_check_config import (
    BUILD_DIR,
 )

-from typing import (
-    Callable,
-    Dict,
-    Generator,
-    Iterator,
-    List,
-    Optional,
-    Tuple,
-)

+import os
+from os.path import (
+    dirname,
+    join,
+    normpath,
+    splitext,
+)

 global_h = set()
 global_c = set()
-global_refs: Dict[str, List[Tuple[str, int]]] = {}
+global_refs = {}

 # Flatten `IGNORE_SOURCE_MISSING` to avoid nested looping.
-IGNORE_SOURCE_MISSING_FLAT = [
+IGNORE_SOURCE_MISSING = [
    (k, ignore_path) for k, ig_list in IGNORE_SOURCE_MISSING
    for ignore_path in ig_list
 ]

 # Ignore cmake file, path pairs.
-global_ignore_source_missing: Dict[str, List[str]] = {}
-for k, v in IGNORE_SOURCE_MISSING_FLAT:
+global_ignore_source_missing = {}
+for k, v in IGNORE_SOURCE_MISSING:
    global_ignore_source_missing.setdefault(k, []).append(v)
-del IGNORE_SOURCE_MISSING_FLAT


-def replace_line(f: str, i: int, text: str, keep_indent: bool = True) -> None:
+def replace_line(f, i, text, keep_indent=True):
    file_handle = open(f, 'r')
    data = file_handle.readlines()
    file_handle.close()
@@ -88,10 +77,7 @@ def replace_line(f: str, i: int, text: str, keep_indent: bool = True) -> None:
    file_handle.close()


-def source_list(
-        path: str,
-        filename_check: Optional[Callable[[str], bool]] = None,
-) -> Generator[str, None, None]:
+def source_list(path, filename_check=None):
    for dirpath, dirnames, filenames in os.walk(path):
        # skip '.git'
        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
@@ -102,37 +88,37 @@ def source_list(


 # extension checking
-def is_cmake(filename: str) -> bool:
+def is_cmake(filename):
    ext = splitext(filename)[1]
    return (ext == ".cmake") or (filename == "CMakeLists.txt")


-def is_c_header(filename: str) -> bool:
+def is_c_header(filename):
    ext = splitext(filename)[1]
    return (ext in {".h", ".hpp", ".hxx", ".hh"})


-def is_c(filename: str) -> bool:
+def is_c(filename):
    ext = splitext(filename)[1]
    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"})


-def is_c_any(filename: str) -> bool:
+def is_c_any(filename):
    return is_c(filename) or is_c_header(filename)


-def cmake_get_src(f: str) -> None:
+def cmake_get_src(f):

    sources_h = []
    sources_c = []

    filen = open(f, "r", encoding="utf8")
-    it: Optional[Iterator[str]] = iter(filen)
+    it = iter(filen)
    found = False
    i = 0
    # print(f)

-    def is_definition(l: str, f: str, i: int, name: str) -> bool:
+    def is_definition(l, f, i, name):
        if l.startswith("unset("):
            return False

@@ -145,7 +131,6 @@ def cmake_get_src(f: str) -> None:
            if l.endswith(")"):
                raise Exception("strict formatting not kept 'list(APPEND %s...)' on 1 line %s:%d" % (name, f, i))
            return True
-        return False

    while it is not None:
        context_name = ""
@@ -284,7 +269,7 @@ def cmake_get_src(f: str) -> None:
    filen.close()


-def is_ignore_source(f: str, ignore_used: List[bool]) -> bool:
+def is_ignore_source(f, ignore_used):
    for index, ignore_path in enumerate(IGNORE_SOURCE):
        if ignore_path in f:
            ignore_used[index] = True
@@ -292,7 +277,7 @@ def is_ignore_source(f: str, ignore_used: List[bool]) -> bool:
    return False


-def is_ignore_cmake(f: str, ignore_used: List[bool]) -> bool:
+def is_ignore_cmake(f, ignore_used):
    for index, ignore_path in enumerate(IGNORE_CMAKE):
        if ignore_path in f:
            ignore_used[index] = True
@@ -300,7 +285,7 @@ def is_ignore_cmake(f: str, ignore_used: List[bool]) -> bool:
    return False


-def main() -> None:
+def main():

    print("Scanning:", SOURCE_DIR)

@@ -374,7 +359,7 @@ def main() -> None:
                    if "extern" not in f:
                        i = 1
                        try:
-                            for _ in open(f, "r", encoding="utf8"):
+                            for l in open(f, "r", encoding="utf8"):
                                i += 1
                        except UnicodeDecodeError:
                            print("Non utf8: %s:%d" % (f, i))
--- a/build_files/cmake/cmake_static_check_clang_array.py
+++ b/build_files/cmake/cmake_static_check_clang_array.py
@@ -25,14 +25,6 @@ import subprocess
 import sys
 import os

-from typing import (
-    Any,
-    Callable,
-    List,
-    Tuple,
-)
-
-
 USE_QUIET = (os.environ.get("QUIET", None) is not None)

 CHECKER_IGNORE_PREFIX = [
@@ -51,7 +43,7 @@ CHECKER_ARGS = [
 ]


-def main() -> None:
+def main():
    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)

    check_commands = []
@@ -60,19 +52,18 @@ def main() -> None:
        # ~if "source/blender" not in c:
        # ~    continue

-        cmd = (
-            [CHECKER_BIN] +
-            CHECKER_ARGS +
-            [c] +
-            [("-I%s" % i) for i in inc_dirs] +
-            [("-D%s" % d) for d in defs]
-        )
+        cmd = ([CHECKER_BIN] +
+               CHECKER_ARGS +
+               [c] +
+               [("-I%s" % i) for i in inc_dirs] +
+               [("-D%s" % d) for d in defs]
+               )

        check_commands.append((c, cmd))

    process_functions = []

-    def my_process(i: int, c: str, cmd: str) -> subprocess.Popen[Any]:
+    def my_process(i, c, cmd):
        if not USE_QUIET:
            percent = 100.0 * (i / (len(check_commands) - 1))
            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -25,12 +25,6 @@ import subprocess
 import sys
 import os

-from typing import (
-    Any,
-    List,
-)
-
-
 USE_QUIET = (os.environ.get("QUIET", None) is not None)

 CHECKER_IGNORE_PREFIX = [
@@ -53,26 +47,25 @@ if USE_QUIET:
    CHECKER_ARGS.append("--quiet")


-def main() -> None:
+def main():
    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
    source_defines = project_source_info.build_defines_as_args()

    check_commands = []
    for c, inc_dirs, defs in source_info:
-        cmd = (
-            [CHECKER_BIN] +
-            CHECKER_ARGS +
-            [c] +
-            [("-I%s" % i) for i in inc_dirs] +
-            [("-D%s" % d) for d in defs] +
-            source_defines
-        )
+        cmd = ([CHECKER_BIN] +
+               CHECKER_ARGS +
+               [c] +
+               [("-I%s" % i) for i in inc_dirs] +
+               [("-D%s" % d) for d in defs] +
+               source_defines
+               )

        check_commands.append((c, cmd))

    process_functions = []

-    def my_process(i: int, c: str, cmd: List[str]) -> subprocess.Popen[Any]:
+    def my_process(i, c, cmd):
        if not USE_QUIET:
            percent = 100.0 * (i / len(check_commands))
            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
--- a/build_files/cmake/config/blender_developer.cmake
+++ b/build_files/cmake/config/blender_developer.cmake
@@ -9,10 +9,10 @@ set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
 set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
-set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS  OFF CACHE BOOL "" FORCE)
 set(WITH_PYTHON_SAFETY                ON  CACHE BOOL "" FORCE)
+set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 if(WIN32)
  set(WITH_WINDOWS_BUNDLE_CRT         OFF CACHE BOOL "" FORCE)
 endif()
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -37,7 +37,6 @@ set(WITH_LZO                 ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_FLUID           ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_OCEANSIM        ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_REMESH          ON  CACHE BOOL "" FORCE)
-set(WITH_NANOVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
@@ -48,6 +47,8 @@ set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_POTRACE             ON  CACHE BOOL "" FORCE)
 set(WITH_PUGIXML             ON  CACHE BOOL "" FORCE)
+set(WITH_NANOVDB             ON  CACHE BOOL "" FORCE)
+set(WITH_POTRACE             ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
 set(WITH_QUADRIFLOW          ON  CACHE BOOL "" FORCE)
 set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_headless.cmake
+++ b/build_files/cmake/config/blender_headless.cmake
@@ -10,14 +10,14 @@ set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)

 # other features which are not especially useful as a python module
 set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -7,8 +7,8 @@

 set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)

-set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
+set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 set(WITH_BOOST               OFF CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO           OFF CACHE BOOL "" FORCE)
 set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
@@ -18,9 +18,9 @@ set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
-set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       OFF CACHE BOOL "" FORCE)
 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_FREESTYLE           OFF CACHE BOOL "" FORCE)
@@ -44,11 +44,12 @@ set(WITH_LZO                 OFF CACHE BOOL "" FORCE)
 set(WITH_MOD_FLUID           OFF CACHE BOOL "" FORCE)
 set(WITH_MOD_OCEANSIM        OFF CACHE BOOL "" FORCE)
 set(WITH_MOD_REMESH          OFF CACHE BOOL "" FORCE)
-set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
+set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEDENOISE    OFF CACHE BOOL "" FORCE)
+set(WITH_XR_OPENXR           OFF CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENMP              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
@@ -56,12 +57,11 @@ set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_POTRACE             OFF CACHE BOOL "" FORCE)
 set(WITH_PUGIXML             OFF CACHE BOOL "" FORCE)
 set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
+set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_QUADRIFLOW          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_TBB                 OFF CACHE BOOL "" FORCE)
 set(WITH_USD                 OFF CACHE BOOL "" FORCE)
-set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
-set(WITH_XR_OPENXR           OFF CACHE BOOL "" FORCE)

 if(UNIX AND NOT APPLE)
  set(WITH_GHOST_XDND          OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -4,9 +4,9 @@
 #   cmake -C../blender/build_files/cmake/config/blender_release.cmake  ../blender
 #

+set(WITH_AUDASPACE           ON  CACHE BOOL "" FORCE)
 set(WITH_ALEMBIC             ON  CACHE BOOL "" FORCE)
 set(WITH_ASSERT_ABORT        OFF CACHE BOOL "" FORCE)
-set(WITH_AUDASPACE           ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO           ON  CACHE BOOL "" FORCE)
 set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
@@ -21,8 +21,8 @@ set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
 set(WITH_HARU                ON  CACHE BOOL "" FORCE)
-set(WITH_IK_ITASC            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)
 set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
@@ -38,7 +38,6 @@ set(WITH_LZO                 ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_FLUID           ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_OCEANSIM        ON  CACHE BOOL "" FORCE)
 set(WITH_MOD_REMESH          ON  CACHE BOOL "" FORCE)
-set(WITH_NANOVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
@@ -49,6 +48,8 @@ set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_POTRACE             ON  CACHE BOOL "" FORCE)
 set(WITH_PUGIXML             ON  CACHE BOOL "" FORCE)
+set(WITH_NANOVDB             ON  CACHE BOOL "" FORCE)
+set(WITH_POTRACE             ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
 set(WITH_QUADRIFLOW          ON  CACHE BOOL "" FORCE)
 set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -15,24 +15,24 @@ set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)

 # other features which are not especially useful as a python module
-set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
-set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
-set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
+set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
+set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
+set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
+set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
+set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
+set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)

 # Depends on Python install, do this to quiet warning.
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/example_scripts/make_quicky.py
+++ b/build_files/cmake/example_scripts/make_quicky.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+
+# ##### 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 #####
+
+# <pep8 compliant>
+
+
+def print_help(targets):
+    print("CMake quicky wrapper, no valid targets given.")
+    print(" * targets can contain a subset of the full target name.")
+    print(" * arguments with a '-' prefix are passed onto make.")
+    print(" * this must run from the cmake build dir")
+    print(" * alias this with a short command for speedy access, in bash:")
+    print("   alias mk='../blender/build_files/cmake/example_scripts/make_quicky.py'")
+    print("")
+    print(" eg: make_quicky.py -j3 extern python")
+    print(" ...will execute")
+    print(" make -j3 extern_binreloc extern_glew bf_python bf_python_ext blender/fast")
+    print("")
+    print("Target List:")
+    for t in targets:
+        print("    %s" % t)
+    print("...exiting")
+
+
+def main():
+    targets = set()
+
+    # collect targets
+    makefile = open("Makefile", "r")
+    for line in makefile:
+        line = line.rstrip()
+        if not line or line[0] in ". \t@$#":
+            continue
+
+        line = line.split("#", 1)[0]
+        if ":" not in line:
+            continue
+
+        line = line.split(":", 1)[0]
+
+        if "/" in line:  # cmake terget options, dont need these
+            continue
+
+        targets.add(line)
+    makefile.close()
+
+    # remove cmake targets
+    bad = set([
+        "help",
+        "clean",
+        "all",
+        "preinstall",
+        "install",
+        "default_target",
+        "edit_cache",
+        "cmake_force",
+        "rebuild_cache",
+        "depend",
+        "cmake_check_build_system",
+    ])
+
+    targets -= set(bad)
+
+    # parse args
+    targets = list(targets)
+    targets.sort()
+
+    import sys
+    if len(sys.argv) == 1:
+        print_help(targets)
+        return
+
+    targets_new = []
+    args = []
+    for arg in sys.argv[1:]:
+        if arg[0] in "/-":
+            args.append(arg)
+        else:
+            found = False
+            for t in targets:
+                if arg in t and t not in targets_new:
+                    targets_new.append(t)
+                    found = True
+
+            if not found:
+                print("Error '%s' not found in...")
+                for t in targets:
+                    print("    %s" % t)
+                print("...aborting.")
+                return
+
+    # execute
+    cmd = ["make"] + args + targets_new + ["blender/fast"]
+    print("cmake building with targets: %s" % " ".join(targets_new))
+    print("executing: %s" % " ".join(cmd))
+
+    import subprocess
+    subprocess.call(cmd)
+
+
+if __name__ == "__main__":
+    main()
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -20,6 +20,12 @@

 # Libraries configuration for Apple.

+if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+  set(MACOSX_DEPLOYMENT_TARGET 11.00)
+else()
+  set(MACOSX_DEPLOYMENT_TARGET 10.13)
+endif()
+
 macro(find_package_wrapper)
 # do nothing, just satisfy the macro
 endmacro()
@@ -50,7 +56,6 @@ list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
 if(WITH_OPENAL)
  find_package(OpenAL)
  if(NOT OPENAL_FOUND)
-    message(WARNING "OpenAL not found, disabling WITH_OPENAL")
    set(WITH_OPENAL OFF)
  endif()
 endif()
@@ -60,7 +65,6 @@ if(WITH_JACK)
    NAMES jackmp
  )
  if(NOT JACK_FRAMEWORK)
-    message(STATUS "JACK not found, disabling WITH_JACK")
    set(WITH_JACK OFF)
  else()
    set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
@@ -98,7 +102,6 @@ endif()
 if(WITH_USD)
  find_package(USD)
  if(NOT USD_FOUND)
-    message(STATUS "USD not found, disabling WITH_USD")
    set(WITH_USD OFF)
  endif()
 endif()
@@ -143,7 +146,7 @@ if(WITH_PYTHON)

    set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}")
    set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}")
-    set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}")
+    set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}")
    # set(PYTHON_LIBRARY python${PYTHON_VERSION})
    # set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled

@@ -305,7 +308,7 @@ if(WITH_OPENCOLORIO)

  if(NOT OPENCOLORIO_FOUND)
    set(WITH_OPENCOLORIO OFF)
-    message(STATUS "OpenColorIO not found, disabling WITH_OPENCOLORIO")
+    message(STATUS "OpenColorIO not found")
  endif()
 endif()

@@ -354,7 +357,7 @@ if(WITH_CYCLES_OSL)
  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR)
    set(OSL_FOUND TRUE)
  else()
-    message(WARNING "OSL not found, disabling WITH_CYCLES_OSL")
+    message(STATUS "OSL not found")
    set(WITH_CYCLES_OSL OFF)
  endif()
 endif()
@@ -382,7 +385,7 @@ if(WITH_OPENIMAGEDENOISE)

  if(NOT OPENIMAGEDENOISE_FOUND)
    set(WITH_OPENIMAGEDENOISE OFF)
-    message(STATUS "OpenImageDenoise not found, disabling WITH_OPENIMAGEDENOISE")
+    message(STATUS "OpenImageDenoise not found")
  endif()
 endif()

@@ -410,7 +413,7 @@ if(WITH_OPENMP)
    set(OpenMP_LINKER_FLAGS "-L'${LIBDIR}/openmp/lib' -lomp")

    # Copy libomp.dylib to allow executables like datatoc and tests to work.
-    # `@executable_path/../Resources/lib/` `LC_ID_DYLIB` is added by the deps builder.
+    # `@executable_path/../Resources/lib/` is a default dylib search path.
    # For single config generator datatoc, tests etc.
    execute_process(
      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -168,15 +168,21 @@ endif()
 unset(OSX_SDKROOT)


+# 10.13 is our min. target, if you use higher sdk, weak linking happens
 if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  # M1 chips run Big Sur onwards.
  set(OSX_MIN_DEPLOYMENT_TARGET 11.00)
 else()
-  # 10.13 is our min. target, if you use higher sdk, weak linking happens
  set(OSX_MIN_DEPLOYMENT_TARGET 10.13)
 endif()

-set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE)
+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)
+  endif()
+else()
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE)
+endif()

 if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
  # Force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else (CMake bug?)
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -149,6 +149,11 @@ 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")
+endif()
+
 if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
  string(APPEND CMAKE_CXX_FLAGS " ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
@@ -157,21 +162,6 @@ else()
  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
 endif()

-# X64 ASAN is available and usable on MSVC 16.9 preview 4 and up)
-if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
-    #set a flag so we don't have to do this comparison all the time
-    SET(MSVC_ASAN On)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
-    set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /fsanitize=address")
-    string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
-    string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
-  else()
-    message("-- ASAN not supported on MSVC ${CMAKE_CXX_COMPILER_VERSION}")
-  endif()
-endif()
-
-
 # C++ standards conformace (/permissive-) is available on msvc 15.5 (1912) and up
 if(MSVC_VERSION GREATER 1911 AND NOT MSVC_CLANG)
  string(APPEND CMAKE_CXX_FLAGS " /permissive-")
@@ -184,41 +174,14 @@ if(WITH_WINDOWS_SCCACHE AND CMAKE_VS_MSBUILD_COMMAND)
    set(WITH_WINDOWS_SCCACHE Off)
 endif()

-# Debug Symbol format
-# sccache # MSVC_ASAN # format # why
-# On      # On        # Z7     # sccache will only play nice with Z7
-# On      # Off       # Z7     # sccache will only play nice with Z7
-# Off     # On        # Zi     # Asan will not play nice with Edit and Continue
-# Off     # Off       # ZI     # Neither asan nor sscache is enabled Edit and Continue is available
-
-# Release Symbol format
-# sccache # MSVC_ASAN # format # why
-# On      # On        # Z7     # sccache will only play nice with Z7
-# On      # Off       # Z7     # sccache will only play nice with Z7
-# Off     # On        # Zi     # Asan will not play nice with Edit and Continue
-# Off     # Off       # Zi     # Edit and Continue disables some optimizations
-
-
 if(WITH_WINDOWS_SCCACHE)
    set(CMAKE_C_COMPILER_LAUNCHER sccache)
    set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
    set(SYMBOL_FORMAT /Z7)
-    set(SYMBOL_FORMAT_RELEASE /Z7)
 else()
    unset(CMAKE_C_COMPILER_LAUNCHER)
    unset(CMAKE_CXX_COMPILER_LAUNCHER)
-    if(MSVC_ASAN)
-      set(SYMBOL_FORMAT /Z7)
-      set(SYMBOL_FORMAT_RELEASE /Z7)
-    else()
-      set(SYMBOL_FORMAT /ZI)
-      set(SYMBOL_FORMAT_RELEASE /Zi)
-    endif()
-endif()
-
-if(WITH_WINDOWS_PDB)
-	set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
-	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+    set(SYMBOL_FORMAT /ZI)
 endif()

 string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MDd ${SYMBOL_FORMAT}")
@@ -227,11 +190,9 @@ string(APPEND CMAKE_CXX_FLAGS_RELEASE " /MD ${PDB_INFO_OVERRIDE_FLAGS}")
 string(APPEND CMAKE_C_FLAGS_RELEASE " /MD ${PDB_INFO_OVERRIDE_FLAGS}")
 string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL " /MD ${PDB_INFO_OVERRIDE_FLAGS}")
 string(APPEND CMAKE_C_FLAGS_MINSIZEREL " /MD ${PDB_INFO_OVERRIDE_FLAGS}")
-string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /MD ${SYMBOL_FORMAT_RELEASE}")
-string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " /MD ${SYMBOL_FORMAT_RELEASE}")
+string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /MD ${SYMBOL_FORMAT}")
+string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " /MD ${SYMBOL_FORMAT}")
 unset(SYMBOL_FORMAT)
-unset(SYMBOL_FORMAT_RELEASE)
-
 # JMC is available on msvc 15.8 (1915) and up
 if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
  string(APPEND CMAKE_CXX_FLAGS_DEBUG " /JMC")
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -44,15 +44,6 @@ __all__ = (
    "init",
 )

-from typing import (
-    Callable,
-    Generator,
-    List,
-    Optional,
-    Union,
-    Tuple,
-)
-

 import sys
 if sys.version_info.major < 3:
@@ -79,11 +70,10 @@ SOURCE_DIR = abspath(SOURCE_DIR)
 SIMPLE_PROJECTFILE = False

 # must initialize from 'init'
-CMAKE_DIR = ""
-PROJECT_DIR = ""
+CMAKE_DIR = None


-def init(cmake_path: str) -> bool:
+def init(cmake_path):
    global CMAKE_DIR, PROJECT_DIR

    # get cmake path
@@ -101,10 +91,7 @@ def init(cmake_path: str) -> bool:
    return True


-def source_list(
-        path: str,
-        filename_check: Optional[Callable[[str], bool]] = None,
-) -> Generator[str, None, None]:
+def source_list(path, filename_check=None):
    for dirpath, dirnames, filenames in os.walk(path):
        # skip '.git'
        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
@@ -116,57 +103,53 @@ def source_list(


 # extension checking
-def is_cmake(filename: str) -> bool:
+def is_cmake(filename):
    ext = splitext(filename)[1]
    return (ext == ".cmake") or (filename.endswith("CMakeLists.txt"))


-def is_c_header(filename: str) -> bool:
+def is_c_header(filename):
    ext = splitext(filename)[1]
    return (ext in {".h", ".hpp", ".hxx", ".hh"})


-def is_py(filename: str) -> bool:
+def is_py(filename):
    ext = splitext(filename)[1]
    return (ext == ".py")


-def is_glsl(filename: str) -> bool:
+def is_glsl(filename):
    ext = splitext(filename)[1]
    return (ext == ".glsl")


-def is_c(filename: str) -> bool:
+def is_c(filename):
    ext = splitext(filename)[1]
    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})


-def is_c_any(filename: str) -> bool:
+def is_c_any(filename):
    return is_c(filename) or is_c_header(filename)


-def is_svn_file(filename: str) -> bool:
+def is_svn_file(filename):
    dn, fn = os.path.split(filename)
    filename_svn = join(dn, ".svn", "text-base", "%s.svn-base" % fn)
    return exists(filename_svn)


-def is_project_file(filename: str) -> bool:
+def is_project_file(filename):
    return (is_c_any(filename) or is_cmake(filename) or is_glsl(filename))  # and is_svn_file(filename)


-def cmake_advanced_info() -> Union[Tuple[List[str], List[Tuple[str, str]]], Tuple[None, None]]:
+def cmake_advanced_info():
    """ Extract includes and defines from cmake.
    """

    make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
-    if make_exe is None:
-        print("Make command not found in: %r not found" % project_path)
-        return None, None
-
    make_exe_basename = os.path.basename(make_exe)

-    def create_eclipse_project() -> str:
+    def create_eclipse_project():
        print("CMAKE_DIR %r" % CMAKE_DIR)
        if sys.platform == "win32":
            raise Exception("Error: win32 is not supported")
@@ -236,7 +219,7 @@ def cmake_advanced_info() -> Union[Tuple[List[str], List[Tuple[str, str]]], Tupl
    return includes, defines


-def cmake_cache_var(var: str) -> Optional[str]:
+def cmake_cache_var(var):
    with open(os.path.join(CMAKE_DIR, "CMakeCache.txt"), encoding='utf-8') as cache_file:
        lines = [
            l_strip for l in cache_file
@@ -250,12 +233,12 @@ def cmake_cache_var(var: str) -> Optional[str]:
    return None


-def cmake_compiler_defines() -> Optional[List[str]]:
+def cmake_compiler_defines():
    compiler = cmake_cache_var("CMAKE_C_COMPILER")  # could do CXX too

    if compiler is None:
        print("Couldn't find the compiler, os defines will be omitted...")
-        return None
+        return

    import tempfile
    temp_c = tempfile.mkstemp(suffix=".c")[1]
@@ -272,5 +255,5 @@ def cmake_compiler_defines() -> Optional[List[str]]:
    return lines


-def project_name_get() -> Optional[str]:
+def project_name_get():
    return cmake_cache_var("CMAKE_PROJECT_NAME")
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -34,45 +34,30 @@ if sys.version_info.major < 3:
 import os
 from os.path import join, dirname, normpath, abspath

-import subprocess
-
-from typing import (
-    Any,
-    Callable,
-    Generator,
-    List,
-    Optional,
-    Sequence,
-    Tuple,
-    Union,
-    cast,
-)
-
-
 SOURCE_DIR = join(dirname(__file__), "..", "..")
 SOURCE_DIR = normpath(SOURCE_DIR)
 SOURCE_DIR = abspath(SOURCE_DIR)


-def is_c_header(filename: str) -> bool:
+def is_c_header(filename):
    ext = os.path.splitext(filename)[1]
    return (ext in {".h", ".hpp", ".hxx", ".hh"})


-def is_c(filename: str) -> bool:
+def is_c(filename):
    ext = os.path.splitext(filename)[1]
    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})


-def is_c_any(filename: str) -> bool:
-    return is_c(filename) or is_c_header(filename)
+def is_c_any(filename):
+    return os.path.s_c(filename) or is_c_header(filename)


 # copied from project_info.py
 CMAKE_DIR = "."


-def cmake_cache_var_iter() -> Generator[Tuple[str, str, str], None, None]:
+def cmake_cache_var_iter():
    import re
    re_cache = re.compile(r'([A-Za-z0-9_\-]+)?:?([A-Za-z0-9_\-]+)?=(.*)$')
    with open(join(CMAKE_DIR, "CMakeCache.txt"), 'r', encoding='utf-8') as cache_file:
@@ -83,22 +68,14 @@ def cmake_cache_var_iter() -> Generator[Tuple[str, str, str], None, None]:
                yield (var, type_ or "", val)


-def cmake_cache_var(var: str) -> Optional[str]:
+def cmake_cache_var(var):
    for var_iter, type_iter, value_iter in cmake_cache_var_iter():
        if var == var_iter:
            return value_iter
    return None


-def cmake_cache_var_or_exit(var: str) -> str:
-    value = cmake_cache_var(var)
-    if value is None:
-        print("Unable to find %r exiting!" % value)
-        sys.exit(1)
-    return value
-
-
-def do_ignore(filepath: str, ignore_prefix_list: Optional[Sequence[str]]) -> bool:
+def do_ignore(filepath, ignore_prefix_list):
    if ignore_prefix_list is None:
        return False

@@ -106,13 +83,12 @@ def do_ignore(filepath: str, ignore_prefix_list: Optional[Sequence[str]]) -> boo
    return any([relpath.startswith(prefix) for prefix in ignore_prefix_list])


-def makefile_log() -> List[str]:
+def makefile_log():
    import subprocess
    import time

    # support both make and ninja
-    make_exe = cmake_cache_var_or_exit("CMAKE_MAKE_PROGRAM")
-
+    make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
    make_exe_basename = os.path.basename(make_exe)

    if make_exe_basename.startswith(("make", "gmake")):
@@ -126,37 +102,26 @@ def makefile_log() -> List[str]:
                                   stdout=subprocess.PIPE,
                                   )

-    if process is None:
-        print("Can't execute process")
-        sys.exit(1)
-
-
    while process.poll():
        time.sleep(1)

-    # We know this is always true based on the input arguments to `Popen`.
-    stdout: IO[bytes] = process.stdout # type: ignore
-
-    out = stdout.read()
-    stdout.close()
+    out = process.stdout.read()
+    process.stdout.close()
    print("done!", len(out), "bytes")
-    return cast(List[str], out.decode("utf-8", errors="ignore").split("\n"))
+    return out.decode("utf-8", errors="ignore").split("\n")


-def build_info(
-        use_c: bool = True,
-        use_cxx: bool = True,
-        ignore_prefix_list: Optional[List[str]] = None,
-) -> List[Tuple[str, List[str], List[str]]]:
+def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
+
    makelog = makefile_log()

    source = []

    compilers = []
    if use_c:
-        compilers.append(cmake_cache_var_or_exit("CMAKE_C_COMPILER"))
+        compilers.append(cmake_cache_var("CMAKE_C_COMPILER"))
    if use_cxx:
-        compilers.append(cmake_cache_var_or_exit("CMAKE_CXX_COMPILER"))
+        compilers.append(cmake_cache_var("CMAKE_CXX_COMPILER"))

    print("compilers:", " ".join(compilers))

@@ -166,7 +131,7 @@ def build_info(

    for line in makelog:

-        args: Union[str, List[str]] = line.split()
+        args = line.split()

        if not any([(c in args) for c in compilers]):
            continue
@@ -211,40 +176,29 @@ def build_info(
    return source


-def build_defines_as_source() -> str:
+def build_defines_as_source():
    """
    Returns a string formatted as an include:
        '#defines A=B\n#define....'
    """
    import subprocess
    # works for both gcc and clang
-    cmd = (cmake_cache_var_or_exit("CMAKE_C_COMPILER"), "-dM", "-E", "-")
-    process = subprocess.Popen(
-        cmd,
-        stdout=subprocess.PIPE,
-        stdin=subprocess.DEVNULL,
-    )
-
-    # We know this is always true based on the input arguments to `Popen`.
-    stdout: IO[bytes] = process.stdout # type: ignore
-
-    return cast(str, stdout.read().strip().decode('ascii'))
+    cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+    return subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,
+                            stdin=subprocess.DEVNULL,
+                            ).stdout.read().strip().decode('ascii')


-def build_defines_as_args() -> List[str]:
-    return [
-        ("-D" + "=".join(l.split(maxsplit=2)[1:]))
-        for l in build_defines_as_source().split("\n")
-        if l.startswith('#define')
-    ]
+def build_defines_as_args():
+    return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+            for l in build_defines_as_source().split("\n")
+            if l.startswith('#define')]


 # could be moved elsewhere!, this just happens to be used by scripts that also
 # use this module.
-def queue_processes(
-        process_funcs: Sequence[Tuple[Callable[..., subprocess.Popen[Any]], Tuple[Any, ...]]],
-        job_total: int =-1,
-) -> None:
+def queue_processes(process_funcs, job_total=-1):
    """ Takes a list of function arg pairs, each function must return a process
    """

@@ -263,7 +217,7 @@ def queue_processes(
    else:
        import time

-        processes: List[subprocess.Popen[Any]] = []
+        processes = []
        for func, args in process_funcs:
            # wait until a thread is free
            while 1:
@@ -280,7 +234,7 @@ def queue_processes(
            processes.append(func(*args))


-def main() -> None:
+def main():
    if not os.path.exists(join(CMAKE_DIR, "CMakeCache.txt")):
        print("This script must run from the cmake build dir")
        return
--- a/build_files/utils/make_source_archive.py
+++ b/build_files/utils/make_source_archive.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python3

-import argparse
 import dataclasses
 import os
 import re
 import subprocess
 from pathlib import Path
-from typing import Iterable, TextIO, Optional, Any, Union
+from typing import Iterable, TextIO

 # This script can run from any location,
 # output is created in the $CWD
@@ -19,43 +18,21 @@ SKIP_NAMES = {
    ".gitignore",
    ".gitmodules",
    ".arcconfig",
-    ".svn",
 }


 def main() -> None:
+    output_dir = Path(".").absolute()
    blender_srcdir = Path(__file__).absolute().parent.parent.parent
-
-    cli_parser = argparse.ArgumentParser(
-        description=f"Create a tarball of the Blender sources, optionally including sources of dependencies.",
-        epilog="This script is intended to be run by `make source_archive_complete`.",
-    )
-    cli_parser.add_argument(
-        "-p",
-        "--include-packages",
-        type=Path,
-        default=None,
-        metavar="PACKAGE_PATH",
-        help="Include all source files from the given package directory as well.",
-    )
-
-    cli_args = cli_parser.parse_args()
-
    print(f"Source dir: {blender_srcdir}")

-    curdir = blender_srcdir.parent
-    os.chdir(curdir)
-    blender_srcdir = blender_srcdir.relative_to(curdir)
-
-    print(f"Output dir: {curdir}")
-
    version = parse_blender_version(blender_srcdir)
-    tarball = tarball_path(curdir, version, cli_args)
-    manifest = manifest_path(tarball)
-    packages_dir = packages_path(curdir, cli_args)
+    manifest = output_dir / f"blender-{version}-manifest.txt"
+    tarball = output_dir / f"blender-{version}.tar.xz"

-    create_manifest(version, manifest, blender_srcdir, packages_dir)
-    create_tarball(version, tarball, manifest, blender_srcdir, packages_dir)
+    os.chdir(blender_srcdir)
+    create_manifest(version, manifest)
+    create_tarball(version, tarball, manifest)
    create_checksum_file(tarball)
    cleanup(manifest)
    print("Done!")
@@ -107,109 +84,43 @@ def parse_blender_version(blender_srcdir: Path) -> BlenderVersion:
    )


-def tarball_path(output_dir: Path, version: BlenderVersion, cli_args: Any) -> Path:
-    extra = ""
-    if cli_args.include_packages:
-        extra = "-with-libraries"
-
-    return output_dir / f"blender{extra}-{version}.tar.xz"
-
-
-def manifest_path(tarball: Path) -> Path:
-    """Return the manifest path for the given tarball path.
-
-    >>> from pathlib import Path
-    >>> tarball = Path("/home/sybren/workspace/blender-git/blender-test.tar.gz")
-    >>> manifest_path(tarball).as_posix()
-    '/home/sybren/workspace/blender-git/blender-test-manifest.txt'
-    """
-    # ".tar.gz" is seen as two suffixes.
-    without_suffix = tarball.with_suffix("").with_suffix("")
-    name = without_suffix.name
-    return without_suffix.with_name(f"{name}-manifest.txt")
-
-
-def packages_path(current_directory: Path, cli_args: Any) -> Optional[Path]:
-    if not cli_args.include_packages:
-        return None
-
-    abspath = cli_args.include_packages.absolute()
-
-    # os.path.relpath() can return paths like "../../packages", where
-    # Path.relative_to() will not go up directories (so its return value never
-    # has "../" in there).
-    relpath = os.path.relpath(abspath, current_directory)
-
-    return Path(relpath)
-
-
 ### Manifest creation


-def create_manifest(
-    version: BlenderVersion,
-    outpath: Path,
-    blender_srcdir: Path,
-    packages_dir: Optional[Path],
-) -> None:
+def create_manifest(version: BlenderVersion, outpath: Path) -> None:
    print(f'Building manifest of files:  "{outpath}"...', end="", flush=True)
    with outpath.open("w", encoding="utf-8") as outfile:
-        main_files_to_manifest(blender_srcdir, outfile)
-        submodules_to_manifest(blender_srcdir, version, outfile)
-
-        if packages_dir:
-            packages_to_manifest(outfile, packages_dir)
+        main_files_to_manifest(outfile)
+        submodules_to_manifest(version, outfile)
    print("OK")


-def main_files_to_manifest(blender_srcdir: Path, outfile: TextIO) -> None:
-    assert not blender_srcdir.is_absolute()
-    for path in git_ls_files(blender_srcdir):
+def main_files_to_manifest(outfile: TextIO) -> None:
+    for path in git_ls_files():
        print(path, file=outfile)


-def submodules_to_manifest(
-    blender_srcdir: Path, version: BlenderVersion, outfile: TextIO
-) -> None:
+def submodules_to_manifest(version: BlenderVersion, outfile: TextIO) -> None:
    skip_addon_contrib = version.is_release
-    assert not blender_srcdir.is_absolute()

-    for line in git_command("-C", blender_srcdir, "submodule"):
+    for line in git_command("submodule"):
        submodule = line.split()[1]

        # Don't use native slashes as GIT for MS-Windows outputs forward slashes.
        if skip_addon_contrib and submodule == "release/scripts/addons_contrib":
            continue

-        for path in git_ls_files(blender_srcdir / submodule):
+        for path in git_ls_files(Path(submodule)):
            print(path, file=outfile)


-def packages_to_manifest(outfile: TextIO, packages_dir: Path) -> None:
-    for path in packages_dir.glob("*"):
-        if not path.is_file():
-            continue
-        if path.name in SKIP_NAMES:
-            continue
-        print(path, file=outfile)
-
-
-### Higher-level functions
-
-
-def create_tarball(
-    version: BlenderVersion, tarball: Path, manifest: Path, blender_srcdir: Path, packages_dir: Optional[Path]
-) -> None:
+def create_tarball(version: BlenderVersion, tarball: Path, manifest: Path) -> None:
    print(f'Creating archive:            "{tarball}" ...', end="", flush=True)
-    command = ["tar"]
-
    # Requires GNU `tar`, since `--transform` is used.
-    if packages_dir:
-        command += ["--transform", f"s,{packages_dir}/,packages/,g"]
-
-    command += [
+    command = [
+        "tar",
        "--transform",
-        f"s,^{blender_srcdir.name}/,blender-{version}/,g",
+        f"s,^,blender-{version}/,g",
        "--use-compress-program=xz -9",
        "--create",
        f"--file={tarball}",
@@ -219,8 +130,7 @@ def create_tarball(
        "--owner=0",
        "--group=0",
    ]
-
-    subprocess.run(command, check=True, timeout=3600)
+    subprocess.run(command, check=True, timeout=300)
    print("OK")


@@ -264,7 +174,7 @@ def git_ls_files(directory: Path = Path(".")) -> Iterable[Path]:
        yield path


-def git_command(*cli_args: Union[bytes, str, Path] ) -> Iterable[str]:
+def git_command(*cli_args) -> Iterable[str]:
    """Generator, yields lines of output from a Git command."""
    command = ("git", *cli_args)

--- a/build_files/windows/configure_msbuild.cmd
+++ b/build_files/windows/configure_msbuild.cmd
@@ -9,10 +9,14 @@ if "%BUILD_WITH_SCCACHE%"=="1" (

 if "%WITH_CLANG%"=="1" (
 	set CLANG_CMAKE_ARGS=-T"llvm"
-)
-
-if "%WITH_ASAN%"=="1" (
+	if "%WITH_ASAN%"=="1" (
 		set ASAN_CMAKE_ARGS=-DWITH_COMPILER_ASAN=On
+	)
+) else (
+	if "%WITH_ASAN%"=="1" (
+		echo ASAN is only supported with clang.
+		exit /b 1 
+	)
 )

 if "%WITH_PYDEBUG%"=="1" (
--- a/build_files/windows/configure_ninja.cmd
+++ b/build_files/windows/configure_ninja.cmd
@@ -46,10 +46,16 @@ set LLVM_DIR=
 		set CFLAGS=-m64 -fmsc-version=1914
 		set CXXFLAGS=-m64 -fmsc-version=1914
 	)
+	if "%WITH_ASAN%"=="1" (
+		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On
+	)	
 )

 if "%WITH_ASAN%"=="1" (
-	set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On
+	if "%WITH_CLANG%" == "" (
+		echo ASAN is only supported with clang.
+		exit /b 1 
+	)
 )

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

-PROJECT_NUMBER         = "V3.0"
+PROJECT_NUMBER         = "V2.93"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/doc/manpage/blender.1.py
+++ b/doc/manpage/blender.1.py
@@ -22,7 +22,7 @@
 This script generates the blender.1 man page, embedding the help text
 from the Blender executable itself. Invoke it as follows:

-    blender.1.py --blender <path-to-blender> --output <output-filename>
+    blender.1.py <path-to-blender> <output-filename>

 where <path-to-blender> is the path to the Blender executable,
 and <output-filename> is where to write the generated man page.
@@ -30,147 +30,108 @@ and <output-filename> is where to write the generated man page.

 # <pep8 compliant>

-import argparse
 import os
 import subprocess
 import sys
+
 import time

-from typing import (
-    Dict,
-    TextIO,
-)

-
-def man_format(data: str) -> str:
+def man_format(data):
    data = data.replace("-", "\\-")
    data = data.replace("\t", "  ")
    return data


-def blender_extract_info(blender_bin: str) -> Dict[str, str]:
+if len(sys.argv) != 3:
+    import getopt
+    raise getopt.GetoptError("Usage: %s <path-to-blender> <output-filename>" % sys.argv[0])

-    blender_env = {
-        "ASAN_OPTIONS": "exitcode=0:" + os.environ.get("ASAN_OPTIONS", ""),
-    }
+blender_bin = sys.argv[1]
+outfilename = sys.argv[2]

-    blender_help = subprocess.run(
-        [blender_bin, "--help"],
-        env=blender_env,
-        check=True,
-        stdout=subprocess.PIPE,
-    ).stdout.decode(encoding="utf-8")
+cmd = [blender_bin, "--help"]
+print("  executing:", " ".join(cmd))
+ASAN_OPTIONS = "exitcode=0:" + os.environ.get("ASAN_OPTIONS", "")
+blender_help = subprocess.run(
+    cmd, env={"ASAN_OPTIONS": ASAN_OPTIONS}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8")
+blender_version = subprocess.run(
+    [blender_bin, "--version"], env={"ASAN_OPTIONS": ASAN_OPTIONS}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8").strip()
+blender_version, blender_date = (blender_version.split("build") + [None, None])[0:2]
+blender_version = blender_version.rstrip().partition(" ")[2]  # remove 'Blender' prefix.
+if blender_date is None:
+    # Happens when built without WITH_BUILD_INFO e.g.
+    date_string = time.strftime("%B %d, %Y", time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))))
+else:
+    blender_date = blender_date.strip().partition(" ")[2]  # remove 'date:' prefix
+    date_string = time.strftime("%B %d, %Y", time.strptime(blender_date, "%Y-%m-%d"))

-    blender_version_ouput = subprocess.run(
-        [blender_bin, "--version"],
-        env=blender_env,
-        check=True,
-        stdout=subprocess.PIPE,
-    ).stdout.decode(encoding="utf-8")
+outfile = open(outfilename, "w")
+fw = outfile.write

-    # Extract information from the version string.
-    # Note that some internal modules may print errors (e.g. color management),
-    # check for each lines prefix to ensure these aren't included.
-    blender_version = ""
-    blender_date = ""
-    for l in blender_version_ouput.split("\n"):
-        if l.startswith("Blender "):
-            # Remove 'Blender' prefix.
-            blender_version = l.split(" ", 1)[1].strip()
-        elif l.lstrip().startswith("build date:"):
-            # Remove 'build date:' prefix.
-            blender_date = l.split(":", 1)[1].strip()
-        if blender_version and blender_date:
-            break
+fw('.TH "BLENDER" "1" "%s" "Blender %s"\n' % (date_string, blender_version.replace(".", "\\&.")))

-    if not blender_date:
-        # Happens when built without WITH_BUILD_INFO e.g.
-        date_string = time.strftime("%B %d, %Y", time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))))
-    else:
-        date_string = time.strftime("%B %d, %Y", time.strptime(blender_date, "%Y-%m-%d"))
-
-    return {
-        "help": blender_help,
-        "version": blender_version,
-        "date": date_string,
-    }
-
-
-def man_page_from_blender_help(fh: TextIO, blender_bin: str) -> None:
-    blender_info = blender_extract_info(blender_bin)
-
-    # Header Content.
-    fh.write(
-        '.TH "BLENDER" "1" "%s" "Blender %s"\n' %
-        (blender_info["date"], blender_info["version"].replace(".", "\\&."))
-    )
-
-    fh.write(r'''
+fw('''
 .SH NAME
 blender \- a full-featured 3D application''')

-    fh.write(r'''
+fw('''
 .SH SYNOPSIS
 .B blender [args ...] [file] [args ...]''')

-    fh.write(r'''
+fw('''
 .br
 .SH DESCRIPTION
 .PP
 .B blender
-is a full-featured 3D application. It supports the entirety of the 3D pipeline - '''
-'''modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
+is a full-featured 3D application. It supports the entirety of the 3D pipeline - modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.

-Use Blender to create 3D images and animations, films and commercials, content for games, '''
-r'''architectural and industrial visualizatons, and scientific visualizations.
+Use Blender to create 3D images and animations, films and commercials, content for games, architectural and industrial visualizatons, and scientific visualizations.

 https://www.blender.org''')

-    fh.write(r'''
+fw('''
 .SH OPTIONS''')

-    fh.write("\n\n")
+fw("\n\n")

-    # Body Content.
+lines = [line.rstrip() for line in blender_help.split("\n")]

-    lines = [line.rstrip() for line in blender_info["help"].split("\n")]
+while lines:
+    l = lines.pop(0)
+    if l.startswith("Environment Variables:"):
+        fw('.SH "ENVIRONMENT VARIABLES"\n')
+    elif l.endswith(":"):  # one line
+        fw('.SS "%s"\n\n' % l)
+    elif l.startswith("-") or l.startswith("/"):  # can be multi line

-    while lines:
-        l = lines.pop(0)
-        if l.startswith("Environment Variables:"):
-            fh.write('.SH "ENVIRONMENT VARIABLES"\n')
-        elif l.endswith(":"):  # One line.
-            fh.write('.SS "%s"\n\n' % l)
-        elif l.startswith("-") or l.startswith("/"):  # Can be multi line.
-            fh.write('.TP\n')
-            fh.write('.B %s\n' % man_format(l))
+        fw('.TP\n')
+        fw('.B %s\n' % man_format(l))

-            while lines:
-                # line with no
-                if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]):  # No white space.
-                    break
+        while lines:
+            # line with no
+            if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]):  # no white space
+                break

-                if not l:  # Second blank line.
-                    fh.write('.IP\n')
-                else:
-                    fh.write('.br\n')
-
-                l = lines.pop(0)
-                if l:
-                    assert(l.startswith('\t'))
-                    l = l[1:]  # Remove first white-space (tab).
-
-                fh.write('%s\n' % man_format(l))
-
-        else:
-            if not l.strip():
-                fh.write('.br\n')
+            if not l:  # second blank line
+                fw('.IP\n')
            else:
-                fh.write('%s\n' % man_format(l))
+                fw('.br\n')

-    # Footer Content.
+            l = lines.pop(0)
+            l = l[1:]  # remove first whitespace (tab)

-    fh.write(r'''
+            fw('%s\n' % man_format(l))
+
+    else:
+        if not l.strip():
+            fw('.br\n')
+        else:
+            fw('%s\n' % man_format(l))
+
+# footer
+
+fw('''
 .br
 .SH SEE ALSO
 .B luxrender(1)
@@ -182,33 +143,5 @@ This manpage was written for a Debian GNU/Linux system by Daniel Mester
 <cyril.brulebois@enst-bretagne.fr> and Dan Eicher <dan@trollwerks.org>.
 ''')

-
-def create_argparse() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--output",
-        required=True,
-        help="The man page to write to."
-    )
-    parser.add_argument(
-        "--blender",
-        required=True,
-        help="Path to the blender binary."
-    )
-
-    return parser
-
-
-def main() -> None:
-    parser = create_argparse()
-    args = parser.parse_args()
-
-    blender_bin = args.blender
-    output_filename = args.output
-
-    with open(output_filename, "w", encoding="utf-8") as fh:
-        man_page_from_blender_help(fh, blender_bin)
-
-
-if __name__ == "__main__":
-    main()
+outfile.close()
+print("written:", outfilename)
--- a/doc/python_api/examples/bpy.types.Depsgraph.7.py
+++ b/doc/python_api/examples/bpy.types.Depsgraph.7.py
@@ -61,3 +61,4 @@ def unregister():

 if __name__ == "__main__":
    register()
+
--- a/doc/python_api/examples/bpy.types.RenderEngine.py
+++ b/doc/python_api/examples/bpy.types.RenderEngine.py
@@ -4,9 +4,7 @@ Simple Render Engine
 """

 import bpy
-import array
-import gpu
-from gpu_extras.presets import draw_texture_2d
+import bgl


 class CustomRenderEngine(bpy.types.RenderEngine):
@@ -102,7 +100,8 @@ class CustomRenderEngine(bpy.types.RenderEngine):
        dimensions = region.width, region.height

        # Bind shader that converts from scene linear to display space,
-        gpu.state.blend_set('ALPHA_PREMULT')
+        bgl.glEnable(bgl.GL_BLEND)
+        bgl.glBlendFunc(bgl.GL_ONE, bgl.GL_ONE_MINUS_SRC_ALPHA)
        self.bind_display_space_shader(scene)

        if not self.draw_data or self.draw_data.dimensions != dimensions:
@@ -111,7 +110,7 @@ class CustomRenderEngine(bpy.types.RenderEngine):
        self.draw_data.draw()

        self.unbind_display_space_shader()
-        gpu.state.blend_set('NONE')
+        bgl.glDisable(bgl.GL_BLEND)


 class CustomDrawData:
@@ -120,21 +119,68 @@ class CustomDrawData:
        self.dimensions = dimensions
        width, height = dimensions

-        pixels = width * height * array.array('f', [0.1, 0.2, 0.1, 1.0])
-        pixels = gpu.types.Buffer('FLOAT', width * height * 4, pixels)
+        pixels = [0.1, 0.2, 0.1, 1.0] * width * height
+        pixels = bgl.Buffer(bgl.GL_FLOAT, width * height * 4, pixels)

        # Generate texture
-        self.texture = gpu.types.GPUTexture((width, height), format='RGBA16F', data=pixels)
+        self.texture = bgl.Buffer(bgl.GL_INT, 1)
+        bgl.glGenTextures(1, self.texture)
+        bgl.glActiveTexture(bgl.GL_TEXTURE0)
+        bgl.glBindTexture(bgl.GL_TEXTURE_2D, self.texture[0])
+        bgl.glTexImage2D(bgl.GL_TEXTURE_2D, 0, bgl.GL_RGBA16F, width, height, 0, bgl.GL_RGBA, bgl.GL_FLOAT, pixels)
+        bgl.glTexParameteri(bgl.GL_TEXTURE_2D, bgl.GL_TEXTURE_MIN_FILTER, bgl.GL_LINEAR)
+        bgl.glTexParameteri(bgl.GL_TEXTURE_2D, bgl.GL_TEXTURE_MAG_FILTER, bgl.GL_LINEAR)
+        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)

-        # Note: This is just a didactic example.
-        # In this case it would be more convenient to fill the texture with:
-        # self.texture.clear('FLOAT', value=[0.1, 0.2, 0.1, 1.0])
+        # Bind shader that converts from scene linear to display space,
+        # use the scene's color management settings.
+        shader_program = bgl.Buffer(bgl.GL_INT, 1)
+        bgl.glGetIntegerv(bgl.GL_CURRENT_PROGRAM, shader_program)
+
+        # Generate vertex array
+        self.vertex_array = bgl.Buffer(bgl.GL_INT, 1)
+        bgl.glGenVertexArrays(1, self.vertex_array)
+        bgl.glBindVertexArray(self.vertex_array[0])
+
+        texturecoord_location = bgl.glGetAttribLocation(shader_program[0], "texCoord")
+        position_location = bgl.glGetAttribLocation(shader_program[0], "pos")
+
+        bgl.glEnableVertexAttribArray(texturecoord_location)
+        bgl.glEnableVertexAttribArray(position_location)
+
+        # Generate geometry buffers for drawing textured quad
+        position = [0.0, 0.0, width, 0.0, width, height, 0.0, height]
+        position = bgl.Buffer(bgl.GL_FLOAT, len(position), position)
+        texcoord = [0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]
+        texcoord = bgl.Buffer(bgl.GL_FLOAT, len(texcoord), texcoord)
+
+        self.vertex_buffer = bgl.Buffer(bgl.GL_INT, 2)
+
+        bgl.glGenBuffers(2, self.vertex_buffer)
+        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, self.vertex_buffer[0])
+        bgl.glBufferData(bgl.GL_ARRAY_BUFFER, 32, position, bgl.GL_STATIC_DRAW)
+        bgl.glVertexAttribPointer(position_location, 2, bgl.GL_FLOAT, bgl.GL_FALSE, 0, None)
+
+        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, self.vertex_buffer[1])
+        bgl.glBufferData(bgl.GL_ARRAY_BUFFER, 32, texcoord, bgl.GL_STATIC_DRAW)
+        bgl.glVertexAttribPointer(texturecoord_location, 2, bgl.GL_FLOAT, bgl.GL_FALSE, 0, None)
+
+        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, 0)
+        bgl.glBindVertexArray(0)

    def __del__(self):
-        del self.texture
+        bgl.glDeleteBuffers(2, self.vertex_buffer)
+        bgl.glDeleteVertexArrays(1, self.vertex_array)
+        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)
+        bgl.glDeleteTextures(1, self.texture)

    def draw(self):
-        draw_texture_2d(self.texture, (0, 0), self.texture.width, self.texture.height)
+        bgl.glActiveTexture(bgl.GL_TEXTURE0)
+        bgl.glBindTexture(bgl.GL_TEXTURE_2D, self.texture[0])
+        bgl.glBindVertexArray(self.vertex_array[0])
+        bgl.glDrawArrays(bgl.GL_TRIANGLE_FAN, 0, 4)
+        bgl.glBindVertexArray(0)
+        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)


 # RenderEngines also need to tell UI Panels that they are compatible with.
--- a/doc/python_api/examples/gpu.4.py
+++ b/doc/python_api/examples/gpu.4.py
@@ -4,6 +4,7 @@ Mesh with Random Vertex Colors
 """
 import bpy
 import gpu
+import bgl
 import numpy as np
 from random import random
 from gpu_extras.batch import batch_for_shader
@@ -30,10 +31,9 @@ batch = batch_for_shader(


 def draw():
-    gpu.state.depth_test_set('LESS_EQUAL')
-    gpu.state.depth_mask_set(True)
+    bgl.glEnable(bgl.GL_DEPTH_TEST)
    batch.draw(shader)
-    gpu.state.depth_mask_set(False)
+    bgl.glDisable(bgl.GL_DEPTH_TEST)


 bpy.types.SpaceView3D.draw_handler_add(draw, (), 'WINDOW', 'POST_VIEW')
--- a/doc/python_api/examples/gpu.6.py
+++ b/doc/python_api/examples/gpu.6.py
@@ -6,11 +6,11 @@ To use this example you have to provide an image that should be displayed.
 """
 import bpy
 import gpu
+import bgl
 from gpu_extras.batch import batch_for_shader

 IMAGE_NAME = "Untitled"
 image = bpy.data.images[IMAGE_NAME]
-texture = gpu.texture.from_image(image)

 shader = gpu.shader.from_builtin('2D_IMAGE')
 batch = batch_for_shader(
@@ -21,9 +21,16 @@ batch = batch_for_shader(
    },
 )

+if image.gl_load():
+    raise Exception()
+
+
 def draw():
+    bgl.glActiveTexture(bgl.GL_TEXTURE0)
+    bgl.glBindTexture(bgl.GL_TEXTURE_2D, image.bindcode)
+
    shader.bind()
-    shader.uniform_sampler("image", texture)
+    shader.uniform_int("image", 0)
    batch.draw(shader)


--- a/doc/python_api/examples/gpu.7.py
+++ b/doc/python_api/examples/gpu.7.py
@@ -9,6 +9,7 @@ Generate a texture using Offscreen Rendering
 """
 import bpy
 import gpu
+import bgl
 from mathutils import Matrix
 from gpu_extras.batch import batch_for_shader
 from gpu_extras.presets import draw_circle_2d
@@ -19,8 +20,8 @@ from gpu_extras.presets import draw_circle_2d
 offscreen = gpu.types.GPUOffScreen(512, 512)

 with offscreen.bind():
-    fb = gpu.state.active_framebuffer_get()
-    fb.clear(color=(0.0, 0.0, 0.0, 0.0))
+    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]
        gpu.matrix.load_matrix(Matrix.Identity(4))
@@ -74,10 +75,13 @@ batch = batch_for_shader(


 def draw():
+    bgl.glActiveTexture(bgl.GL_TEXTURE0)
+    bgl.glBindTexture(bgl.GL_TEXTURE_2D, offscreen.color_texture)
+
    shader.bind()
    shader.uniform_float("modelMatrix", Matrix.Translation((1, 2, 3)) @ Matrix.Scale(3, 4))
    shader.uniform_float("viewProjectionMatrix", bpy.context.region_data.perspective_matrix)
-    shader.uniform_sampler("image", offscreen.texture_color)
+    shader.uniform_float("image", 0)
    batch.draw(shader)


--- a/doc/python_api/examples/gpu.8.py
+++ b/doc/python_api/examples/gpu.8.py
@@ -7,10 +7,11 @@ If it already exists, it will override the existing one.

 Currently almost all of the execution time is spent in the last line.
 In the future this will hopefully be solved by implementing the Python buffer protocol
-for :class:`gpu.types.Buffer` and :class:`bpy.types.Image.pixels` (aka ``bpy_prop_array``).
+for :class:`bgl.Buffer` and :class:`bpy.types.Image.pixels` (aka ``bpy_prop_array``).
 """
 import bpy
 import gpu
+import bgl
 import random
 from mathutils import Matrix
 from gpu_extras.presets import draw_circle_2d
@@ -24,8 +25,8 @@ RING_AMOUNT = 10
 offscreen = gpu.types.GPUOffScreen(WIDTH, HEIGHT)

 with offscreen.bind():
-    fb = gpu.state.active_framebuffer_get()
-    fb.clear(color=(0.0, 0.0, 0.0, 0.0))
+    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]
        gpu.matrix.load_matrix(Matrix.Identity(4))
@@ -36,7 +37,9 @@ with offscreen.bind():
                (random.uniform(-1, 1), random.uniform(-1, 1)),
                (1, 1, 1, 1), random.uniform(0.1, 1), 20)

-    buffer = fb.read_color(0, 0, WIDTH, HEIGHT, 4, 0, 'UBYTE')
+    buffer = bgl.Buffer(bgl.GL_BYTE, WIDTH * HEIGHT * 4)
+    bgl.glReadBuffer(bgl.GL_BACK)
+    bgl.glReadPixels(0, 0, WIDTH, HEIGHT, bgl.GL_RGBA, bgl.GL_UNSIGNED_BYTE, buffer)

 offscreen.free()

@@ -45,6 +48,4 @@ if not IMAGE_NAME in bpy.data.images:
    bpy.data.images.new(IMAGE_NAME, WIDTH, HEIGHT)
 image = bpy.data.images[IMAGE_NAME]
 image.scale(WIDTH, HEIGHT)
-
-buffer.dimensions = WIDTH * HEIGHT * 4
 image.pixels = [v / 255 for v in buffer]
--- a/doc/python_api/examples/gpu.9.py
+++ b/doc/python_api/examples/gpu.9.py
@@ -7,6 +7,7 @@ You could also make this independent of a specific camera,
 but Blender does not expose good functions to create view and projection matrices yet.
 """
 import bpy
+import bgl
 import gpu
 from gpu_extras.presets import draw_texture_2d

@@ -33,8 +34,8 @@ def draw():
        view_matrix,
        projection_matrix)

-    gpu.state.depth_mask_set(False)
-    draw_texture_2d(offscreen.texture_color, (10, 10), WIDTH, HEIGHT)
+    bgl.glDisable(bgl.GL_DEPTH_TEST)
+    draw_texture_2d(offscreen.color_texture, (10, 10), WIDTH, HEIGHT)


 bpy.types.SpaceView3D.draw_handler_add(draw, (), 'WINDOW', 'POST_PIXEL')
--- a/doc/python_api/examples/mathutils.Matrix.LocRotScale.py
+++ b/doc/python_api/examples/mathutils.Matrix.LocRotScale.py
@@ -1,5 +0,0 @@
-# Compute local object transformation matrix:
-if obj.rotation_mode == 'QUATERNION':
-    matrix = mathutils.Matrix.LocRotScale(obj.location, obj.rotation_quaternion, obj.scale)
-else:
-    matrix = mathutils.Matrix.LocRotScale(obj.location, obj.rotation_euler, obj.scale)
--- a/doc/python_api/examples/mathutils.Matrix.py
+++ b/doc/python_api/examples/mathutils.Matrix.py
@@ -14,14 +14,10 @@ mat_rot = mathutils.Matrix.Rotation(math.radians(45.0), 4, 'X')
 mat_out = mat_loc @ mat_rot @ mat_sca
 print(mat_out)

-# extract components back out of the matrix as two vectors and a quaternion
+# extract components back out of the matrix
 loc, rot, sca = mat_out.decompose()
 print(loc, rot, sca)

-# recombine extracted components
-mat_out2 = mathutils.Matrix.LocRotScale(loc, rot, sca)
-print(mat_out2)
-
 # it can also be useful to access components of a matrix directly
 mat = mathutils.Matrix()
 mat[0][0], mat[1][0], mat[2][0] = 0.0, 1.0, 2.0
--- a/doc/python_api/requirements.txt
+++ b/doc/python_api/requirements.txt
@@ -1,2 +1,2 @@
-Sphinx==3.5.3
-sphinx_rtd_theme==0.5.2
+Sphinx==3.5.1
+sphinx_rtd_theme==0.5.1
--- a/doc/python_api/rst/info_gotcha.rst
+++ b/doc/python_api/rst/info_gotcha.rst
@@ -50,8 +50,7 @@ you should be able to find the poll function with no knowledge of C.

   Blender does have the functionality for poll functions to describe why they fail,
   but its currently not used much, if you're interested to help improve the API
-   feel free to add calls to :class:`bpy.types.Operator.poll_message_set` (``CTX_wm_operator_poll_msg_set`` in C)
-   where its not obvious why poll fails, e.g:
+   feel free to add calls to ``CTX_wm_operator_poll_msg_set`` where its not obvious why poll fails, e.g:

      >>> bpy.ops.gpencil.draw()
      RuntimeError: Operator bpy.ops.gpencil.draw.poll() Failed to find Grease Pencil data to draw into
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -545,13 +545,6 @@ def range_str(val):


 def example_extract_docstring(filepath):
-    '''
-    Return (text, line_no, line_no_has_content) where:
-    - ``text`` is the doc-string text.
-    - ``line_no`` is the line the doc-string text ends.
-    - ``line_no_has_content`` when False, this file only contains a doc-string.
-      There is no need to include the remainder.
-    '''
    file = open(filepath, "r", encoding="utf-8")
    line = file.readline()
    line_no = 0
@@ -560,7 +553,7 @@ def example_extract_docstring(filepath):
        line_no += 1
    else:
        file.close()
-        return "", 0, True
+        return "", 0

    for line in file:
        line_no += 1
@@ -570,17 +563,15 @@ def example_extract_docstring(filepath):
            text.append(line.rstrip())

    line_no += 1
-    line_no_has_content = False

    # Skip over blank lines so the Python code doesn't have blank lines at the top.
    for line in file:
        if line.strip():
-            line_no_has_content = True
            break
        line_no += 1

    file.close()
-    return "\n".join(text), line_no, line_no_has_content
+    return "\n".join(text), line_no


 def title_string(text, heading_char, double=False):
@@ -599,18 +590,16 @@ def write_example_ref(ident, fw, example_id, ext="py"):
        filepath = os.path.join("..", "examples", "%s.%s" % (example_id, ext))
        filepath_full = os.path.join(os.path.dirname(fw.__self__.name), filepath)

-        text, line_no, line_no_has_content = example_extract_docstring(filepath_full)
+        text, line_no = example_extract_docstring(filepath_full)

        for line in text.split("\n"):
            fw("%s\n" % (ident + line).rstrip())
        fw("\n")

-        # Some files only contain a doc-string.
-        if line_no_has_content:
-            fw("%s.. literalinclude:: %s\n" % (ident, filepath))
-            if line_no > 0:
-                fw("%s   :lines: %d-\n" % (ident, line_no))
-            fw("\n")
+        fw("%s.. literalinclude:: %s\n" % (ident, filepath))
+        if line_no > 0:
+            fw("%s   :lines: %d-\n" % (ident, line_no))
+        fw("\n")
        EXAMPLE_SET_USED.add(example_id)
    else:
        if bpy.app.debug:
@@ -1036,6 +1025,7 @@ def pymodule2sphinx(basepath, module_name, module, title, module_all_extra):
 context_type_map = {
    # context_member: (RNA type, is_collection)
    "active_annotation_layer": ("GPencilLayer", False),
+    "active_base": ("ObjectBase", False),
    "active_bone": ("EditBone", False),
    "active_gpencil_frame": ("GreasePencilLayer", True),
    "active_gpencil_layer": ("GPencilLayer", True),
@@ -1418,8 +1408,7 @@ def pyrna2sphinx(basepath):
            else:
                fw("   .. attribute:: %s\n\n" % prop.identifier)
            if prop.description:
-                write_indented_lines("      ", fw, prop.description, False)
-                fw("\n")
+                fw("      %s\n\n" % prop.description)

            # special exception, can't use generic code here for enums
            if prop.type == "enum":
@@ -1555,8 +1544,8 @@ def pyrna2sphinx(basepath):
            fw(".. hlist::\n")
            fw("   :columns: 2\n\n")

-            # Context does its own thing.
-            # "active_object": ("Object", False),
+            # context does its own thing
+            # "active_base": ("ObjectBase", False),
            for ref_attr, (ref_type, ref_is_seq) in sorted(context_type_map.items()):
                if ref_type == struct_id:
                    fw("   * :mod:`bpy.context.%s`\n" % ref_attr)
--- a/doc/python_api/static/css/theme_overrides.css
+++ b/doc/python_api/static/css/theme_overrides.css
@@ -1,8 +1,7 @@
 /* T76453: Prevent Long enum lists */
-.field-list > dd p {
+.field-list li {
   max-height: 245px;
   overflow-y: auto !important;
-   word-break: break-word;
 }

 /* Hide home icon in search area */
@@ -12,15 +11,3 @@
 .wy-nav-content {
    max-width: 1000px !important;
 }
-
-/* Fix long titles on mobile */
-h1, h2, h3, h4, h5, h6 {word-break: break-all}
-
-/* Temp fix for https://github.com/readthedocs/sphinx_rtd_theme/pull/1109 */
-.hlist tr {
-   display: -ms-flexbox;
-   display: flex;
-   flex-flow: row wrap;
- }
-
-.hlist td {margin-right: auto}
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -109,7 +109,3 @@ endif()
 if(WITH_MOD_FLUID)
  add_subdirectory(mantaflow)
 endif()
-
-if (WITH_COMPOSITOR)
-	add_subdirectory(smaa_areatex)
-endif()
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -42,7 +42,6 @@ set(SRC
 	src/devices/NULLDevice.cpp
 	src/devices/ReadDevice.cpp
 	src/devices/SoftwareDevice.cpp
-	src/devices/ThreadedDevice.cpp
 	src/Exception.cpp
 	src/file/File.cpp
 	src/file/FileManager.cpp
@@ -149,7 +148,6 @@ set(PUBLIC_HDR
 	include/devices/NULLDevice.h
 	include/devices/ReadDevice.h
 	include/devices/SoftwareDevice.h
-	include/devices/ThreadedDevice.h
 	include/Exception.h
 	include/file/File.h
 	include/file/FileManager.h
--- a/extern/audaspace/include/devices/SoftwareDevice.h
+++ b/extern/audaspace/include/devices/SoftwareDevice.h
@@ -255,7 +255,6 @@ protected:
 	/**
 	 * This function tells the device, to start or pause playback.
 	 * \param playing True if device should playback.
-	 * \note This method is only called when the device is locked.
 	 */
 	virtual void playing(bool playing)=0;

--- a/extern/audaspace/include/devices/ThreadedDevice.h
+++ b/extern/audaspace/include/devices/ThreadedDevice.h
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-/**
- * @file ThreadedDevice.h
- * @ingroup plugin
- * The ThreadedDevice class.
- */
-
-#include "devices/SoftwareDevice.h"
-
-#include <thread>
-
-AUD_NAMESPACE_BEGIN
-
-/**
- * This device extends the SoftwareDevice with code for running mixing in a separate thread.
- */
-class AUD_PLUGIN_API ThreadedDevice : public SoftwareDevice
-{
-private:
-	/**
-	 * Whether there is currently playback.
-	 */
-	bool m_playing;
-
-	/**
-	 * Whether the current playback should stop.
-	 */
-	bool m_stop;
-
-	/**
-	 * The streaming thread.
-	 */
-	std::thread m_thread;
-
-	/**
-	 * Starts the streaming thread.
-	 */
-	AUD_LOCAL void start();
-
-	/**
-	 * Streaming thread main function.
-	 */
-	AUD_LOCAL virtual void runMixingThread()=0;
-
-	// delete copy constructor and operator=
-	ThreadedDevice(const ThreadedDevice&) = delete;
-	ThreadedDevice& operator=(const ThreadedDevice&) = delete;
-
-protected:
-	virtual void playing(bool playing);
-
-	/**
-	 * Empty default constructor. To setup the device call the function create()
-	 * and to uninitialize call destroy().
-	 */
-	ThreadedDevice();
-
-	/**
-	 * Indicates that the mixing thread should be stopped.
-	 * \return Whether the mixing thread should be stopping.
-	 * \warning For thread safety, the device needs to be locked, when this method is called.
-	 */
-	inline bool shouldStop() { return m_stop; }
-
-	/**
-	 * This method needs to be called when the mixing thread is stopping.
-	 * \warning For thread safety, the device needs to be locked, when this method is called.
-	 */
-	inline void doStop() { m_stop = m_playing = false; }
-
-	/**
-	 * Stops all playback and notifies the mixing thread to stop.
-	 * \warning The device has to be unlocked to not run into a deadlock.
-	 */
-	void stopMixingThread();
-};
-
-AUD_NAMESPACE_END
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
@@ -27,9 +27,9 @@ void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;

-	std::lock_guard<ILockable> lock(*device);
-
 	device->m_state = AUD_pa_context_get_state(context);
+
+	AUD_pa_threaded_mainloop_signal(device->m_mainloop, 0);
 }

 void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t num_bytes, void *data)
@@ -68,40 +68,29 @@ void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
 	}
 }

-void PulseAudioDevice::runMixingThread()
+void PulseAudioDevice::playing(bool playing)
 {
-	for(;;)
-	{
-		{
-			std::lock_guard<ILockable> lock(*this);
+	m_playback = playing;

-			if(shouldStop())
-			{
-				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
-				doStop();
-				return;
-			}
-		}
-
-		if(AUD_pa_stream_is_corked(m_stream))
-			AUD_pa_stream_cork(m_stream, 0, nullptr, nullptr);
-
-		AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
-	}
+	AUD_pa_stream_cork(m_stream, playing ? 0 : 1, nullptr, nullptr);
 }

 PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
+	m_playback(false),
 	m_state(PA_CONTEXT_UNCONNECTED),
 	m_buffersize(buffersize),
 	m_underflows(0)
 {
-	m_mainloop = AUD_pa_mainloop_new();
+	m_mainloop = AUD_pa_threaded_mainloop_new();

-	m_context = AUD_pa_context_new(AUD_pa_mainloop_get_api(m_mainloop), name.c_str());
+	AUD_pa_threaded_mainloop_lock(m_mainloop);
+
+	m_context = AUD_pa_context_new(AUD_pa_threaded_mainloop_get_api(m_mainloop), name.c_str());

 	if(!m_context)
 	{
-		AUD_pa_mainloop_free(m_mainloop);
+		AUD_pa_threaded_mainloop_unlock(m_mainloop);
+		AUD_pa_threaded_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 	}
@@ -110,21 +99,26 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff

 	AUD_pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr);

+	AUD_pa_threaded_mainloop_start(m_mainloop);
+
 	while(m_state != PA_CONTEXT_READY)
 	{
 		switch(m_state)
 		{
 		case PA_CONTEXT_FAILED:
 		case PA_CONTEXT_TERMINATED:
+			AUD_pa_threaded_mainloop_unlock(m_mainloop);
+			AUD_pa_threaded_mainloop_stop(m_mainloop);
+
 			AUD_pa_context_disconnect(m_context);
 			AUD_pa_context_unref(m_context);

-			AUD_pa_mainloop_free(m_mainloop);
+			AUD_pa_threaded_mainloop_free(m_mainloop);

 			AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 			break;
 		default:
-			AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
+			AUD_pa_threaded_mainloop_wait(m_mainloop);
 			break;
 		}
 	}
@@ -172,10 +166,13 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff

 	if(!m_stream)
 	{
+		AUD_pa_threaded_mainloop_unlock(m_mainloop);
+		AUD_pa_threaded_mainloop_stop(m_mainloop);
+
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);

-		AUD_pa_mainloop_free(m_mainloop);
+		AUD_pa_threaded_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not create PulseAudio stream.");
 	}
@@ -191,27 +188,32 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 	buffer_attr.prebuf = -1U;
 	buffer_attr.tlength = buffersize;

-	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
+	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
 	{
+		AUD_pa_threaded_mainloop_unlock(m_mainloop);
+		AUD_pa_threaded_mainloop_stop(m_mainloop);
+
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);

-		AUD_pa_mainloop_free(m_mainloop);
+		AUD_pa_threaded_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not connect PulseAudio stream.");
 	}

+	AUD_pa_threaded_mainloop_unlock(m_mainloop);
+
 	create();
 }

 PulseAudioDevice::~PulseAudioDevice()
 {
-	stopMixingThread();
+	AUD_pa_threaded_mainloop_stop(m_mainloop);

 	AUD_pa_context_disconnect(m_context);
 	AUD_pa_context_unref(m_context);

-	AUD_pa_mainloop_free(m_mainloop);
+	AUD_pa_threaded_mainloop_free(m_mainloop);

 	destroy();
 }
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h
@@ -26,7 +26,7 @@
 * The PulseAudioDevice class.
 */

-#include "devices/ThreadedDevice.h"
+#include "devices/SoftwareDevice.h"

 #include <pulse/pulseaudio.h>

@@ -35,10 +35,15 @@ AUD_NAMESPACE_BEGIN
 /**
 * This device plays back through PulseAudio, the simple direct media layer.
 */
-class AUD_PLUGIN_API PulseAudioDevice : public ThreadedDevice
+class AUD_PLUGIN_API PulseAudioDevice : public SoftwareDevice
 {
 private:
-	pa_mainloop* m_mainloop;
+	/**
+	 * Whether there is currently playback.
+	 */
+	volatile bool m_playback;
+
+	pa_threaded_mainloop* m_mainloop;
 	pa_context* m_context;
 	pa_stream* m_stream;
 	pa_context_state_t m_state;
@@ -69,15 +74,13 @@ private:
 	 */
 	AUD_LOCAL static void PulseAudio_underflow(pa_stream* stream, void* data);

-	/**
-	 * Streaming thread main function.
-	 */
-	AUD_LOCAL void runMixingThread();
-
 	// delete copy constructor and operator=
 	PulseAudioDevice(const PulseAudioDevice&) = delete;
 	PulseAudioDevice& operator=(const PulseAudioDevice&) = delete;

+protected:
+	virtual void playing(bool playing);
+
 public:
 	/**
 	 * Opens the PulseAudio audio device for playback.
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h
@@ -24,14 +24,18 @@ PULSEAUDIO_SYMBOL(pa_context_unref);
 PULSEAUDIO_SYMBOL(pa_stream_begin_write);
 PULSEAUDIO_SYMBOL(pa_stream_connect_playback);
 PULSEAUDIO_SYMBOL(pa_stream_cork);
-PULSEAUDIO_SYMBOL(pa_stream_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
 PULSEAUDIO_SYMBOL(pa_stream_set_underflow_callback);
 PULSEAUDIO_SYMBOL(pa_stream_set_write_callback);
 PULSEAUDIO_SYMBOL(pa_stream_write);

-PULSEAUDIO_SYMBOL(pa_mainloop_free);
-PULSEAUDIO_SYMBOL(pa_mainloop_get_api);
-PULSEAUDIO_SYMBOL(pa_mainloop_new);
-PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_free);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_get_api);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_lock);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_new);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_signal);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_start);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_stop);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_unlock);
+PULSEAUDIO_SYMBOL(pa_threaded_mainloop_wait);
--- a/extern/audaspace/plugins/wasapi/WASAPIDevice.cpp
+++ b/extern/audaspace/plugins/wasapi/WASAPIDevice.cpp
@@ -31,83 +31,159 @@ template <class T> void SafeRelease(T **ppT)
 	}
 }

-void WASAPIDevice::runMixingThread()
+void WASAPIDevice::start()
+{
+	lock();
+
+	// thread is still running, we can abort stopping it
+	if(m_stop)
+		m_stop = false;
+	// thread is not running, let's start it
+	else if(!m_playing)
+	{
+		if(m_thread.joinable())
+			m_thread.join();
+
+		m_playing = true;
+
+		m_thread = std::thread(&WASAPIDevice::updateStream, this);
+	}
+
+	unlock();
+}
+
+void WASAPIDevice::updateStream()
 {
 	UINT32 buffer_size;
-	UINT32 padding;
-	UINT32 length;
 	data_t* buffer;

-	IAudioRenderClient* render_client = nullptr;
+	lock();

+	if(FAILED(m_audio_client->GetBufferSize(&buffer_size)))
 	{
-		std::lock_guard<ILockable> lock(*this);
-
-		const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
-
-		if(FAILED(m_audio_client->GetBufferSize(&buffer_size)))
-			goto init_error;
-
-		if(FAILED(m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
-			goto init_error;
-
-		if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
-			goto init_error;
-
-		length = buffer_size - padding;
-
-		if(FAILED(render_client->GetBuffer(length, &buffer)))
-			goto init_error;
-
-		mix((data_t*)buffer, length);
-
-		if(FAILED(render_client->ReleaseBuffer(length, 0)))
-		{
-			init_error:
-				SafeRelease(&render_client);
-				doStop();
-				return;
-		}
+		m_playing = false;
+		m_stop = false;
+		unlock();
+		return;
 	}

+	IAudioRenderClient* render_client = nullptr;
+	const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
+
+	if(FAILED(m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
+	{
+		m_playing = false;
+		m_stop = false;
+		unlock();
+		return;
+	}
+
+	UINT32 padding;
+
+	if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
+	{
+		SafeRelease(&render_client);
+		m_playing = false;
+		m_stop = false;
+		unlock();
+		return;
+	}
+
+	UINT32 length = buffer_size - padding;
+
+	if(FAILED(render_client->GetBuffer(length, &buffer)))
+	{
+		SafeRelease(&render_client);
+		m_playing = false;
+		m_stop = false;
+		unlock();
+		return;
+	}
+
+	mix((data_t*)buffer, length);
+
+	if(FAILED(render_client->ReleaseBuffer(length, 0)))
+	{
+		SafeRelease(&render_client);
+		m_playing = false;
+		m_stop = false;
+		unlock();
+		return;
+	}
+
+	unlock();
+
 	m_audio_client->Start();

 	auto sleepDuration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);

 	for(;;)
 	{
+		lock();
+
+		if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
 		{
-			std::lock_guard<ILockable> lock(*this);
-
-			if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
-				goto stop_thread;
-
-			length = buffer_size - padding;
-
-			if(FAILED(render_client->GetBuffer(length, &buffer)))
-				goto stop_thread;
-
-			mix((data_t*)buffer, length);
-
-			if(FAILED(render_client->ReleaseBuffer(length, 0)))
-				goto stop_thread;
-
-			// stop thread
-			if(shouldStop())
-			{
-				stop_thread:
-					m_audio_client->Stop();
-					SafeRelease(&render_client);
-					doStop();
-					return;
-			}
+			m_audio_client->Stop();
+			SafeRelease(&render_client);
+			m_playing = false;
+			m_stop = false;
+			unlock();
+			return;
 		}

+		length = buffer_size - padding;
+
+		if(FAILED(render_client->GetBuffer(length, &buffer)))
+		{
+			m_audio_client->Stop();
+			SafeRelease(&render_client);
+			m_playing = false;
+			m_stop = false;
+			unlock();
+			return;
+		}
+
+		mix((data_t*)buffer, length);
+
+		if(FAILED(render_client->ReleaseBuffer(length, 0)))
+		{
+			m_audio_client->Stop();
+			SafeRelease(&render_client);
+			m_playing = false;
+			m_stop = false;
+			unlock();
+			return;
+		}
+
+		// stop thread
+		if(m_stop)
+		{
+			m_audio_client->Stop();
+			SafeRelease(&render_client);
+			m_playing = false;
+			m_stop = false;
+			unlock();
+			return;
+		}
+
+		unlock();
+
 		std::this_thread::sleep_for(sleepDuration);
 	}
 }

+void WASAPIDevice::playing(bool playing)
+{
+	if((!m_playing || m_stop) && playing)
+		start();
+	else
+		m_stop = true;
+}
+
 WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
+	m_playing(false),
+	m_stop(false),
+
 	m_imm_device_enumerator(nullptr),
 	m_imm_device(nullptr),
 	m_audio_client(nullptr),
@@ -285,7 +361,14 @@ WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :

 WASAPIDevice::~WASAPIDevice()
 {
-	stopMixingThread();
+	lock();
+
+	stopAll();
+
+	unlock();
+
+	if(m_thread.joinable())
+		m_thread.join();

 	SafeRelease(&m_audio_client);
 	SafeRelease(&m_imm_device);
--- a/extern/audaspace/plugins/wasapi/WASAPIDevice.h
+++ b/extern/audaspace/plugins/wasapi/WASAPIDevice.h
@@ -26,7 +26,7 @@
 * The WASAPIDevice class.
 */

-#include "devices/ThreadedDevice.h"
+#include "devices/SoftwareDevice.h"

 #include <thread>

@@ -40,23 +40,46 @@ AUD_NAMESPACE_BEGIN
 /**
 * This device plays back through WASAPI, the Windows audio API.
 */
-class AUD_PLUGIN_API WASAPIDevice : public ThreadedDevice
+class AUD_PLUGIN_API WASAPIDevice : public SoftwareDevice
 {
 private:
+	/**
+	 * Whether there is currently playback.
+	 */
+	bool m_playing;
+
+	/**
+	 * Whether the current playback should stop.
+	 */
+	bool m_stop;
+
 	IMMDeviceEnumerator* m_imm_device_enumerator;
 	IMMDevice* m_imm_device;
 	IAudioClient* m_audio_client;
 	WAVEFORMATEXTENSIBLE m_wave_format_extensible;

+	/**
+	 * The streaming thread.
+	 */
+	std::thread m_thread;
+
+	/**
+	 * Starts the streaming thread.
+	 */
+	AUD_LOCAL void start();
+
 	/**
 	 * Streaming thread main function.
 	 */
-	AUD_LOCAL void runMixingThread();
+	AUD_LOCAL void updateStream();

 	// delete copy constructor and operator=
 	WASAPIDevice(const WASAPIDevice&) = delete;
 	WASAPIDevice& operator=(const WASAPIDevice&) = delete;

+protected:
+	virtual void playing(bool playing);
+
 public:
 	/**
 	 * Opens the WASAPI audio device for playback.
--- a/extern/audaspace/src/devices/SoftwareDevice.cpp
+++ b/extern/audaspace/src/devices/SoftwareDevice.cpp
@@ -737,7 +737,7 @@ void SoftwareDevice::mix(data_t* buffer, int length)
 {
 	m_buffer.assureSize(length * AUD_SAMPLE_SIZE(m_specs));

-	std::lock_guard<ILockable> lock(*this);
+	std::lock_guard<std::recursive_mutex> lock(m_mutex);

 	{
 		std::shared_ptr<SoftwareDevice::SoftwareHandle> sound;
@@ -880,7 +880,7 @@ std::shared_ptr<IHandle> SoftwareDevice::play(std::shared_ptr<IReader> reader, b
 	// play sound
 	std::shared_ptr<SoftwareDevice::SoftwareHandle> sound = std::shared_ptr<SoftwareDevice::SoftwareHandle>(new SoftwareDevice::SoftwareHandle(this, reader, pitch, resampler, mapper, keep));

-	std::lock_guard<ILockable> lock(*this);
+	std::lock_guard<std::recursive_mutex> lock(m_mutex);

 	m_playingSounds.push_back(sound);

@@ -897,7 +897,7 @@ std::shared_ptr<IHandle> SoftwareDevice::play(std::shared_ptr<ISound> sound, boo

 void SoftwareDevice::stopAll()
 {
-	std::lock_guard<ILockable> lock(*this);
+	std::lock_guard<std::recursive_mutex> lock(m_mutex);

 	while(!m_playingSounds.empty())
 		m_playingSounds.front()->stop();
--- a/extern/audaspace/src/devices/ThreadedDevice.cpp
+++ b/extern/audaspace/src/devices/ThreadedDevice.cpp
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#include "devices/ThreadedDevice.h"
-
-#include <mutex>
-
-AUD_NAMESPACE_BEGIN
-
-void ThreadedDevice::start()
-{
-	std::lock_guard<ILockable> lock(*this);
-
-	// thread is still running, we can abort stopping it
-	if(m_stop)
-		m_stop = false;
-
-	// thread is not running, let's start it
-	else if(!m_playing)
-	{
-		if(m_thread.joinable())
-			m_thread.join();
-
-		m_playing = true;
-
-		m_thread = std::thread(&ThreadedDevice::runMixingThread, this);
-	}
-}
-
-void ThreadedDevice::playing(bool playing)
-{
-	if((!m_playing || m_stop) && playing)
-		start();
-	else
-		m_stop = true;
-}
-
-ThreadedDevice::ThreadedDevice() :
-	m_playing(false),
-	m_stop(false)
-{
-}
-
-void aud::ThreadedDevice::stopMixingThread()
-{
-	stopAll();
-
-	if(m_thread.joinable())
-		m_thread.join();
-}
-
-AUD_NAMESPACE_END
--- a/extern/mantaflow/preprocessed/fileio/iovdb.cpp
+++ b/extern/mantaflow/preprocessed/fileio/iovdb.cpp
@@ -29,10 +29,10 @@

 #if OPENVDB == 1
 #  include "openvdb/openvdb.h"
-#  include "openvdb/points/PointConversion.h"
-#  include "openvdb/points/PointCount.h"
-#  include "openvdb/tools/Clip.h"
-#  include "openvdb/tools/Dense.h"
+#  include <openvdb/points/PointConversion.h>
+#  include <openvdb/points/PointCount.h>
+#  include <openvdb/tools/Clip.h>
+#  include <openvdb/tools/Dense.h>
 #endif

 #define POSITION_NAME "P"
@@ -519,7 +519,7 @@ int writeObjectsVDB(const string &filename,
    }
  }

-  // Write only if there is at least one grid, optionally write with compression.
+  // Write only if the is at least one grid, optionally write with compression.
  if (gridsVDB.size()) {
    int vdb_flags = openvdb::io::COMPRESS_ACTIVE_MASK;
    switch (compression) {
@@ -534,8 +534,7 @@ int writeObjectsVDB(const string &filename,
      }
      case COMPRESSION_BLOSC: {
 #  if OPENVDB_BLOSC == 1
-        // Cannot use |= here, causes segfault with blosc 1.5.0 (== recommended version)
-        vdb_flags = openvdb::io::COMPRESS_BLOSC;
+        vdb_flags |= openvdb::io::COMPRESS_BLOSC;
 #  else
        debMsg("OpenVDB was built without Blosc support, using Zip compression instead", 1);
        vdb_flags |= openvdb::io::COMPRESS_ZIP;
--- a/extern/mantaflow/preprocessed/fluidsolver.h
+++ b/extern/mantaflow/preprocessed/fluidsolver.h
@@ -384,7 +384,6 @@ class FluidSolver : public PbClass {
  GridStorage<Real> mGrids4dReal;
  GridStorage<Vec3> mGrids4dVec;
  GridStorage<Vec4> mGrids4dVec4;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/general.h
+++ b/extern/mantaflow/preprocessed/general.h
@@ -42,7 +42,7 @@ inline void updateQtGui(bool full, int frame, float time, const std::string &cur
 #  ifdef _DEBUG
 #    define DEBUG 1
 #  endif  // _DEBUG
-#endif    // DEBUG
+#endif  // DEBUG

 // Standard exception
 class Error : public std::exception {
--- a/extern/mantaflow/preprocessed/gitinfo.h
+++ b/extern/mantaflow/preprocessed/gitinfo.h
@@ -1,3 +1,3 @@


-#define MANTA_GIT_VERSION "commit 9c505cd22e289b98c9aa717efba8ef3201c7e458"
+#define MANTA_GIT_VERSION "commit 39b7a415721ecbf6643612a24e8eadd221aeb934"
--- a/extern/mantaflow/preprocessed/grid.h
+++ b/extern/mantaflow/preprocessed/grid.h
@@ -389,7 +389,6 @@ class GridBase : public PbClass {
  Real mDx;
  bool m3D;  // precomputed Z shift: to ensure 2D compatibility, always use this instead of sx*sy !
  IndexInt mStrideZ;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/grid4d.h
+++ b/extern/mantaflow/preprocessed/grid4d.h
@@ -326,7 +326,6 @@ class Grid4dBase : public PbClass {
  // precomputed Z,T shift: to ensure 2D compatibility, always use this instead of sx*sy !
  IndexInt mStrideZ;
  IndexInt mStrideT;
-
 public:
  PbArgs _args;
 }
@@ -951,7 +950,6 @@ template<class T> class Grid4d : public Grid4dBase {

 protected:
  T *mData;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/levelset.h
+++ b/extern/mantaflow/preprocessed/levelset.h
@@ -266,7 +266,6 @@ class LevelsetGrid : public Grid<Real> {
  }

  static Real invalidTimeValue();
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/mesh.h
+++ b/extern/mantaflow/preprocessed/mesh.h
@@ -796,7 +796,6 @@ class Mesh : public PbClass {
  std::vector<MeshDataImpl<int> *>
      mMdataInt;  //! indicate that mdata of this mesh is copied, and needs to be freed
  bool mFreeMdata;
-
 public:
  PbArgs _args;
 }
@@ -882,7 +881,6 @@ class MeshDataBase : public PbClass {

 protected:
  Mesh *mMesh;
-
 public:
  PbArgs _args;
 }
@@ -1647,7 +1645,6 @@ template<class T> class MeshDataImpl : public MeshDataBase {
  //! optionally , we might have an associated grid from which to grab new data
  Grid<T> *mpGridSource;  //! unfortunately , we need to distinguish mac vs regular vec3
  bool mGridSourceMAC;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/movingobs.h
+++ b/extern/mantaflow/preprocessed/movingobs.h
@@ -154,7 +154,6 @@ class MovingObstacle : public PbClass {
  int mEmptyType;
  int mID;
  static int sIDcnt;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/noisefield.h
+++ b/extern/mantaflow/preprocessed/noisefield.h
@@ -236,7 +236,6 @@ class WaveletNoiseField : public PbClass {
  static int randomSeed;
  // global reference count for noise tile
  static std::atomic<int> mNoiseReferenceCount;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/particle.h
+++ b/extern/mantaflow/preprocessed/particle.h
@@ -205,7 +205,6 @@ class ParticleBase : public PbClass {
  //! custom seed for particle systems, used by plugins
  int mSeed;  //! fix global random seed storage, used mainly by functions in this class
  static int globalSeed;
-
 public:
  PbArgs _args;
 }
@@ -629,7 +628,6 @@ template<class S> class ParticleSystem : public ParticleBase {
  std::vector<S> mData;
  //! reduce storage , called by doCompress
  virtual void compress();
-
 public:
  PbArgs _args;
 }
@@ -920,7 +918,6 @@ class ParticleIndexSystem : public ParticleSystem<ParticleIndexData> {
      return -1;
    }
  };
-
 public:
  PbArgs _args;
 }
@@ -985,7 +982,6 @@ template<class DATA, class CON> class ConnectedParticleSystem : public ParticleS
 protected:
  std::vector<CON> mSegments;
  virtual void compress();
-
 public:
  PbArgs _args;
 }
@@ -1075,7 +1071,6 @@ class ParticleDataBase : public PbClass {

 protected:
  ParticleBase *mpParticleSys;
-
 public:
  PbArgs _args;
 }
@@ -1848,7 +1843,6 @@ template<class T> class ParticleDataImpl : public ParticleDataBase {
  //! optionally , we might have an associated grid from which to grab new data
  Grid<T> *mpGridSource;  //! unfortunately , we need to distinguish mac vs regular vec3
  bool mGridSourceMAC;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/plugin/meshplugins.cpp
+++ b/extern/mantaflow/preprocessed/plugin/meshplugins.cpp
@@ -234,10 +234,10 @@ void subdivideMesh(
      normalize(ne2);

      // Real thisArea = sqrMag(cross(-e2,e0));
-      //  small angle approximation says sin(x) = arcsin(x) = x,
-      //  arccos(x) = pi/2 - arcsin(x),
-      //  cos(x) = dot(A,B),
-      //  so angle is approximately 1 - dot(A,B).
+      // small angle approximation says sin(x) = arcsin(x) = x,
+      // arccos(x) = pi/2 - arcsin(x),
+      // cos(x) = dot(A,B),
+      // so angle is approximately 1 - dot(A,B).
      Real angle[3];
      angle[0] = 1.0 - dot(ne0, -ne2);
      angle[1] = 1.0 - dot(ne1, -ne0);
--- a/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
+++ b/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
@@ -2287,10 +2287,9 @@ struct knFlipComputePotentialTrappedAir : public KernelBase {
          const Vec3 &vj = scaleFromManta * v.getCentered(x, y, z);
          const Vec3 xij = xi - xj;
          const Vec3 vij = vi - vj;
-          Real h = !pot.is3D() ?
-                       1.414 * radius :
-                       1.732 * radius;  // estimate sqrt(2)*radius resp. sqrt(3)*radius for h, due
-                                        // to squared resp. cubic neighbor area
+          Real h = !pot.is3D() ? 1.414 * radius :
+                                 1.732 * radius;  // estimate sqrt(2)*radius resp. sqrt(3)*radius
+                                                  // for h, due to squared resp. cubic neighbor area
          vdiff += norm(vij) * (1 - dot(getNormalized(vij), getNormalized(xij))) *
                   (1 - norm(xij) / h);
        }
--- a/extern/mantaflow/preprocessed/shapes.h
+++ b/extern/mantaflow/preprocessed/shapes.h
@@ -269,7 +269,6 @@ class Shape : public PbClass {

 protected:
  GridType mType;
-
 public:
  PbArgs _args;
 }
@@ -320,7 +319,6 @@ class NullShape : public Shape {
  {
    gridSetConst<Real>(phi, 1000.0f);
  }
-
 public:
  PbArgs _args;
 }
@@ -396,7 +394,6 @@ class Box : public Shape {

 protected:
  Vec3 mP0, mP1;
-
 public:
  PbArgs _args;
 }
@@ -458,7 +455,6 @@ class Sphere : public Shape {
 protected:
  Vec3 mCenter, mScale;
  Real mRadius;
-
 public:
  PbArgs _args;
 }
@@ -583,7 +579,6 @@ class Cylinder : public Shape {
 protected:
  Vec3 mCenter, mZDir;
  Real mRadius, mZ;
-
 public:
  PbArgs _args;
 }
@@ -660,7 +655,6 @@ class Slope : public Shape {
  Real mAnglexy, mAngleyz;
  Real mOrigin;
  Vec3 mGs;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/turbulencepart.h
+++ b/extern/mantaflow/preprocessed/turbulencepart.h
@@ -199,7 +199,6 @@ class TurbulenceParticleSystem : public ParticleSystem<TurbulenceParticleData> {

 private:
  WaveletNoiseField &noise;
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/vortexpart.h
+++ b/extern/mantaflow/preprocessed/vortexpart.h
@@ -127,7 +127,6 @@ class VortexParticleSystem : public ParticleSystem<VortexParticleData> {
  }

  virtual ParticleBase *clone();
-
 public:
  PbArgs _args;
 }
--- a/extern/mantaflow/preprocessed/vortexsheet.h
+++ b/extern/mantaflow/preprocessed/vortexsheet.h
@@ -240,7 +240,6 @@ class VortexSheetMesh : public Mesh {
  VorticityChannel mVorticity;
  TexCoord3Channel mTex1, mTex2;
  TurbulenceChannel mTurb;
-
 public:
  PbArgs _args;
 }
--- a/extern/smaa_areatex/CMakeLists.txt
+++ b/extern/smaa_areatex/CMakeLists.txt
@@ -1,26 +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.
-#
-# The Original Code is Copyright (C) 2017, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): IRIE Shinsuke
-#
-# ***** END GPL LICENSE BLOCK *****
-
-add_executable(smaa_areatex smaa_areatex.cpp)
--- a/extern/smaa_areatex/README.blender
+++ b/extern/smaa_areatex/README.blender
@@ -1,5 +0,0 @@
-Project: smaa-cpp
-URL: https://github.com/iRi-E/smaa-cpp
-License: MIT
-Upstream version: 0.4.0
-Local modifications:
--- a/extern/smaa_areatex/smaa_areatex.cpp
+++ b/extern/smaa_areatex/smaa_areatex.cpp
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -118,7 +118,6 @@ typedef struct CLG_LogType {
 typedef struct CLG_LogRef {
  const char *identifier;
  CLG_LogType *type;
-  struct CLG_LogRef *next;
 } CLG_LogRef;

 void CLG_log_str(CLG_LogType *lg,
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

@@ -81,8 +80,6 @@ typedef struct CLG_IDFilter {
 typedef struct CLogContext {
  /** Single linked list of types.  */
  CLG_LogType *types;
-  /** Single linked list of references.  */
-  CLG_LogRef *refs;
 #ifdef WITH_CLOG_PTHREADS
  pthread_mutex_t types_lock;
 #endif
@@ -322,9 +319,7 @@ static bool clg_ctx_filter_check(CLogContext *ctx, const char *identifier)
      if (flt->match[0] == '*' && flt->match[len - 1] == '*') {
        char *match = MEM_callocN(sizeof(char) * len - 1, __func__);
        memcpy(match, flt->match + 1, len - 2);
-        const bool success = (strstr(identifier, match) != NULL);
-        MEM_freeN(match);
-        if (success) {
+        if (strstr(identifier, match) != NULL) {
          return (bool)i;
        }
      }
@@ -677,12 +672,6 @@ static void CLG_ctx_free(CLogContext *ctx)
    MEM_freeN(item);
  }

-  while (ctx->refs != NULL) {
-    CLG_LogRef *item = ctx->refs;
-    ctx->refs = item->next;
-    item->type = NULL;
-  }
-
  for (uint i = 0; i < 2; i++) {
    while (ctx->filters[i] != NULL) {
      CLG_IDFilter *item = ctx->filters[i];
@@ -779,10 +768,6 @@ void CLG_logref_init(CLG_LogRef *clg_ref)
  pthread_mutex_lock(&g_ctx->types_lock);
 #endif
  if (clg_ref->type == NULL) {
-    /* Add to the refs list so we can NULL the pointers to 'type' when CLG_exit() is called. */
-    clg_ref->next = g_ctx->refs;
-    g_ctx->refs = clg_ref;
-
    CLG_LogType *clg_ty = clg_ctx_type_find_by_name(g_ctx, clg_ref->identifier);
    if (clg_ty == NULL) {
      clg_ty = clg_ctx_type_register(g_ctx, clg_ref->identifier);
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -71,16 +71,6 @@ if(WITH_CYCLES_STANDALONE)
  target_link_libraries(cycles ${LIBRARIES})
  cycles_target_link_libraries(cycles)

-  if(APPLE)
-    if(WITH_OPENCOLORIO)
-      set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework IOKit")
-    endif()
-    if(WITH_OPENIMAGEDENOISE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-      # OpenImageDenoise uses BNNS from the Accelerate framework.
-      set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework Accelerate")
-    endif()
-  endif()
-
  if(UNIX AND NOT APPLE)
    set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
  endif()
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -19,16 +19,16 @@ from __future__ import annotations


 def _is_using_buggy_driver():
-    import gpu
+    import bgl
    # We need to be conservative here because in multi-GPU systems display card
    # might be quite old, but others one might be just good.
    #
    # So We shouldn't disable possible good dedicated cards just because display
    # card seems weak. And instead we only blacklist configurations which are
    # proven to cause problems.
-    if gpu.platform.vendor_get() == "ATI Technologies Inc.":
+    if bgl.glGetString(bgl.GL_VENDOR) == "ATI Technologies Inc.":
        import re
-        version = gpu.platform.version_get()
+        version = bgl.glGetString(bgl.GL_VERSION)
        if version.endswith("Compatibility Profile Context"):
            # Old HD 4xxx and 5xxx series drivers did not have driver version
            # in the version string, but those cards do not quite work and
--- a/intern/cycles/blender/addon/presets.py
+++ b/intern/cycles/blender/addon/presets.py
@@ -41,9 +41,6 @@ class AddPresetIntegrator(AddPresetBase, Operator):
        "cycles.caustics_reflective",
        "cycles.caustics_refractive",
        "cycles.blur_glossy"
-        "cycles.use_fast_gi"
-        "cycles.ao_bounces"
-        "cycles.ao_bounces_render"
    ]

    preset_subdir = "cycles/integrator"
--- a/Show More
+++ b/Show More