Rebase on master

.clang-format

@@ -205,7 +205,6 @@ ForEachMacros:
   - FOREACH_SCENE_COLLECTION_BEGIN
   - FOREACH_SCENE_OBJECT_BEGIN
   - FOREACH_SELECTED_BASE_BEGIN
-  - FOREACH_SELECTED_BEZT_BEGIN
   - FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN
   - FOREACH_SELECTED_OBJECT_BEGIN
   - FOREACH_TRANS_DATA_CONTAINER
@@ -269,7 +268,6 @@ ForEachMacros:
 StatementMacros:
   - PyObject_HEAD
   - PyObject_VAR_HEAD
-  - ccl_gpu_kernel_postfix
 
 MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$"
 MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$"

CMakeLists.txt

@@ -256,7 +256,7 @@ endif()
 
 if(UNIX AND NOT APPLE)
   option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
-  option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system"           ON)
+  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
   option(WITH_SYSTEM_FREETYPE "Use the freetype library provided by the operating system" OFF)
 else()
   # not an option for other OS's
@@ -284,7 +284,6 @@ option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
-option(WITH_IMAGE_WEBP          "Enable WebP Image Support" OFF)
 
 # Audio/Video format support
 option(WITH_CODEC_AVI           "Enable Blenders own AVI file support (raw/jpeg)" ON)
@@ -409,8 +408,6 @@ option(WITH_CYCLES_DEBUG             "Build Cycles with options useful for debug
 option(WITH_CYCLES_STANDALONE        "Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI    "Build Cycles standalone with GUI" OFF)
 
-option(WITH_CYCLES_HYDRA_RENDER_DELEGATE "Build Cycles Hydra render delegate" OFF)
-
 option(WITH_CYCLES_DEBUG_NAN         "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
 option(WITH_CYCLES_NATIVE_ONLY       "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN       "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
@@ -446,7 +443,7 @@ if(NOT APPLE)
   endif()
 
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx900 gfx906 gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
   mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
@@ -505,7 +502,7 @@ else()
   set(WITH_EXPERIMENTAL_FEATURES OFF)
 endif()
 
-# Unit testing
+# Unit testsing
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
 option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF)
 option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF)
@@ -534,19 +531,6 @@ mark_as_advanced(
   WITH_GPU_SHADER_BUILDER
 )
 
-# Metal
-
-if (APPLE)
-  option(WITH_METAL_BACKEND "Use Metal for graphics instead of (or as well as) OpenGL on macOS." OFF)
-  mark_as_advanced(WITH_METAL_BACKEND)
-else()
-  set(WITH_METAL_BACKEND OFF)
-endif()
-
-if (WITH_METAL_BACKEND)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
-endif()
-
 if(WIN32)
   option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
   mark_as_advanced(WITH_GL_ANGLE)
@@ -745,10 +729,9 @@ endif()
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
-if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE AND NOT WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
   message(FATAL_ERROR
     "At least one of WITH_BLENDER or WITH_CYCLES_STANDALONE "
-    "or WITH_CYCLES_HYDRA_RENDER_DELEGATE "
     "must be enabled, nothing to do!"
   )
 endif()
@@ -883,7 +866,7 @@ if(WITH_CYCLES_DEVICE_HIP)
 endif()
 
 #-----------------------------------------------------------------------------
-# Check if submodules are cloned.
+# Check check if submodules are cloned
 
 if(WITH_INTERNATIONAL)
   file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
@@ -906,8 +889,8 @@ if(WITH_PYTHON)
   # Do this before main 'platform_*' checks,
   # because UNIX will search for the old Python paths which may not exist.
   # giving errors about missing paths before this case is met.
-  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.10")
+  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.9")
-    message(FATAL_ERROR "At least Python 3.10 is required to build, but found Python ${PYTHON_VERSION}")
+    message(FATAL_ERROR "At least Python 3.9 is required to build, but found Python ${PYTHON_VERSION}")
   endif()
 
   file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")
@@ -1291,16 +1274,6 @@ else()
   list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
-#-----------------------------------------------------------------------------
-# Configure Metal.
-if (WITH_METAL_BACKEND)
-  add_definitions(-DWITH_METAL_BACKEND)
-
-  # No need to add frameworks here, all the ones we need for Metal and
-  # Metal-OpenGL Interop are already being added by
-  # build_files/cmake/platform/platform_apple.cmake
-endif()
-
 #-----------------------------------------------------------------------------
 # Configure OpenMP.
 if(WITH_OPENMP)
@@ -1695,8 +1668,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
-  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
-  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
 
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
@@ -1911,13 +1882,15 @@ if(WITH_BLENDER)
   # source after intern and extern to gather all
   # internal and external library information first, for test linking
   add_subdirectory(source)
-elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+elseif(WITH_CYCLES_STANDALONE)
   add_subdirectory(intern/glew-mx)
   add_subdirectory(intern/guardedalloc)
   add_subdirectory(intern/libc_compat)
+  add_subdirectory(intern/numaapi)
   add_subdirectory(intern/sky)
 
   add_subdirectory(intern/cycles)
+  add_subdirectory(extern/clew)
   if(WITH_CYCLES_LOGGING)
     if(NOT WITH_SYSTEM_GFLAGS)
       add_subdirectory(extern/gflags)
@@ -1974,7 +1947,7 @@ if(FIRST_RUN)
 
     set(_msg "  - ${_setting}")
     string(LENGTH "${_msg}" _len)
-    while("36" GREATER "${_len}")
+    while("32" GREATER "${_len}")
       string(APPEND _msg " ")
       math(EXPR _len "${_len} + 1")
     endwhile()

GNUmakefile

@@ -32,7 +32,7 @@ Other Convenience Targets
    * config:        Run cmake configuration tool to set build options.
    * deps:          Build library dependencies (intended only for platform maintainers).
 
-                    The existence of locally build dependencies overrides the pre-built dependencies from subversion.
+                    The existance of locally build dependencies overrides the pre-built dependencies from subversion.
                     These must be manually removed from '../lib/' to go back to using the pre-compiled libraries.
 
 Project Files
@@ -44,6 +44,8 @@ Project Files
 
 Package Targets
 
+   * package_debian:    Build a debian package.
+   * package_pacman:    Build an arch linux pacman package.
    * package_archive:   Build an archive package.
 
 Testing Targets
@@ -51,25 +53,24 @@ Testing Targets
 
    * test:
      Run automated tests with ctest.
+   * test_cmake:
+     Runs our own cmake file checker
+     which detects errors in the cmake file list definitions
+   * test_pep8:
+     Checks all python script are pep8
+     which are tagged to use the stricter formatting
+   * test_deprecated:
+     Checks for deprecation tags in our code which may need to be removed
 
 Static Source Code Checking
    Not associated with building Blender.
 
    * check_cppcheck:        Run blender source through cppcheck (C & C++).
    * check_clang_array:     Run blender source through clang array checking script (C & C++).
-   * check_deprecated:      Check if there is any deprecated code to remove.
    * check_splint:          Run blenders source through splint (C only).
    * check_sparse:          Run blenders source through sparse (C only).
    * check_smatch:          Run blenders source through smatch (C only).
    * check_descriptions:    Check for duplicate/invalid descriptions.
-   * check_licenses:        Check license headers follow the SPDX license specification,
-                            using one of the accepted licenses in 'doc/license/SPDX-license-identifiers.txt'
-                            Append with 'SHOW_HEADERS=1' to show all unique headers
-                            which can be useful for spotting license irregularities.
-   * check_cmake:           Runs our own cmake file checker which detects errors in the cmake file list definitions.
-   * check_pep8:            Checks all Python script are pep8 which are tagged to use the stricter formatting.
-   * check_mypy:            Checks all Python scripts using mypy,
-                            see: source/tools/check_source/check_mypy_config.py scripts which are included.
 
 Spell Checkers
    This runs the spell checker from the developer tools repositor.
@@ -199,7 +200,7 @@ endif
 # in libraries, or python 2 for running make update to get it.
 ifeq ($(OS_NCASE),darwin)
 	ifeq (, $(shell command -v $(PYTHON)))
-		PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.10
+		PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.7m
 		ifeq (, $(shell command -v $(PYTHON)))
 			PYTHON:=python
 		endif
@@ -308,7 +309,7 @@ CMAKE_CONFIG = cmake $(CMAKE_CONFIG_ARGS) \
 # -----------------------------------------------------------------------------
 # Tool for 'make config'
 
-# X11 specific.
+# X11 spesific
 ifdef DISPLAY
 	CMAKE_CONFIG_TOOL = cmake-gui
 else
@@ -385,6 +386,11 @@ help: .FORCE
 # -----------------------------------------------------------------------------
 # Packages
 #
+package_debian: .FORCE
+	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
+
+package_pacman: .FORCE
+	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg
 
 package_archive: .FORCE
 	make -C "$(BUILD_DIR)" -s package_archive
@@ -395,7 +401,21 @@ package_archive: .FORCE
 # Tests
 #
 test: .FORCE
-	@$(PYTHON) ./build_files/utils/make_test.py "$(BUILD_DIR)"
+	$(PYTHON) ./build_files/utils/make_test.py "$(BUILD_DIR)"
+
+# run pep8 check check on scripts we distribute.
+test_pep8: .FORCE
+	$(PYTHON) tests/python/pep8.py > test_pep8.log 2>&1
+	@echo "written: test_pep8.log"
+
+# run some checks on our cmakefiles.
+test_cmake: .FORCE
+	$(PYTHON) build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+	@echo "written: test_cmake_consistency.log"
+
+# run deprecation tests, see if we have anything to remove.
+test_deprecated: .FORCE
+	$(PYTHON) tests/check_deprecated.py
 
 
 # -----------------------------------------------------------------------------
@@ -417,44 +437,44 @@ project_eclipse: .FORCE
 #
 
 check_cppcheck: .FORCE
-	@$(CMAKE_CONFIG)
+	$(CMAKE_CONFIG)
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) \
 	    "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
 	    "$(BLENDER_DIR)/check_cppcheck.txt"
 	@echo "written: check_cppcheck.txt"
 
 check_clang_array: .FORCE
-	@$(CMAKE_CONFIG)
+	$(CMAKE_CONFIG)
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py"
 
 check_splint: .FORCE
-	@$(CMAKE_CONFIG)
+	$(CMAKE_CONFIG)
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py"
 
 check_sparse: .FORCE
-	@$(CMAKE_CONFIG)
+	$(CMAKE_CONFIG)
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py"
 
 check_smatch: .FORCE
-	@$(CMAKE_CONFIG)
+	$(CMAKE_CONFIG)
-	@cd "$(BUILD_DIR)" ; \
+	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"
+	$(PYTHON) "$(BLENDER_DIR)/source/tools/check_source/check_mypy.py"
 
 check_spelling_py: .FORCE
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
 	    "$(BLENDER_DIR)/release/scripts"
 
 check_spelling_c: .FORCE
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
 	    --cache-file=$(CHECK_SPELLING_CACHE) \
@@ -464,70 +484,52 @@ check_spelling_c: .FORCE
 	    "$(BLENDER_DIR)/intern/ghost" \
 
 check_spelling_osl: .FORCE
-	@cd "$(BUILD_DIR)" ; \
+	cd "$(BUILD_DIR)" ;\
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
 	    --cache-file=$(CHECK_SPELLING_CACHE) \
 	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
 
 check_descriptions: .FORCE
-	@$(BLENDER_BIN) --background -noaudio --factory-startup --python \
+	$(BLENDER_BIN) --background -noaudio --factory-startup --python \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
 
-check_deprecated: .FORCE
-	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    source/tools/check_source/check_deprecated.py
-
-check_licenses: .FORCE
-	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_licenses.py" \
-	    "--show-headers=$(SHOW_HEADERS)"
-
-check_pep8: .FORCE
-	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    tests/python/pep8.py
-
-check_cmake: .FORCE
-	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    source/tools/check_source/check_cmake_consistency.py
-
-
 # -----------------------------------------------------------------------------
 # Utilities
 #
 
 source_archive: .FORCE
-	@$(PYTHON) ./build_files/utils/make_source_archive.py
+	python3 ./build_files/utils/make_source_archive.py
 
 source_archive_complete: .FORCE
-	@cmake \
+	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:
-	@$(PYTHON) ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
+	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) \
+	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
 	    "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	@INKSCAPE_BIN=$(INKSCAPE_BIN) \
+	INKSCAPE_BIN=$(INKSCAPE_BIN) \
 	    "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-	@INKSCAPE_BIN=$(INKSCAPE_BIN) \
+	INKSCAPE_BIN=$(INKSCAPE_BIN) \
 	    "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
 
 icons_geom: .FORCE
-	@BLENDER_BIN=$(BLENDER_BIN) \
+	BLENDER_BIN=$(BLENDER_BIN) \
 	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 
 update: .FORCE
-	@$(PYTHON) ./build_files/utils/make_update.py
+	$(PYTHON) ./build_files/utils/make_update.py
 
 update_code: .FORCE
-	@$(PYTHON) ./build_files/utils/make_update.py --no-libraries
+	$(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)" \
+	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)
 
 
@@ -537,25 +539,25 @@ format: .FORCE
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	@ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
+	ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
 	$(BLENDER_BIN) \
 	    --background -noaudio --factory-startup \
 	    --python doc/python_api/sphinx_doc_gen.py
-	@sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
+	sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
 
 doc_doxy: .FORCE
-	@cd doc/doxygen; doxygen Doxyfile
+	cd doc/doxygen; doxygen Doxyfile
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	@$(BLENDER_BIN) \
+	$(BLENDER_BIN) \
 	    --background -noaudio --factory-startup \
 	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE
-	@$(PYTHON) doc/manpage/blender.1.py --blender="$(BLENDER_BIN)" --output=blender.1 --verbose
+	$(PYTHON) doc/manpage/blender.1.py $(BLENDER_BIN) blender.1
 
 help_features: .FORCE
 	@$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_print_build_options.py" $(BLENDER_DIR)"/CMakeLists.txt"

build_files/build_environment/cmake/download.cmake

@@ -1,16 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
-
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
   set(TARGET_HASH_TYPE ${${dep}_HASH_TYPE})
   set(TARGET_HASH ${${dep}_HASH})
   if(PACKAGE_USE_UPSTREAM_SOURCES)
     set(TARGET_URI  ${${dep}_URI})
-  elseif(BLENDER_VERSION)
-    set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/tags/blender-${BLENDER_VERSION}-release/lib/packages/${TARGET_FILE})
   else()
     set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
   endif()

build_files/build_environment/cmake/usd.cmake

@@ -52,14 +52,6 @@ add_dependencies(
   external_boost
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
-# See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
-if (USD_VERSION VERSION_LESS 21.11)
-  set(PXR_LIB_PREFIX "")
-else()
-  set(PXR_LIB_PREFIX "usd_")
-endif()
-
 if(WIN32)
   # USD currently demands python be available at build time
   # and then proceeds not to use it, but still checks that the
@@ -73,14 +65,14 @@ if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/${PXR_LIB_PREFIX}usd_m.lib ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/${PXR_LIB_PREFIX}usd_m_d.lib ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
       DEPENDEES install
     )
   endif()
@@ -92,7 +84,7 @@ else()
   # case (only the shared library). As a result, we need to grab the `libusd_m.a`
   # file from the build directory instead of from the install directory.
   ExternalProject_Add_Step(external_usd after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/lib${PXR_LIB_PREFIX}usd_m.a ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.a
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/libusd_m.a ${HARVEST_TARGET}/usd/lib/libusd_m.a
     DEPENDEES install
   )
 endif()

build_files/build_environment/install_deps.sh

@@ -360,13 +360,12 @@ USE_CXX11=true
 # XXX_VERSION_SHORT is used for various things, like preferred version (when distribution provides several of them),
 #                   and to name shortcuts to built libraries' installation directories...
 
-CLANG_FORMAT_VERSION="10.0"
 CLANG_FORMAT_VERSION_MIN="6.0"
-CLANG_FORMAT_VERSION_MEX="14.0"
+CLANG_FORMAT_VERSION_MEX="10.0"
 
 PYTHON_VERSION="3.10.2"
 PYTHON_VERSION_SHORT="3.10"
-PYTHON_VERSION_MIN="3.10"
+PYTHON_VERSION_MIN="3.9"
 PYTHON_VERSION_MEX="3.12"
 PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_SHORT
 PYTHON_FORCE_BUILD=false
@@ -432,8 +431,8 @@ PYTHON_MODULES_PIP=(
 )
 
 
-BOOST_VERSION="1.78.0"
+BOOST_VERSION="1.73.0"
-BOOST_VERSION_SHORT="1.78"
+BOOST_VERSION_SHORT="1.73"
 BOOST_VERSION_MIN="1.49"
 BOOST_VERSION_MEX="2.0"
 BOOST_FORCE_BUILD=false
@@ -442,15 +441,15 @@ BOOST_SKIP=false
 
 TBB_VERSION="2020"
 TBB_VERSION_SHORT="2020"
-TBB_VERSION_UPDATE="_U3"  # Used for source packages...
+TBB_VERSION_UPDATE="_U2"  # Used for source packages...
 TBB_VERSION_MIN="2018"
 TBB_VERSION_MEX="2022"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false
 
-OCIO_VERSION="2.1.1"
+OCIO_VERSION="2.0.0"
-OCIO_VERSION_SHORT="2.1"
+OCIO_VERSION_SHORT="2.0"
 OCIO_VERSION_MIN="2.0"
 OCIO_VERSION_MEX="3.0"
 OCIO_FORCE_BUILD=false
@@ -466,10 +465,10 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="2.3.13.0"
+OIIO_VERSION="2.2.15.1"
-OIIO_VERSION_SHORT="2.3"
+OIIO_VERSION_SHORT="2.2"
 OIIO_VERSION_MIN="2.1.12"
-OIIO_VERSION_MEX="2.4.0"
+OIIO_VERSION_MEX="2.3.0"
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false
@@ -493,7 +492,7 @@ OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.4.4"
+OSD_VERSION="3.4.3"
 OSD_VERSION_SHORT="3.4"
 OSD_VERSION_MIN="3.4"
 OSD_VERSION_MEX="4.0"
@@ -502,19 +501,19 @@ OSD_FORCE_REBUILD=false
 OSD_SKIP=false
 
 # OpenVDB needs to be compiled for now
-OPENVDB_BLOSC_VERSION="1.21.1"
+OPENVDB_BLOSC_VERSION="1.5.0"
 
-OPENVDB_VERSION="9.0.0"
+OPENVDB_VERSION="8.0.1"
-OPENVDB_VERSION_SHORT="9.0"
+OPENVDB_VERSION_SHORT="8.0"
-OPENVDB_VERSION_MIN="9.0"
+OPENVDB_VERSION_MIN="8.0"
-OPENVDB_VERSION_MEX="9.1"
+OPENVDB_VERSION_MEX="8.1"
 OPENVDB_FORCE_BUILD=false
 OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false
 
 # Alembic needs to be compiled for now
-ALEMBIC_VERSION="1.8.3"
+ALEMBIC_VERSION="1.7.16"
-ALEMBIC_VERSION_SHORT="1.8"
+ALEMBIC_VERSION_SHORT="1.7"
 ALEMBIC_VERSION_MIN="1.7"
 ALEMBIC_VERSION_MEX="2.0"
 ALEMBIC_FORCE_BUILD=false
@@ -537,15 +536,15 @@ OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
-EMBREE_VERSION="3.13.3"
+EMBREE_VERSION="3.10.0"
-EMBREE_VERSION_SHORT="3.13"
+EMBREE_VERSION_SHORT="3.10"
-EMBREE_VERSION_MIN="3.13"
+EMBREE_VERSION_MIN="3.10"
 EMBREE_VERSION_MEX="4.0"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 
-OIDN_VERSION="1.4.3"
+OIDN_VERSION="1.4.1"
 OIDN_VERSION_SHORT="1.4"
 OIDN_VERSION_MIN="1.4.0"
 OIDN_VERSION_MEX="1.5"
@@ -553,7 +552,7 @@ OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false
 
-ISPC_VERSION="1.17.0"
+ISPC_VERSION="1.16.0"
 
 FFMPEG_VERSION="4.4"
 FFMPEG_VERSION_SHORT="4.4"
@@ -1029,7 +1028,7 @@ OPENEXR_SOURCE_REPO_UID="0ac2ea34c8f3134148a5df4052e40f155b76f6fb"
 #~ OPENEXR_SOURCE=( "https://github.com/openexr/openexr/archive/$OPENEXR_SOURCE_REPO_UID.tar.gz" )
 
 OIIO_USE_REPO=false
-OIIO_SOURCE=( "https://github.com/OpenImageIO/oiio/archive/refs/tags/v$OIIO_VERSION.tar.gz" )
+OIIO_SOURCE=( "https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz" )
 #~ OIIO_SOURCE_REPO=( "https://github.com/OpenImageIO/oiio.git" )
 #~ OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
 
@@ -2034,7 +2033,7 @@ compile_OIIO() {
       else
         download OIIO_SOURCE[@] "$_src.tar.gz"
         INFO "Unpacking OpenImageIO-$OIIO_VERSION"
-        tar -C $SRC --transform "s,(.*/?)oiio-[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" -xf $_src.tar.gz
+        tar -C $SRC --transform "s,(.*/?)oiio-Release-[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" -xf $_src.tar.gz
       fi
     fi
 

build_files/build_environment/patches/cmake/modules/FindBlosc.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find BLOSC library
 # Find the native BLOSC includes and library
 # This module defines
@@ -14,6 +11,17 @@
 # also defined, but not for general use are
 #  BLOSC_LIBRARY, where to find the BLOSC library.
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
 # If BLOSC_ROOT_DIR was defined in the environment, use it.
 IF(NOT BLOSC_ROOT_DIR AND NOT $ENV{BLOSC_ROOT_DIR} STREQUAL "")
   SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})

build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find CPPUNIT library
 # Find the native CPPUNIT includes and library
 # This module defines
@@ -14,6 +11,17 @@
 # also defined, but not for general use are
 #  CPPUNIT_LIBRARY, where to find the CPPUNIT library.
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
 # If CPPUNIT_ROOT_DIR was defined in the environment, use it.
 IF(NOT CPPUNIT_ROOT_DIR AND NOT $ENV{CPPUNIT_ROOT_DIR} STREQUAL "")
   SET(CPPUNIT_ROOT_DIR $ENV{CPPUNIT_ROOT_DIR})

build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-
 # Module to find IlmBase
 #
 # This module will first look into the directories defined by the variables:

build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find LOGC4PLUS library
 # Find the native LOGC4PLUS includes and library
 # This module defines
@@ -14,6 +11,17 @@
 # also defined, but not for general use are
 #  LOGC4PLUS_LIBRARY, where to find the LOGC4PLUS library.
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
 # If LOGC4PLUS_ROOT_DIR was defined in the environment, use it.
 IF(NOT LOGC4PLUS_ROOT_DIR AND NOT $ENV{LOGC4PLUS_ROOT_DIR} STREQUAL "")
   SET(LOGC4PLUS_ROOT_DIR $ENV{LOGC4PLUS_ROOT_DIR})

build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-
 # Module to find OpenEXR.
 #
 # This module will first look into the directories defined by the variables:

build_files/build_environment/patches/cmake/modules/FindTBB.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find TBB library
 # Find the native TBB includes and library
 # This module defines
@@ -14,6 +11,17 @@
 # also defined, but not for general use are
 #  TBB_LIBRARY, where to find the TBB library.
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
 # If TBB_ROOT_DIR was defined in the environment, use it.
 IF(NOT TBB_ROOT_DIR AND NOT $ENV{TBB_ROOT_DIR} STREQUAL "")
   SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR})

build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake

@@ -1,8 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2009 Kitware, Inc.
-#           2009 Will Dicharry <wdicharry@stellarscience.com>
-#           2005-2009 Kitware, Inc.
-
 # select_library_configurations( basename )
 #
 # This macro takes a library base name as an argument, and will choose good
@@ -19,6 +14,18 @@
 # or the generator in use does not support configuration types, then
 # basename_LIBRARY and basename_LIBRARIES will take only the release values.
 
+#=============================================================================
+# Copyright 2009 Kitware, Inc.
+# Copyright 2009 Will Dicharry <wdicharry@stellarscience.com>
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 

build_files/buildbot/config/blender_linux.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # ######## Global feature set settings ########
 
 include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")

build_files/cmake/Modules/FindAlembic.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find Alembic library
 # Find the native Alembic includes and libraries
 # This module defines
@@ -12,6 +9,13 @@
 #  ALEMBIC_FOUND, If false, do not try to use Alembic.
 #
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If ALEMBIC_ROOT_DIR was defined in the environment, use it.
 IF(NOT ALEMBIC_ROOT_DIR AND NOT $ENV{ALEMBIC_ROOT_DIR} STREQUAL "")
   SET(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR})

build_files/cmake/Modules/FindAudaspace.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 Blender Foundation.
-
 # - Try to find audaspace
 # Once done, this will define
 #
@@ -14,6 +11,13 @@
 #  AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories
 #  AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding
 
+#=============================================================================
+# Copyright 2014 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
   SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
 ENDIF()

build_files/cmake/Modules/FindBlosc.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 Blender Foundation.
-
 # - Find Blosc library
 # Find the native Blosc includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  BLOSC_LIBRARY, where to find the Blosc library.
 
+#=============================================================================
+# Copyright 2018 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If BLOSC_ROOT_DIR was defined in the environment, use it.
 IF(NOT BLOSC_ROOT_DIR AND NOT $ENV{BLOSC_ROOT_DIR} STREQUAL "")
   SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})

build_files/cmake/Modules/FindBrotli.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
 # - Find Brotli library (compression for freetype/woff2).
 # This module defines
 #  BROTLI_INCLUDE_DIRS, where to find Brotli headers, Set when
@@ -11,6 +8,13 @@
 #  BROTLI_FOUND, If false, do not try to use Brotli.
 #
 
+#=============================================================================
+# Copyright 2022 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If BROTLI_ROOT_DIR was defined in the environment, use it.
 IF(NOT BROTLI_ROOT_DIR AND NOT $ENV{BROTLI_ROOT_DIR} STREQUAL "")
   SET(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR})

build_files/cmake/Modules/FindClang.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find Clang library
 # Find the native Clang includes and library
 # This module defines
@@ -11,6 +8,13 @@
 #                        This can also be an environment variable.
 #  CLANG_FOUND, If false, do not try to use Clang.
 
+#=============================================================================
+# Copyright 2021 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If CLANG_ROOT_DIR was defined in the environment, use it.
 if(NOT CLANG_ROOT_DIR AND NOT $ENV{CLANG_ROOT_DIR} STREQUAL "")
   set(CLANG_ROOT_DIR $ENV{CLANG_ROOT_DIR})

build_files/cmake/Modules/FindClangTidy.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Blender Foundation.
-
 # - Find clang-tidy executable
 #
 # Find the native clang-tidy executable
@@ -17,6 +14,13 @@
 #
 #  CLANG_TIDY_FOUND, If false, do not try to use Eigen3.
 
+#=============================================================================
+# Copyright 2020 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If CLANG_TIDY_ROOT_DIR was defined in the environment, use it.
 if(NOT CLANG_TIDY_ROOT_DIR AND NOT $ENV{CLANG_TIDY_ROOT_DIR} STREQUAL "")
   set(CLANG_TIDY_ROOT_DIR $ENV{CLANG_TIDY_ROOT_DIR})

build_files/cmake/Modules/FindEigen3.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 Blender Foundation.
-
 # - Find Eigen3 library
 # Find the native Eigen3 includes and library
 # This module defines
@@ -9,6 +6,13 @@
 #  EIGEN3_ROOT_DIR, The base directory to search for Eigen3.
 #                    This can also be an environment variable.
 #  EIGEN3_FOUND, If false, do not try to use Eigen3.
+#
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
 
 # If EIGEN3_ROOT_DIR was defined in the environment, use it.
 IF(NOT EIGEN3_ROOT_DIR AND NOT $ENV{EIGEN3_ROOT_DIR} STREQUAL "")

build_files/cmake/Modules/FindEmbree.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 Blender Foundation.
-
 # - Find Embree library
 # Find the native Embree includes and library
 # This module defines
@@ -11,6 +8,13 @@
 #                        This can also be an environment variable.
 #  EMBREEFOUND, If false, do not try to use Embree.
 
+#=============================================================================
+# Copyright 2018 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If EMBREE_ROOT_DIR was defined in the environment, use it.
 IF(NOT EMBREE_ROOT_DIR AND NOT $ENV{EMBREE_ROOT_DIR} STREQUAL "")
   SET(EMBREE_ROOT_DIR $ENV{EMBREE_ROOT_DIR})

build_files/cmake/Modules/FindFFmpeg.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Blender Foundation.
-
 # - Find FFmpeg library and includes.
 # Set FFMPEG_FIND_COMPONENTS to the canonical names of the libraries
 # before using the module.
@@ -11,6 +8,12 @@
 #                        This can also be an environment variable.
 #  FFMPEG_FOUND, If false, do not try to use FFmpeg.
 #  FFMPEG_<COMPONENT>_LIBRARY, the given individual component libraries.
+#=============================================================================
+# Copyright 2020 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
 
 # If FFMPEG_ROOT_DIR was defined in the environment, use it.
 if(NOT FFMPEG_ROOT_DIR AND NOT $ENV{FFMPEG_ROOT_DIR} STREQUAL "")
@@ -79,6 +82,4 @@ mark_as_advanced(
 
 unset(_ffmpeg_SEARCH_DIRS)
 unset(_ffmpeg_LIBRARIES)
-# In cmake version 3.21 and up, we can instead use the NO_CACHE option for
+unset(_ffmpeg_INCLUDE_DIR)
-# find_path so we don't need to clear it from the cache here.
-unset(_ffmpeg_INCLUDE_DIR CACHE)

build_files/cmake/Modules/FindFftw3.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find Fftw3 library
 # Find the native Fftw3 includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  FFTW3_LIBRARY, where to find the Fftw3 library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If FFTW3_ROOT_DIR was defined in the environment, use it.
 IF(NOT FFTW3_ROOT_DIR AND NOT $ENV{FFTW3_ROOT_DIR} STREQUAL "")
   SET(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR})

build_files/cmake/Modules/FindGLEW.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 Blender Foundation.
-
 # - Find GLEW library
 # Find the native Glew includes and library
 # This module defines
@@ -13,6 +10,13 @@
 # also defined,
 #  GLEW_LIBRARY, where to find the Glew library.
 
+#=============================================================================
+# Copyright 2014 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If GLEW_ROOT_DIR was defined in the environment, use it.
 IF(NOT GLEW_ROOT_DIR AND NOT $ENV{GLEW_ROOT_DIR} STREQUAL "")
   SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR})

build_files/cmake/Modules/FindGMP.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find GMP library
 # Find the native GMP includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  GMP_LIBRARY, where to find the GMP library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If GMP_ROOT_DIR was defined in the environment, use it.
 IF(NOT GMP_ROOT_DIR AND NOT $ENV{GMP_ROOT_DIR} STREQUAL "")
   SET(GMP_ROOT_DIR $ENV{GMP_ROOT_DIR})

build_files/cmake/Modules/FindGflags.cmake

@@ -1,8 +1,33 @@
-# SPDX-License-Identifier: BSD-3-Clause
+# Ceres Solver - A fast non-linear least squares minimizer
 # Copyright 2015 Google Inc. All rights reserved.
-
+# http://ceres-solver.org/
-# Ceres Solver - A fast non-linear least squares minimizer http://ceres-solver.org/
+#
-# Author: Alex Stewart <alexs.mac@gmail.com>
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Google Inc. nor the names of its contributors may be
+#   used to endorse or promote products derived from this software without
+#   specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: alexs.mac@gmail.com (Alex Stewart)
+#
 
 # FindGflags.cmake - Find Google gflags logging library.
 #

build_files/cmake/Modules/FindGlog.cmake

@@ -1,8 +1,33 @@
-# SPDX-License-Identifier: BSD-3-Clause
+# Ceres Solver - A fast non-linear least squares minimizer
 # Copyright 2015 Google Inc. All rights reserved.
-
+# http://ceres-solver.org/
-# Ceres Solver - A fast non-linear least squares minimizer http://ceres-solver.org/
+#
-# Author: Alex Stewart <alexs.mac@gmail.com>
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Google Inc. nor the names of its contributors may be
+#   used to endorse or promote products derived from this software without
+#   specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: alexs.mac@gmail.com (Alex Stewart)
+#
 
 # FindGlog.cmake - Find Google glog logging library.
 #

build_files/cmake/Modules/FindHIP.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021 Blender Foundation.
-
 # - Find HIP compiler
 #
 # This module defines
@@ -9,6 +6,13 @@
 #
 #  HIP_FOUND, if the HIP toolkit is found.
 
+#=============================================================================
+# Copyright 2021 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If HIP_ROOT_DIR was defined in the environment, use it.
 if(NOT HIP_ROOT_DIR AND NOT $ENV{HIP_ROOT_DIR} STREQUAL "")
   set(HIP_ROOT_DIR $ENV{HIP_ROOT_DIR})

build_files/cmake/Modules/FindHaru.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021 Blender Foundation.
-
 # - Find HARU library
 # Find the native Haru includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  HARU_LIBRARY, where to find the Haru library.
 
+#=============================================================================
+# Copyright 2021 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If HARU_ROOT_DIR was defined in the environment, use it.
 if(NOT HARU_ROOT_DIR AND NOT $ENV{HARU_ROOT_DIR} STREQUAL "")
   set(HARU_ROOT_DIR $ENV{HARU_ROOT_DIR})

build_files/cmake/Modules/FindIcuLinux.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2012 Blender Foundation.
-
 # - Find static icu libraries
 # Find the native static icu libraries (needed for static boost_locale :/ ).
 # This module defines
@@ -12,6 +9,13 @@
 # also defined, but not for general use are
 #  ICU_LIBRARY_xxx, where to find the icu libraries.
 
+#=============================================================================
+# Copyright 2012 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If ICU_ROOT_DIR was defined in the environment, use it.
 IF(NOT ICU_ROOT_DIR AND NOT $ENV{ICU_ROOT_DIR} STREQUAL "")
   SET(ICU_ROOT_DIR $ENV{ICU_ROOT_DIR})

build_files/cmake/Modules/FindJack.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find JACK library
 # Find the native JACK includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  JACK_LIBRARY, where to find the JACK library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If JACK_ROOT_DIR was defined in the environment, use it.
 IF(NOT JACK_ROOT_DIR AND NOT $ENV{JACK_ROOT_DIR} STREQUAL "")
   SET(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR})

build_files/cmake/Modules/FindJeMalloc.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find JeMalloc library
 # Find the native JeMalloc includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  JEMALLOC_LIBRARY, where to find the JeMalloc library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If JEMALLOC_ROOT_DIR was defined in the environment, use it.
 IF(NOT JEMALLOC_ROOT_DIR AND NOT $ENV{JEMALLOC_ROOT_DIR} STREQUAL "")
   SET(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR})

build_files/cmake/Modules/FindLLVM.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 Blender Foundation.
-
 # - Find LLVM library
 # Find the native LLVM includes and library
 # This module defines
@@ -13,6 +10,13 @@
 # also defined, but not for general use are
 #  LLVM_LIBRARY, where to find the LLVM library.
 
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 if(LLVM_ROOT_DIR)
   if(DEFINED LLVM_VERSION)
     find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)

build_files/cmake/Modules/FindLZO.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 Blender Foundation.
-
 # - Find LZO library
 # Find the native LZO includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  LZO_LIBRARY, where to find the LZO library.
 
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If LZO_ROOT_DIR was defined in the environment, use it.
 IF(NOT LZO_ROOT_DIR AND NOT $ENV{LZO_ROOT_DIR} STREQUAL "")
   SET(LZO_ROOT_DIR $ENV{LZO_ROOT_DIR})

build_files/cmake/Modules/FindNanoVDB.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Blender Foundation.
-
 # - Find NanoVDB library
 # Find the native NanoVDB includes and library
 # This module defines
@@ -10,6 +7,13 @@
 #                     This can also be an environment variable.
 #  NANOVDB_FOUND, If false, do not try to use NanoVDB.
 
+#=============================================================================
+# Copyright 2020 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If NANOVDB_ROOT_DIR was defined in the environment, use it.
 IF(NOT NANOVDB_ROOT_DIR AND NOT $ENV{NANOVDB_ROOT_DIR} STREQUAL "")
   SET(NANOVDB_ROOT_DIR $ENV{NANOVDB_ROOT_DIR})

build_files/cmake/Modules/FindOSL.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 Blender Foundation.
-
 # - Find OpenShadingLanguage library
 # Find the native OpenShadingLanguage includes and library
 # This module defines
@@ -13,6 +10,13 @@
 #  OSL_FOUND, if false, do not try to use OSL.
 #  OSL_LIBRARY_VERSION_MAJOR, OSL_LIBRARY_VERSION_MINOR,  the major
 #                and minor versions of OSL library if found.
+#
+#=============================================================================
+# Copyright 2014 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
 
 # If OSL_ROOT_DIR was defined in the environment, use it.
 IF(NOT OSL_ROOT_DIR AND NOT $ENV{OSL_ROOT_DIR} STREQUAL "")
@@ -72,7 +76,6 @@ FIND_PATH(OSL_SHADER_DIR
     /usr/include/OSL/
   PATH_SUFFIXES
     share/OSL/shaders
-    shaders
 )
 
 # handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if
@@ -96,7 +99,6 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   OSL_INCLUDE_DIR
-  OSL_SHADER_DIR
 )
 FOREACH(COMPONENT ${_osl_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)

build_files/cmake/Modules/FindOpenCOLLADA.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find OpenCOLLADA library
 # Find the native OpenCOLLADA includes and library
 # This module defines
@@ -11,6 +8,13 @@
 #                    This can also be an environment variable.
 #  OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # note about include paths, there are 2 ways includes are set
 #
 # Where '/usr/include/opencollada' is the root dir:

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2012 Blender Foundation.
-
 # - Find OpenColorIO library
 # Find the native OpenColorIO includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  OPENCOLORIO_LIBRARY, where to find the OpenColorIO library.
 
+#=============================================================================
+# Copyright 2012 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENCOLORIO_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "")
   SET(OPENCOLORIO_ROOT_DIR $ENV{OPENCOLORIO_ROOT_DIR})
@@ -83,14 +87,12 @@ ENDIF()
 MARK_AS_ADVANCED(
   OPENCOLORIO_INCLUDE_DIR
   OPENCOLORIO_LIBRARY
+  OPENCOLORIO_OPENCOLORIO_LIBRARY
+  OPENCOLORIO_TINYXML_LIBRARY
+  OPENCOLORIO_YAML-CPP_LIBRARY
   OPENCOLORIO_VERSION
 )
 
-FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  MARK_AS_ADVANCED(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()
-
 UNSET(COMPONENT)
 UNSET(UPPERCOMPONENT)
 UNSET(_opencolorio_FIND_COMPONENTS)

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find OpenEXR library
 # Find the native OpenEXR includes and library
 # This module defines
@@ -21,6 +18,13 @@
 # also defined, but not for general use are
 #  OPENEXR_LIBRARY, where to find the OpenEXR library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENEXR_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
   SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
@@ -29,6 +33,14 @@ ENDIF()
 # Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
 SET(_openexr_libs_ver_init "2.0")
 
+SET(_openexr_FIND_COMPONENTS
+  Half
+  Iex
+  IlmImf
+  IlmThread
+  Imath
+)
+
 SET(_openexr_SEARCH_DIRS
   ${OPENEXR_ROOT_DIR}
   /opt/lib/openexr
@@ -81,24 +93,6 @@ UNSET(_openexr_libs_ver_init)
 
 STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
 
-# Different library names in 3.0, and Imath and Half moved out.
-IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
-  SET(_openexr_FIND_COMPONENTS
-    Iex
-    IlmThread
-    OpenEXR
-    OpenEXRCore
-  )
-ELSE()
-  SET(_openexr_FIND_COMPONENTS
-    Half
-    Iex
-    IlmImf
-    IlmThread
-    Imath
-  )
-ENDIF()
-
 SET(_openexr_LIBRARIES)
 FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
@@ -117,57 +111,6 @@ ENDFOREACH()
 
 UNSET(_openexr_libs_ver)
 
-IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
-  # For OpenEXR 3.x, we also need to find the now separate Imath library.
-  # For simplicity we add it to the OpenEXR includes and libraries, as we
-  # have no direct dependency on Imath and it's simpler to support both
-  # 2.x and 3.x this way.
-
-  # Find include directory
-  FIND_PATH(IMATH_INCLUDE_DIR
-    NAMES
-      Imath/ImathMath.h
-    HINTS
-      ${_openexr_SEARCH_DIRS}
-    PATH_SUFFIXES
-      include
-  )
-
-  # Find version
-  FIND_FILE(_imath_config
-    NAMES
-      ImathConfig.h
-    PATHS
-      ${IMATH_INCLUDE_DIR}/Imath
-    NO_DEFAULT_PATH
-  )
-
-  # Find line with version, extract string, and format for library suffix.
-  FILE(STRINGS "${_imath_config}" _imath_build_specification
-       REGEX "^[ \t]*#define[ \t]+IMATH_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
-  STRING(REGEX REPLACE ".*#define[ \t]+IMATH_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
-         "\\1" _imath_libs_ver ${_imath_build_specification})
-  STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _imath_libs_ver ${_imath_libs_ver})
-
-  # Find library, with or without version number.
-  FIND_LIBRARY(IMATH_LIBRARY
-    NAMES
-      Imath-${_imath_libs_ver} Imath
-    NAMES_PER_DIR
-    HINTS
-      ${_openexr_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  LIST(APPEND _openexr_LIBRARIES "${IMATH_LIBRARY}")
-
-  # In cmake version 3.21 and up, we can instead use the NO_CACHE option for
-  # FIND_FILE so we don't need to clear it from the cache here.
-  UNSET(_imath_config CACHE)
-  UNSET(_imath_libs_ver)
-  UNSET(_imath_build_specification)
-ENDIF()
-
 # handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -176,25 +119,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
 
 IF(OPENEXR_FOUND)
   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-  # Both include paths are needed because of dummy OSL headers mixing
+  # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
-  # #include <OpenEXR/foo.h> and #include <foo.h>, as well as Alembic
+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-  # include <half.h> directly.
-  SET(OPENEXR_INCLUDE_DIRS
-    ${OPENEXR_INCLUDE_DIR}
-    ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-
-  IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
-    LIST(APPEND OPENEXR_INCLUDE_DIRS
-      ${IMATH_INCLUDE_DIR}
-      ${IMATH_INCLUDE_DIR}/Imath)
-  ENDIF()
 ENDIF()
 
 MARK_AS_ADVANCED(
   OPENEXR_INCLUDE_DIR
   OPENEXR_VERSION
-  IMATH_INCLUDE_DIR
-  IMATH_LIBRARY
 )
 FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)

build_files/cmake/Modules/FindOpenGLES.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 Blender Foundation.
-
 # - Try to find OpenGLES
 # Once done this will define
 #
@@ -13,6 +10,13 @@
 #  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
 #  OPENGLES_INCLUDES        - all includes needed for OpenGLES
 
+#=============================================================================
+# Copyright 2014 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENGLES_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENGLES_ROOT_DIR AND NOT $ENV{OPENGLES_ROOT_DIR} STREQUAL "")
   SET(OPENGLES_ROOT_DIR $ENV{OPENGLES_ROOT_DIR})

build_files/cmake/Modules/FindOpenImageDenoise.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Blender Foundation.
-
 # - Find OpenImageDenoise library
 # Find the native OpenImageDenoise includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  OPENIMAGEDENOISE_LIBRARY, where to find the OpenImageDenoise library.
 
+#=============================================================================
+# Copyright 2019 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENIMAGEDENOISE_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENIMAGEDENOISE_ROOT_DIR AND NOT $ENV{OPENIMAGEDENOISE_ROOT_DIR} STREQUAL "")
   SET(OPENIMAGEDENOISE_ROOT_DIR $ENV{OPENIMAGEDENOISE_ROOT_DIR})
@@ -106,7 +110,6 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   OPENIMAGEDENOISE_INCLUDE_DIR
-  OPENIMAGEDENOISE_LIBRARY
 )
 
 FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS})

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find OpenImageIO library
 # Find the native OpenImageIO includes and library
 # This module defines
@@ -16,6 +13,13 @@
 # also defined, but not for general use are
 #  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENIMAGEIO_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENIMAGEIO_ROOT_DIR AND NOT $ENV{OPENIMAGEIO_ROOT_DIR} STREQUAL "")
   SET(OPENIMAGEIO_ROOT_DIR $ENV{OPENIMAGEIO_ROOT_DIR})
@@ -44,8 +48,6 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
     lib64 lib
   )
 
-set(_openimageio_LIBRARIES ${OPENIMAGEIO_LIBRARY})
-
 FIND_FILE(OPENIMAGEIO_IDIFF
   NAMES
     idiff
@@ -55,47 +57,14 @@ FIND_FILE(OPENIMAGEIO_IDIFF
     bin
 )
 
-# Additionally find util library if needed. In old versions this library was
-# included in libOpenImageIO and linking to both would duplicate symbols. In
-# new versions we need to link to both.
-FIND_FILE(_openimageio_export
-  NAMES
-    export.h
-  PATHS
-    ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO
-  NO_DEFAULT_PATH
-)
-
-# Use existence of OIIO_UTIL_API to check if it's a separate lib.
-FILE(STRINGS "${_openimageio_export}" _openimageio_util_define
-     REGEX "^[ \t]*#[ \t]*define[ \t]+OIIO_UTIL_API.*$")
-
-IF(_openimageio_util_define)
-  FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
-    NAMES
-      OpenImageIO_Util
-    HINTS
-      ${_openimageio_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-
-  LIST(APPEND _openimageio_LIBRARIES ${OPENIMAGEIO_UTIL_LIBRARY})
-ENDIF()
-
-# In cmake version 3.21 and up, we can instead use the NO_CACHE option for
-# FIND_FILE so we don't need to clear it from the cache here.
-UNSET(_openimageio_export CACHE)
-UNSET(_openimageio_util_define)
-
 # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
-    _openimageio_LIBRARIES OPENIMAGEIO_INCLUDE_DIR)
+    OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
 
 IF(OPENIMAGEIO_FOUND)
-  SET(OPENIMAGEIO_LIBRARIES ${_openimageio_LIBRARIES})
+  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
@@ -109,9 +78,7 @@ ENDIF()
 MARK_AS_ADVANCED(
   OPENIMAGEIO_INCLUDE_DIR
   OPENIMAGEIO_LIBRARY
-  OPENIMAGEIO_UTIL_LIBRARY
   OPENIMAGEIO_IDIFF
 )
 
 UNSET(_openimageio_SEARCH_DIRS)
-UNSET(_openimageio_LIBRARIES)

build_files/cmake/Modules/FindOpenJPEG.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find OpenJPEG library
 # Find the native OpenJPEG includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENJPEG_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENJPEG_ROOT_DIR AND NOT $ENV{OPENJPEG_ROOT_DIR} STREQUAL "")
   SET(OPENJPEG_ROOT_DIR $ENV{OPENJPEG_ROOT_DIR})

build_files/cmake/Modules/FindOpenSubdiv.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2013 Blender Foundation.
-
 # - Find OpenSubdiv library
 # Find the native OpenSubdiv includes and library
 # This module defines
@@ -11,6 +8,13 @@
 #                        This can also be an environment variable.
 #  OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv.
 
+#=============================================================================
+# Copyright 2013 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENSUBDIV_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENSUBDIV_ROOT_DIR AND NOT $ENV{OPENSUBDIV_ROOT_DIR} STREQUAL "")
   SET(OPENSUBDIV_ROOT_DIR $ENV{OPENSUBDIV_ROOT_DIR})

build_files/cmake/Modules/FindOpenVDB.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 Blender Foundation.
-
 # - Find OPENVDB library
 # Find the native OPENVDB includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  OPENVDB_LIBRARY, where to find the OPENVDB library.
 
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPENVDB_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPENVDB_ROOT_DIR AND NOT $ENV{OPENVDB_ROOT_DIR} STREQUAL "")
   SET(OPENVDB_ROOT_DIR $ENV{OPENVDB_ROOT_DIR})

build_files/cmake/Modules/FindOptiX.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Blender Foundation.
-
 # - Find OptiX library
 # Find the native OptiX includes and library
 # This module defines
@@ -10,6 +7,13 @@
 #                     This can also be an environment variable.
 #  OPTIX_FOUND, If false, do not try to use OptiX.
 
+#=============================================================================
+# Copyright 2019 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If OPTIX_ROOT_DIR was defined in the environment, use it.
 IF(NOT OPTIX_ROOT_DIR AND NOT $ENV{OPTIX_ROOT_DIR} STREQUAL "")
   SET(OPTIX_ROOT_DIR $ENV{OPTIX_ROOT_DIR})

build_files/cmake/Modules/FindPCRE.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find PCRE library
 # Find the native PCRE includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  PCRE_LIBRARY, where to find the PCRE library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If PCRE_ROOT_DIR was defined in the environment, use it.
 IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
   SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})

build_files/cmake/Modules/FindPotrace.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Blender Foundation.
-
 # - Find potrace library
 # Find the potrace include and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  POTRACE_LIBRARY, where to find the POTRACE library.
 
+#=============================================================================
+# Copyright 2020 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If POTRACE_ROOT_DIR was defined in the environment, use it.
 IF(NOT POTRACE_ROOT_DIR AND NOT $ENV{POTRACE_ROOT_DIR} STREQUAL "")
   SET(POTRACE_ROOT_DIR $ENV{POTRACE_ROOT_DIR})

build_files/cmake/Modules/FindPugiXML.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 Blender Foundation.
-
 # - Find PugiXML library
 # Find the native PugiXML includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  PUGIXML_LIBRARY, where to find the PugiXML library.
 
+#=============================================================================
+# Copyright 2014 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If PUGIXML_ROOT_DIR was defined in the environment, use it.
 IF(NOT PUGIXML_ROOT_DIR AND NOT $ENV{PUGIXML_ROOT_DIR} STREQUAL "")
   SET(PUGIXML_ROOT_DIR $ENV{PUGIXML_ROOT_DIR})

build_files/cmake/Modules/FindPulse.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021 Blender Foundation.
-
 # - Find PulseAudio library
 # Find the native PulseAudio includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  LIBPULSE_LIBRARY, where to find the PulseAudio library.
 
+#=============================================================================
+# Copyright 2021 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If LIBPULSE_ROOT_DIR was defined in the environment, use it.
 IF(NOT LIBPULSE_ROOT_DIR AND NOT $ENV{LIBPULSE_ROOT_DIR} STREQUAL "")
   SET(LIBPULSE_ROOT_DIR $ENV{LIBPULSE_ROOT_DIR})

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find Python libraries
 # Find the native Python includes and library
 #
@@ -25,6 +22,13 @@
 # also defined, but not for general use are
 #  PYTHON_LIBRARY, where to find the python library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If PYTHON_ROOT_DIR was defined in the environment, use it.
 IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
   SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})

build_files/cmake/Modules/FindSDL2.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 Blender Foundation.
-
 # - Find SDL library
 # Find the native SDL includes and library
 # This module defines
@@ -13,6 +10,13 @@
 # also defined, but not for general use are
 #  SDL2_LIBRARY, where to find the SDL library.
 
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If SDL2_ROOT_DIR was defined in the environment, use it.
 IF(NOT SDL2_ROOT_DIR AND NOT $ENV{SDL2_ROOT_DIR} STREQUAL "")
   SET(SDL2_ROOT_DIR $ENV{SDL2_ROOT_DIR})

build_files/cmake/Modules/FindSndFile.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find SndFile library
 # Find the native SndFile includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  LIBSNDFILE_LIBRARY, where to find the SndFile library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
 IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "")
   SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})

build_files/cmake/Modules/FindSpacenav.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find Spacenav library
 # Find the native Spacenav includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  SPACENAV_LIBRARY, where to find the Spacenav library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If SPACENAV_ROOT_DIR was defined in the environment, use it.
 IF(NOT SPACENAV_ROOT_DIR AND NOT $ENV{SPACENAV_ROOT_DIR} STREQUAL "")
   SET(SPACENAV_ROOT_DIR $ENV{SPACENAV_ROOT_DIR})

build_files/cmake/Modules/FindTBB.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Blender Foundation.
-
 # - Find TBB library
 # Find the native TBB includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  TBB_LIBRARY, where to find the TBB library.
 
+#=============================================================================
+# Copyright 2016 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If TBB_ROOT_DIR was defined in the environment, use it.
 IF(NOT TBB_ROOT_DIR AND NOT $ENV{TBB_ROOT_DIR} STREQUAL "")
   SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR})

build_files/cmake/Modules/FindUSD.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Blender Foundation.
-
 # - Find Universal Scene Description (USD) library
 # Find the native USD includes and libraries
 # This module defines
@@ -12,6 +9,13 @@
 #  USD_FOUND, If false, do not try to use USD.
 #
 
+#=============================================================================
+# Copyright 2019 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If USD_ROOT_DIR was defined in the environment, use it.
 IF(NOT USD_ROOT_DIR AND NOT $ENV{USD_ROOT_DIR} STREQUAL "")
   SET(USD_ROOT_DIR $ENV{USD_ROOT_DIR})
@@ -32,12 +36,9 @@ FIND_PATH(USD_INCLUDE_DIR
   DOC "Universal Scene Description (USD) header files"
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
-# See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
 FIND_LIBRARY(USD_LIBRARY
   NAMES
-    usd_usd_m usd_usd_ms usd_m usd_ms
+    usd_m usd_ms
-    ${PXR_LIB_PREFIX}usd
   NAMES_PER_DIR
   HINTS
     ${_usd_SEARCH_DIRS}

build_files/cmake/Modules/FindWebP.cmake

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

build_files/cmake/Modules/FindXML2.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2011 Blender Foundation.
-
 # - Find XML2 library
 # Find the native XML2 includes and library
 # This module defines
@@ -14,6 +11,13 @@
 # also defined, but not for general use are
 #  XML2_LIBRARY, where to find the XML2 library.
 
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If XML2_ROOT_DIR was defined in the environment, use it.
 IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "")
   SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR})

build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-
 # - Find OpenXR-SDK libraries
 # Find the native OpenXR-SDK includes and libraries
 #
@@ -21,6 +19,11 @@
 # also defined, but not for general use are
 #  XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library.
 
+#=============================================================================
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If XR_OPENXR_SDK_ROOT_DIR was defined in the environment, use it.
 IF(NOT XR_OPENXR_SDK_ROOT_DIR AND NOT $ENV{XR_OPENXR_SDK_ROOT_DIR} STREQUAL "")
   SET(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR})

build_files/cmake/Modules/FindZstd.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Blender Foundation.
-
 # - Find Zstd library
 # Find the native Zstd includes and library
 # This module defines
@@ -14,6 +11,17 @@
 # also defined, but not for general use are
 #  ZSTD_LIBRARY, where to find the Zstd library.
 
+#=============================================================================
+# Copyright 2019 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
 # If ZSTD_ROOT_DIR was defined in the environment, use it.
 IF(NOT ZSTD_ROOT_DIR AND NOT $ENV{ZSTD_ROOT_DIR} STREQUAL "")
   SET(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR})

build_files/cmake/Modules/Findsse2neon.cmake

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Blender Foundation.
-
 # - Find sse2neon library
 # Find the native sse2neon includes and library
 # This module defines
@@ -10,6 +7,13 @@
 #                     This can also be an environment variable.
 #  SSE2NEON_FOUND, If false, do not try to use sse2neon.
 
+#=============================================================================
+# Copyright 2020 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#=============================================================================
+
 # If SSE2NEON_ROOT_DIR was defined in the environment, use it.
 IF(NOT SSE2NEON_ROOT_DIR AND NOT $ENV{SSE2NEON_ROOT_DIR} STREQUAL "")
   SET(SSE2NEON_ROOT_DIR $ENV{SSE2NEON_ROOT_DIR})

build_files/cmake/Modules/GTest.cmake

@@ -1,4 +1,5 @@
-# SPDX-License-Identifier: BSD-3-Clause
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
 
 #[=======================================================================[.rst:
 GoogleTest

build_files/cmake/Modules/GTestTesting.cmake

@@ -1,7 +1,12 @@
-# SPDX-License-Identifier: BSD-3-Clause
+#=============================================================================
 # Copyright 2014 Blender Foundation.
-
+#
+# Distributed under the OSI-approved BSD 3-Clause License,
+# see accompanying file BSD-3-Clause-license.txt for details.
+#
 # Inspired on the Testing.cmake from Libmv
+#
+#=============================================================================
 
 function(GET_BLENDER_TEST_INSTALL_DIR VARIABLE_NAME)
   get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

build_files/cmake/RpmBuild.cmake

@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # VLMC RPM Finder
 # Authors: Rohit Yadav <rohityadav89@gmail.com>
+#
 
 if(NOT DEFINED RPMBUILD)
 

build_files/cmake/buildinfo.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # This is called by cmake as an external process from
 # ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
 # Caller must define:

build_files/cmake/cmake_consistency_check.py

@@ -0,0 +1,388 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# <pep8 compliant>
+
+# Note: this code should be cleaned up / refactored.
+
+import sys
+if sys.version_info.major < 3:
+    print("\nPython3.x needed, found %s.\nAborting!\n" %
+          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,
+    IGNORE_CMAKE,
+    UTF8_CHECK,
+    SOURCE_DIR,
+    BUILD_DIR,
+)
+
+from typing import (
+    Callable,
+    Dict,
+    Generator,
+    Iterator,
+    List,
+    Optional,
+    Tuple,
+)
+
+
+global_h = set()
+global_c = set()
+global_refs: Dict[str, List[Tuple[str, int]]] = {}
+
+# Flatten `IGNORE_SOURCE_MISSING` to avoid nested looping.
+IGNORE_SOURCE_MISSING_FLAT = [
+    (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.setdefault(k, []).append(v)
+del IGNORE_SOURCE_MISSING_FLAT
+
+
+def replace_line(f: str, i: int, text: str, keep_indent: bool = True) -> None:
+    file_handle = open(f, 'r')
+    data = file_handle.readlines()
+    file_handle.close()
+
+    l = data[i]
+    ws = l[:len(l) - len(l.lstrip())]
+
+    data[i] = "%s%s\n" % (ws, text)
+
+    file_handle = open(f, 'w')
+    file_handle.writelines(data)
+    file_handle.close()
+
+
+def source_list(
+        path: str,
+        filename_check: Optional[Callable[[str], bool]] = None,
+) -> Generator[str, None, None]:
+    for dirpath, dirnames, filenames in os.walk(path):
+        # skip '.git'
+        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
+
+        for filename in filenames:
+            if filename_check is None or filename_check(filename):
+                yield os.path.join(dirpath, filename)
+
+
+# extension checking
+def is_cmake(filename: str) -> bool:
+    ext = splitext(filename)[1]
+    return (ext == ".cmake") or (filename == "CMakeLists.txt")
+
+
+def is_c_header(filename: str) -> bool:
+    ext = splitext(filename)[1]
+    return (ext in {".h", ".hpp", ".hxx", ".hh"})
+
+
+def is_c(filename: str) -> bool:
+    ext = splitext(filename)[1]
+    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".metal"})
+
+
+def is_c_any(filename: str) -> bool:
+    return is_c(filename) or is_c_header(filename)
+
+
+def cmake_get_src(f: str) -> None:
+
+    sources_h = []
+    sources_c = []
+
+    filen = open(f, "r", encoding="utf8")
+    it: Optional[Iterator[str]] = iter(filen)
+    found = False
+    i = 0
+    # print(f)
+
+    def is_definition(l: str, f: str, i: int, name: str) -> bool:
+        if l.startswith("unset("):
+            return False
+
+        if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
+            if len(l.split()) > 1:
+                raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))
+            return True
+
+        if ("list(APPEND %s" % name) in l or ('list(APPEND ' in l and l.endswith(name)):
+            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 = ""
+        while it is not None:
+            i += 1
+            try:
+                l = next(it)
+            except StopIteration:
+                it = None
+                break
+            l = l.strip()
+            if not l.startswith("#"):
+                found = is_definition(l, f, i, "SRC")
+                if found:
+                    context_name = "SRC"
+                    break
+                found = is_definition(l, f, i, "INC")
+                if found:
+                    context_name = "INC"
+                    break
+
+        if found:
+            cmake_base = dirname(f)
+            cmake_base_bin = os.path.join(BUILD_DIR, os.path.relpath(cmake_base, SOURCE_DIR))
+
+            # Find known missing sources list (if we have one).
+            f_rel = os.path.relpath(f, SOURCE_DIR)
+            f_rel_key = f_rel
+            if os.sep != "/":
+                f_rel_key = f_rel_key.replace(os.sep, "/")
+            local_ignore_source_missing = global_ignore_source_missing.get(f_rel_key, [])
+
+            while it is not None:
+                i += 1
+                try:
+                    l = next(it)
+                except StopIteration:
+                    it = None
+                    break
+
+                l = l.strip()
+
+                if not l.startswith("#"):
+
+                    # Remove in-line comments.
+                    l = l.split(" # ")[0].rstrip()
+
+                    if ")" in l:
+                        if l.strip() != ")":
+                            raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
+                        break
+
+                    # replace dirs
+                    l = l.replace("${CMAKE_SOURCE_DIR}", SOURCE_DIR)
+                    l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
+                    l = l.replace("${CMAKE_CURRENT_BINARY_DIR}", cmake_base_bin)
+                    l = l.strip('"')
+
+                    if not l:
+                        pass
+                    elif l in local_ignore_source_missing:
+                        local_ignore_source_missing.remove(l)
+                    elif l.startswith("$"):
+                        if context_name == "SRC":
+                            # assume if it ends with context_name we know about it
+                            if not l.split("}")[0].endswith(context_name):
+                                print("Can't use var '%s' %s:%d" % (l, f, i))
+                    elif len(l.split()) > 1:
+                        raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
+                    else:
+                        new_file = normpath(join(cmake_base, l))
+
+                        if context_name == "SRC":
+                            if is_c_header(new_file):
+                                sources_h.append(new_file)
+                                global_refs.setdefault(new_file, []).append((f, i))
+                            elif is_c(new_file):
+                                sources_c.append(new_file)
+                                global_refs.setdefault(new_file, []).append((f, i))
+                            elif l in {"PARENT_SCOPE", }:
+                                # cmake var, ignore
+                                pass
+                            elif new_file.endswith(".list"):
+                                pass
+                            elif new_file.endswith(".def"):
+                                pass
+                            elif new_file.endswith(".cl"):  # opencl
+                                pass
+                            elif new_file.endswith(".cu"):  # cuda
+                                pass
+                            elif new_file.endswith(".osl"):  # open shading language
+                                pass
+                            elif new_file.endswith(".glsl"):
+                                pass
+                            else:
+                                raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
+
+                        elif context_name == "INC":
+                            if new_file.startswith(BUILD_DIR):
+                                # assume generated path
+                                pass
+                            elif os.path.isdir(new_file):
+                                new_path_rel = os.path.relpath(new_file, cmake_base)
+
+                                if new_path_rel != l:
+                                    print("overly relative path:\n  %s:%d\n  %s\n  %s" % (f, i, l, new_path_rel))
+
+                                    # # Save time. just replace the line
+                                    # replace_line(f, i - 1, new_path_rel)
+
+                            else:
+                                raise Exception("non existent include %s:%d -> %s" % (f, i, new_file))
+
+                        # print(new_file)
+
+            global_h.update(set(sources_h))
+            global_c.update(set(sources_c))
+            '''
+            if not sources_h and not sources_c:
+                raise Exception("No sources %s" % f)
+
+            sources_h_fs = list(source_list(cmake_base, is_c_header))
+            sources_c_fs = list(source_list(cmake_base, is_c))
+            '''
+            # find missing C files:
+            '''
+            for ff in sources_c_fs:
+                if ff not in sources_c:
+                    print("  missing: " + ff)
+            '''
+
+            # reset
+            del sources_h[:]
+            del sources_c[:]
+
+    filen.close()
+
+
+def is_ignore_source(f: str, ignore_used: List[bool]) -> bool:
+    for index, ignore_path in enumerate(IGNORE_SOURCE):
+        if ignore_path in f:
+            ignore_used[index] = True
+            return True
+    return False
+
+
+def is_ignore_cmake(f: str, ignore_used: List[bool]) -> bool:
+    for index, ignore_path in enumerate(IGNORE_CMAKE):
+        if ignore_path in f:
+            ignore_used[index] = True
+            return True
+    return False
+
+
+def main() -> None:
+
+    print("Scanning:", SOURCE_DIR)
+
+    ignore_used_source = [False] * len(IGNORE_SOURCE)
+    ignore_used_cmake = [False] * len(IGNORE_CMAKE)
+
+    for cmake in source_list(SOURCE_DIR, is_cmake):
+        if not is_ignore_cmake(cmake, ignore_used_cmake):
+            cmake_get_src(cmake)
+
+    # First do stupid check, do these files exist?
+    print("\nChecking for missing references:")
+    is_err = False
+    errs = []
+    for f in (global_h | global_c):
+        if f.startswith(BUILD_DIR):
+            continue
+
+        if not os.path.exists(f):
+            refs = global_refs[f]
+            if refs:
+                for cf, i in refs:
+                    errs.append((cf, i))
+            else:
+                raise Exception("CMake references missing, internal error, aborting!")
+            is_err = True
+
+    errs.sort()
+    errs.reverse()
+    for cf, i in errs:
+        print("%s:%d" % (cf, i))
+        # Write a 'sed' script, useful if we get a lot of these
+        # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
+
+    if is_err:
+        raise Exception("CMake references missing files, aborting!")
+    del is_err
+    del errs
+
+    # now check on files not accounted for.
+    print("\nC/C++ Files CMake does not know about...")
+    for cf in sorted(source_list(SOURCE_DIR, is_c)):
+        if not is_ignore_source(cf, ignore_used_source):
+            if cf not in global_c:
+                print("missing_c: ", cf)
+
+            # Check if automake builds a corresponding .o file.
+            '''
+            if cf in global_c:
+                out1 = os.path.splitext(cf)[0] + ".o"
+                out2 = os.path.splitext(cf)[0] + ".Po"
+                out2_dir, out2_file = out2 = os.path.split(out2)
+                out2 = os.path.join(out2_dir, ".deps", out2_file)
+                if not os.path.exists(out1) and not os.path.exists(out2):
+                    print("bad_c: ", cf)
+            '''
+
+    print("\nC/C++ Headers CMake does not know about...")
+    for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
+        if not is_ignore_source(hf, ignore_used_source):
+            if hf not in global_h:
+                print("missing_h: ", hf)
+
+    if UTF8_CHECK:
+        # test encoding
+        import traceback
+        for files in (global_c, global_h):
+            for f in sorted(files):
+                if os.path.exists(f):
+                    # ignore outside of our source tree
+                    if "extern" not in f:
+                        i = 1
+                        try:
+                            for _ in open(f, "r", encoding="utf8"):
+                                i += 1
+                        except UnicodeDecodeError:
+                            print("Non utf8: %s:%d" % (f, i))
+                            if i > 1:
+                                traceback.print_exc()
+
+    # Check ignores aren't stale
+    print("\nCheck for unused 'IGNORE_SOURCE' paths...")
+    for index, ignore_path in enumerate(IGNORE_SOURCE):
+        if not ignore_used_source[index]:
+            print("unused ignore: %r" % ignore_path)
+
+    # Check ignores aren't stale
+    print("\nCheck for unused 'IGNORE_SOURCE_MISSING' paths...")
+    for k, v in sorted(global_ignore_source_missing.items()):
+        for ignore_path in v:
+            print("unused ignore: %r -> %r" % (ignore_path, k))
+
+    # Check ignores aren't stale
+    print("\nCheck for unused 'IGNORE_CMAKE' paths...")
+    for index, ignore_path in enumerate(IGNORE_CMAKE):
+        if not ignore_used_cmake[index]:
+            print("unused ignore: %r" % ignore_path)
+
+
+if __name__ == "__main__":
+    main()

build_files/cmake/cmake_consistency_check_config.py

@@ -0,0 +1,63 @@
+import os
+
+IGNORE_SOURCE = (
+    "/test/",
+    "/tests/gtests/",
+    "/release/",
+
+    # specific source files
+    "extern/audaspace/",
+
+    # Use for `WIN32` only.
+    "source/creator/blender_launcher_win32.c",
+
+    # specific source files
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
+    "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp",
+    "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp",
+    "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp",
+    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
+    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
+
+    "doc/doxygen/doxygen.extern.h",
+    "doc/doxygen/doxygen.intern.h",
+    "doc/doxygen/doxygen.main.h",
+    "doc/doxygen/doxygen.source.h",
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
+    "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h",
+    "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h",
+    "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h",
+    "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
+    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
+    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
+)
+
+# Ignore cmake file, path pairs.
+IGNORE_SOURCE_MISSING = (
+    (   # Use for cycles stand-alone.
+        "intern/cycles/util/CMakeLists.txt", (
+            "../../third_party/numaapi/include",
+        )),
+    (   # Use for `WITH_NANOVDB`.
+        "intern/cycles/kernel/CMakeLists.txt", (
+            "nanovdb/util/CSampleFromVoxels.h",
+            "nanovdb/util/SampleFromVoxels.h",
+            "nanovdb/NanoVDB.h",
+            "nanovdb/CNanoVDB.h",
+        ),
+    ),
+)
+
+IGNORE_CMAKE = (
+    "extern/audaspace/CMakeLists.txt",
+)
+
+UTF8_CHECK = True
+
+SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))))
+
+# doesn't have to exist, just use as reference
+BUILD_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(SOURCE_DIR, "..", "build"))))

build_files/cmake/cmake_netbeans_project.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_qtcreator_project.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_clang_array.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_cppcheck.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_smatch.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_sparse.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_splint.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/cmake/config/blender_developer.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # Configuration for developers, with faster builds, error checking and tests.
 #
 # Example usage:

build_files/cmake/config/blender_full.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # Turn everything ON that's expected for an official release builds.
 #
 # Example usage:

build_files/cmake/config/blender_headless.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # headless configuration, useful in for servers or renderfarms
 # builds without a windowing system (X11/Windows/Cocoa).
 #

build_files/cmake/config/blender_lite.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # turn everything OFF except for python which defaults to ON
 # and is needed for the UI
 #

build_files/cmake/config/blender_release.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # Turn everything ON that's expected for an official release builds.
 #
 # Example usage:

build_files/cmake/config/bpy_module.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # defaults for building blender as a python module 'bpy'
 #
 # Example usage:

build_files/cmake/config/cycles_standalone.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # only compile Cycles standalone, without Blender
 #
 # Example usage:

build_files/cmake/example_scripts/cmake_linux_install.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0-or-later
 
 # This shell script checks out and compiles blender, tested on ubuntu 10.04
 # assumes you have dependencies installed already

build_files/cmake/macros.cmake

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

build_files/cmake/packaging.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 string(TIMESTAMP CURRENT_YEAR "%Y")
 
 set(PROJECT_DESCRIPTION  "Blender is the free and open source 3D creation suite software.")
@@ -106,8 +104,8 @@ if(WIN32)
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
 endif()
 
-set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender")
+set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "blender")
-set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender")
+set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "blender")
 
 include(CPack)
 

build_files/cmake/platform/platform_apple.cmake

@@ -232,15 +232,6 @@ if(WITH_IMAGE_TIFF)
   endif()
 endif()
 
-if(WITH_IMAGE_WEBP)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  find_package(WebP)
-  if(NOT WEBP_FOUND)
-    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
-    set(WITH_IMAGE_WEBP OFF)
-  endif()
-endif()
-
 if(WITH_BOOST)
   set(Boost_NO_BOOST_CMAKE ON)
   set(BOOST_ROOT ${LIBDIR}/boost)

build_files/cmake/platform/platform_unix.cmake

@@ -345,7 +345,6 @@ if(WITH_BOOST)
       find_package(IcuLinux)
     endif()
     mark_as_advanced(Boost_DIR)  # why doesn't boost do this?
-    mark_as_advanced(Boost_INCLUDE_DIR)  # why doesn't boost do this?
   endif()
 
   set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -368,14 +367,6 @@ if(WITH_PUGIXML)
   endif()
 endif()
 
-if(WITH_IMAGE_WEBP)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  find_package_wrapper(WebP)
-  if(NOT WEBP_FOUND)
-    set(WITH_IMAGE_WEBP OFF)
-  endif()
-endif()
-
 if(WITH_OPENIMAGEIO)
   find_package_wrapper(OpenImageIO)
   set(OPENIMAGEIO_LIBRARIES
@@ -857,45 +848,3 @@ if(WITH_COMPILER_CCACHE)
     set(WITH_COMPILER_CCACHE OFF)
   endif()
 endif()
-
-# On some platforms certain atomic operations are not possible with assembly and/or intrinsics and
-# they are emulated in software with locks. For example, on armel there is no intrinsics to grant
-# 64 bit atomic operations and STL library uses libatomic to offload software emulation of atomics
-# to.
-# This function will check whether libatomic is required and if so will configure linker flags.
-# If atomic operations are possible without libatomic then linker flags are left as-is.
-function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
-  # Source which is used to enforce situation when software emulation of atomics is required.
-  # Assume that using 64bit integer gives a definitive answer (as in, if 64bit atomic operations
-  # are possible using assembly/intrinsics 8, 16, and 32 bit operations will also be possible.
-  set(_source
-      "#include <atomic>
-      #include <cstdint>
-      int main(int argc, char **argv) {
-        std::atomic<uint64_t> uint64; uint64++;
-        return 0;
-      }")
-
-  include(CheckCXXSourceCompiles)
-  check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITHOUT_LIBATOMIC)
-
-  if(NOT ATOMIC_OPS_WITHOUT_LIBATOMIC)
-    # Compilation of the test program has failed.
-    # Try it again with -latomic to see if this is what is needed, or whether something else is
-    # going on.
-
-    set(CMAKE_REQUIRED_LIBRARIES atomic)
-    check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC)
-
-    if(ATOMIC_OPS_WITH_LIBATOMIC)
-      set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE)
-    else()
-      # Atomic operations are required part of Blender and it is not possible to process forward.
-      # We expect that either standard library or libatomic will make atomics to work. If both
-      # cases has failed something fishy o na bigger scope is going on.
-      message(FATAL_ERROR "Failed to detect required configuration for atomic operations")
-    endif()
-  endif()
-endfunction()
-
-CONFIGURE_ATOMIC_LIB_IF_NEEDED()

build_files/cmake/platform/platform_win32.cmake

@@ -39,12 +39,12 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(WITH_WINDOWS_STRIPPED_PDB OFF)
   endif()
 else()
-  if(WITH_BLENDER AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28.29921) # MSVC 2019 16.9.16
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28.29921) # MSVC 2019 16.9.16
     message(FATAL_ERROR "Compiler is unsupported, MSVC 2019 16.9.16 or newer is required for building blender.")
   endif()
 endif()
 
-if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE)
+if(NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
 
@@ -238,6 +238,7 @@ else()
 endif()
 
 if(NOT DEFINED LIBDIR)
+
   # Setup 64bit and 64bit windows systems
   if(CMAKE_CL_64)
     message(STATUS "64 bit compiler detected.")
@@ -251,9 +252,6 @@ if(NOT DEFINED LIBDIR)
   elseif(MSVC_VERSION GREATER 1919)
     message(STATUS "Visual Studio 2019 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
-  elseif(MSVC_VERSION GREATER 1909)
-    message(STATUS "Visual Studio 2017 detected.")
-    set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   endif()
 else()
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
@@ -302,8 +300,9 @@ set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
 set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
 set(ZLIB_DIR ${LIBDIR}/zlib)
 
-windows_find_package(ZLIB) # we want to find before finding things that depend on it like png
+windows_find_package(zlib) # we want to find before finding things that depend on it like png
-windows_find_package(PNG)
+windows_find_package(png)
+
 if(NOT PNG_FOUND)
   warn_hardcoded_paths(libpng)
   set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
@@ -314,9 +313,9 @@ if(NOT PNG_FOUND)
 endif()
 
 set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
-windows_find_package(JPEG REQUIRED)
+windows_find_package(jpeg REQUIRED)
 if(NOT JPEG_FOUND)
-  warn_hardcoded_paths(libjpeg)
+  warn_hardcoded_paths(jpeg)
   set(JPEG_INCLUDE_DIR ${LIBDIR}/jpeg/include)
   set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
 endif()
@@ -334,7 +333,7 @@ set(FREETYPE_LIBRARIES
   ${LIBDIR}/brotli/lib/brotlidec-static.lib
   ${LIBDIR}/brotli/lib/brotlicommon-static.lib
 )
-windows_find_package(Freetype REQUIRED)
+windows_find_package(freetype REQUIRED)
 
 if(WITH_FFTW3)
   set(FFTW3 ${LIBDIR}/fftw3)
@@ -343,16 +342,6 @@ if(WITH_FFTW3)
   set(FFTW3_LIBPATH ${FFTW3}/lib)
 endif()
 
-windows_find_package(WebP)
-if(NOT WEBP_FOUND)
-  if(EXISTS ${LIBDIR}/webp)
-    set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
-    set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-    set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
-    set(WEBP_FOUND ON)
-  endif()
-endif()
-
 if(WITH_OPENCOLLADA)
   set(OPENCOLLADA ${LIBDIR}/opencollada)
 
@@ -400,9 +389,9 @@ if(WITH_CODEC_FFMPEG)
     ${LIBDIR}/ffmpeg/include
     ${LIBDIR}/ffmpeg/include/msvc
   )
-  windows_find_package(FFmpeg)
+  windows_find_package(FFMPEG)
-  if(NOT FFmpeg_FOUND)
+  if(NOT FFMPEG_FOUND)
-    warn_hardcoded_paths(FFmpeg)
+    warn_hardcoded_paths(ffmpeg)
     set(FFMPEG_LIBRARIES
       ${LIBDIR}/ffmpeg/lib/avcodec.lib
       ${LIBDIR}/ffmpeg/lib/avformat.lib
@@ -414,10 +403,10 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_IMAGE_OPENEXR)
-  windows_find_package(OpenEXR REQUIRED)
+  set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
-  if(NOT OpenEXR_FOUND)
+  set(OPENEXR_VERSION "2.1")
-    set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
+  windows_find_package(OPENEXR REQUIRED)
-    set(OPENEXR_VERSION "2.1")
+  if(NOT OPENEXR_FOUND)
     warn_hardcoded_paths(OpenEXR)
     set(OPENEXR ${LIBDIR}/openexr)
     set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
@@ -531,20 +520,17 @@ if(WITH_BOOST)
     set(BOOST_LIBRARIES ${Boost_LIBRARIES})
     set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
   endif()
-
   set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 endif()
 
 if(WITH_OPENIMAGEIO)
   windows_find_package(OpenImageIO)
-  if(NOT OpenImageIO_FOUND)
+  set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
-    set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
+  set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-    set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+  set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+  set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
-    set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
+  set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
-    set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
+  set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-    set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-  endif()
 
   set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
@@ -575,38 +561,31 @@ if(WITH_LLVM)
     message(WARNING "LLVM debug libs not present on this system. Using release libs for debug builds.")
     set(LLVM_LIBRARY ${LLVM_LIBRARY_OPTIMIZED})
   endif()
+
 endif()
 
 if(WITH_OPENCOLORIO)
-  windows_find_package(OpenColorIO)
+  set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
-  if(NOT OpenColorIO_FOUND)
+  set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-    set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
+  set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-    set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+  set(OPENCOLORIO_LIBRARIES
-    set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+    optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-    set(OPENCOLORIO_LIBRARIES
+    optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-      optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+    optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
-      optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
+    optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
-      optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
+    debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-      optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
+    debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
-      debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+    debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
-      debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
+    debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-      debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
+  )
-      debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-    )
-  endif()
-
   set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
 if(WITH_OPENVDB)
-  windows_find_package(OpenVDB)
+  set(OPENVDB ${LIBDIR}/openVDB)
-  if(NOT OpenVDB_FOUND)
+  set(OPENVDB_LIBPATH ${OPENVDB}/lib)
-    set(OPENVDB ${LIBDIR}/openVDB)
+  set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-    set(OPENVDB_LIBPATH ${OPENVDB}/lib)
+  set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib )
-    set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-    set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib)
-  endif()
-
   set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
 endif()
 
@@ -645,24 +624,21 @@ if(WITH_IMAGE_OPENJPEG)
 endif()
 
 if(WITH_OPENSUBDIV)
+  set(OPENSUBDIV_INCLUDE_DIRS ${LIBDIR}/opensubdiv/include)
+  set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
+  set(OPENSUBDIV_LIBRARIES
+    optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
+    optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
+    debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
+    debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
+  )
+  set(OPENSUBDIV_HAS_OPENMP TRUE)
+  set(OPENSUBDIV_HAS_TBB FALSE)
+  set(OPENSUBDIV_HAS_OPENCL TRUE)
+  set(OPENSUBDIV_HAS_CUDA FALSE)
+  set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
+  set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
   windows_find_package(OpenSubdiv)
-  if(NOT OpenSubdiv_FOUND)
-    set(OPENSUBDIV ${LIBDIR}/opensubdiv)
-    set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV}/include)
-    set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
-    set(OPENSUBDIV_LIBRARIES
-      optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
-      optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
-      debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
-      debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
-    )
-    set(OPENSUBDIV_HAS_OPENMP TRUE)
-    set(OPENSUBDIV_HAS_TBB FALSE)
-    set(OPENSUBDIV_HAS_OPENCL TRUE)
-    set(OPENSUBDIV_HAS_CUDA FALSE)
-    set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
-    set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
-  endif()
 endif()
 
 if(WITH_SDL)
@@ -683,15 +659,12 @@ if(WITH_SYSTEM_AUDASPACE)
 endif()
 
 if(WITH_TBB)
-  windows_find_package(TBB)
+  set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
-  if(NOT TBB_FOUND)
+  set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
-    set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
+  set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
-    set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
+  if(WITH_TBB_MALLOC_PROXY)
-    set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
+    set(TBB_MALLOC_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbbmalloc.lib debug ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib)
-    if(WITH_TBB_MALLOC_PROXY)
+    add_definitions(-DWITH_TBB_MALLOC)
-      set(TBB_MALLOC_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbbmalloc.lib debug ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib)
-      add_definitions(-DWITH_TBB_MALLOC)
-    endif()
   endif()
 endif()
 
@@ -710,6 +683,7 @@ if(WITH_OPENAL)
   else()
     set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib)
   endif()
+
 endif()
 
 if(WITH_CODEC_SNDFILE)
@@ -754,7 +728,7 @@ endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   windows_find_package(Embree)
-  if(NOT Embree_FOUND)
+  if(NOT EMBREE_FOUND)
     set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
     set(EMBREE_LIBRARIES
       optimized ${LIBDIR}/embree/lib/embree3.lib
@@ -782,6 +756,7 @@ endif()
 if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
+    set(USD_FOUND ON)
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
     set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
     set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)

build_files/cmake/platform/platform_win32_bundle_crt.cmake

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # First generate the manifest for tests since it will not need the dependency on the CRT.
 configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
 

build_files/cmake/project_info.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>

build_files/package_spec/build_archive.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0-or-later
 
 # <pep8 compliant>
 

build_files/utils/make_source_archive.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0-or-later
 
 import argparse
 import dataclasses

build_files/utils/make_test.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0-or-later
+#
-
+# "make test" for all platforms, running automated tests.
-"""
-"make test" for all platforms, running automated tests.
-"""
 
 import argparse
 import os

build_files/utils/make_update.py

@@ -1,13 +1,10 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0-or-later
+#
-
+# "make update" for all platforms, updating svn libraries and tests and Blender
-"""
+# git repository and submodules.
-"make update" for all platforms, updating svn libraries and tests and Blender
+#
-git repository and sub-modules.
+# For release branches, this will check out the appropriate branches of
-
+# submodules and libraries.
-For release branches, this will check out the appropriate branches of
-sub-modules and libraries.
-"""
 
 import argparse
 import os

build_files/utils/make_utils.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-2.0-or-later
+#
-
+# Utility functions for make update and make tests.
-"""
-Utility functions for make update and make tests.
-"""
 
 import re
 import shutil

build_files/windows/find_dependencies.cmd

@@ -5,7 +5,7 @@ for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X)
 for %%X in (git.exe) do (set GIT=%%~$PATH:X)
 REM For python, default on 39 but if that does not exist also check
 REM the 310,311 and 312 folders to see if those are there, it checks
-REM this far ahead to ensure good lib folder compatibility in the future.
+REM this far ahead to ensure good lib folder compatiblity in the future.
 set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
 if EXIST %PYTHON% (
 	goto detect_python_done

doc/blender_file_format/BlendFileDnaExporter_25.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ######################################################

doc/blender_file_format/BlendFileReader.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ######################################################

doc/doxygen/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.9.3
+# Doxyfile 1.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,6 +93,14 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -250,16 +258,16 @@ TAB_SIZE               = 4
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:^^"
+# "sideeffect=@par Side Effects:\n"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# "Side Effects:". You can put \n's in the value part of an alias to insert
-# to insert newlines (in the resulting output). You can put ^^ in the value part
+# newlines (in the resulting output). You can put ^^ in the value part of an
-# of an alias to insert a newline as if a physical newline was in the original
+# alias to insert a newline as if a physical newline was in the original file.
-# file. When you need a literal { or } or , in the value part of an alias you
+# When you need a literal { or } or , in the value part of an alias you have to
-# have to escape them by means of a backslash (\), this can lead to conflicts
+# escape them by means of a backslash (\), this can lead to conflicts with the
-# with the commands \{ and \} for these it is advised to use the version @{ and
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# @} or use a double escape (\\{ and \\})
+# a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -304,8 +312,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -458,7 +466,7 @@ LOOKUP_CACHE_SIZE      = 3
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which effectively disables parallel processing. Please report any issues you
+# which efficively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -602,12 +610,6 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
-# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
-# will show which file needs to be included to use the class.
-# The default value is: YES.
-
-SHOW_HEADERFILE        = YES
-
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -765,8 +767,7 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file. See also section "Changing the
+# will be used as the name of the layout file.
-# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -812,26 +813,18 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = NO
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as documenting some parameters in
+# potential errors in the documentation, such as not documenting some parameters
-# a documented function twice, or documenting parameters that don't exist or
+# in a documented function, or documenting parameters that don't exist or using
-# using markup commands wrongly.
+# markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
-# function parameter documentation. If set to NO, doxygen will accept that some
-# parameters have no documentation without warning.
-# The default value is: YES.
-
-WARN_IF_INCOMPLETE_DOC = YES
-
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong parameter
+# value. If set to NO, doxygen will only warn about wrong or incomplete
-# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# parameter documentation, but not about the absence of documentation. If
-# set to YES then this flag will automatically be disabled. See also
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
-# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -857,10 +850,7 @@ WARN_FORMAT            = "$file:$line: $text"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr). In case the file specified cannot be opened for writing the
+# error (stderr).
-# warning and error messages are written to standard error. When as file - is
-# specified the warning and error messages are written to standard output
-# (stdout).
 
 WARN_LOGFILE           =
 
@@ -904,10 +894,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.vhdl, *.ucf, *.qsf and *.ice.
+# *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          =
 
@@ -949,7 +939,7 @@ EXCLUDE_PATTERNS       = .svn \
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# ANamespace::AClass, ANamespace::*Test
+# AClass::ANamespace, ANamespace::*Test
 #
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
@@ -1234,7 +1224,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a color-wheel, see
+# this color. Hue is specified as an angle on a colorwheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1244,7 +1234,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use gray-scales only. A
+# in the HTML output. For a value of 0 the output will use grayscales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1326,13 +1316,6 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# This tag determines the URL of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDURL         =
-
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1358,12 +1341,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# (see:
-# a.o. the download links, offline the HTML help workshop was already many years
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
-# in maintenance mode). You can download the HTML help workshop from the web
-# archives at Installation executable (see:
-# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
-# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1522,28 +1501,16 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# further fine-tune the look of the index. As an example, the default style
-# example, the default style sheet generated by doxygen has an example that
+# sheet generated by doxygen has an example that shows how to put an image at
-# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# Since the tree basically has the same information as the tab index, you could
+# the same information as the tab index, you could consider setting
-# consider setting DISABLE_INDEX to YES when enabling this option.
+# DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
-# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
-# area (value NO) or if it should extend to the full height of the window (value
-# YES). Setting this to YES gives a layout similar to
-# https://docs.readthedocs.io with more room for contents, but less room for the
-# project logo, title, and description. If either GENERATE_TREEVIEW or
-# DISABLE_INDEX is set to NO, this option has no effect.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FULL_SIDEBAR           = NO
-
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1568,13 +1535,6 @@ TREEVIEW_WIDTH         = 246
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
-# addresses.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-OBFUSCATE_EMAILS       = YES
-
 # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
@@ -1623,29 +1583,11 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
-# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
-# Note that the different versions of MathJax have different requirements with
-# regards to the different settings, so it is possible that also other MathJax
-# settings have to be changed when switching between the different MathJax
-# versions.
-# Possible values are: MathJax_2 and MathJax_3.
-# The default value is: MathJax_2.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_VERSION        = MathJax_2
-
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. For more details about the output format see MathJax
+# the MathJax output. See the MathJax site (see:
-# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
-# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
-# (see:
-# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# compatibility), NativeMML (i.e. MathML) and SVG.
-# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
-# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
-# is the name for Mathjax version 3, for MathJax version 2 this will be
-# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1658,21 +1600,15 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment. The default value is:
+# MathJax from https://www.mathjax.org before deployment.
-# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
-# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see
-# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# For example for MathJax version 3 (see
-# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
-# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1852,31 +1788,29 @@ PAPER_TYPE             = a4
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# the generated LaTeX document. The header should contain everything until the
+# generated LaTeX document. The header should contain everything until the first
-# first chapter. If it is left blank doxygen will generate a standard header. It
+# chapter. If it is left blank doxygen will generate a standard header. See
-# is highly recommended to start with a default header using
+# section "Doxygen usage" for information on how to let doxygen write the
-# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# default header to a separate file.
-# and then modify the file new_header.tex. See also section "Doxygen usage" for
-# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing!
+# Note: Only use a user-defined header if you know what you are doing! The
-# Note: The header is subject to change so you typically have to regenerate the
+# following commands have a special meaning inside the header: $title,
-# default header when upgrading to a newer version of doxygen. The following
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# commands have a special meaning inside the header (and footer): For a
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# description of the possible markers and block names see the documentation.
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# the generated LaTeX document. The footer should contain everything after the
+# generated LaTeX document. The footer should contain everything after the last
-# last chapter. If it is left blank doxygen will generate a standard footer. See
+# chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer. See also section "Doxygen
+# special commands can be used inside the footer.
-# usage" for information on how to generate the default footer that doxygen
+#
-# normally uses. Note: Only use a user-defined footer if you know what you are
+# Note: Only use a user-defined footer if you know what you are doing!
-# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1921,7 +1855,8 @@ USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help.
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1934,6 +1869,16 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -2014,6 +1959,16 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2110,6 +2065,15 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2290,6 +2254,15 @@ EXTERNAL_PAGES         = YES
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2346,16 +2319,13 @@ DOT_FONTSIZE           = 10
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# graph for each documented class showing the direct and indirect inheritance
+# each documented class showing the direct and indirect inheritance relations.
-# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
-# to TEXT the direct and indirect inheritance relations will be shown as texts /
-# links.
-# Possible values are: NO, YES, TEXT and GRAPH.
 # The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-CLASS_GRAPH            = TEXT
+CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
@@ -2482,13 +2452,6 @@ GRAPHICAL_HIERARCHY    = YES
 
 DIRECTORY_GRAPH        = YES
 
-# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
-# of child directories generated in directory dependency graphs by dot.
-# Minimum value: 1, maximum value: 25, default value: 1.
-# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
-
-DIR_GRAPH_MAX_DEPTH    = 1
-
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
@@ -2542,10 +2505,10 @@ MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file or to the filename of jar file
+# path where java can find the plantuml.jar file. If left blank, it is assumed
-# to be used. If left blank, it is assumed PlantUML is not used or called during
+# PlantUML is not used or called during a preprocessing step. Doxygen will
-# a preprocessing step. Doxygen will generate a warning when it encounters a
+# generate a warning when it encounters a \startuml command in this case and
-# \startuml command in this case and will not generate output for the diagram.
+# will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
@@ -2607,8 +2570,6 @@ DOT_MULTI_TARGETS      = YES
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
-# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
-# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2617,8 +2578,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc temporary
+# Note: This setting is not only used for dot files but also for msc and
-# files.
+# plantuml temporary files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES

doc/doxygen/doxygen.extern.h

@@ -1,5 +1,3 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
 /** \defgroup extern External libraries
  *  \section externabout External libraries
  *  As with \ref intern these libraries are