support normal smoothing

.clang-format

@@ -265,8 +265,6 @@ ForEachMacros:
   - SET_SLOT_PROBING_BEGIN
   - MAP_SLOT_PROBING_BEGIN
   - VECTOR_SET_SLOT_PROBING_BEGIN
-  - WL_ARRAY_FOR_EACH
-  - FOREACH_SPECTRUM_CHANNEL
 
 StatementMacros:
   - PyObject_HEAD

CMakeLists.txt

@@ -25,6 +25,13 @@ endif()
 
 cmake_minimum_required(VERSION 3.10)
 
+# Prefer LEGACY OpenGL to be compatible with all the existing releases and
+# platforms which don't have GLVND yet. Only do it if preference was not set
+# externally.
+if(NOT DEFINED OpenGL_GL_PREFERENCE)
+  set(OpenGL_GL_PREFERENCE "LEGACY")
+endif()
+
 if(NOT EXECUTABLE_OUTPUT_PATH)
   set(FIRST_RUN TRUE)
 else()
@@ -105,12 +112,6 @@ blender_project_hack_post()
 
 enable_testing()
 
-#-----------------------------------------------------------------------------
-# Test compiler/library features.
-
-include(build_files/cmake/have_features.cmake)
-
-
 #-----------------------------------------------------------------------------
 # Redirect output files
 
@@ -195,7 +196,7 @@ endif()
 option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON)
 
 # Compositor
-option(WITH_COMPOSITOR_CPU     "Enable the tile based CPU nodal compositor" ON)
+option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 option(WITH_OPENIMAGEDENOISE   "Enable the OpenImageDenoise compositing node" ON)
 
 option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ON)
@@ -221,17 +222,6 @@ if(UNIX AND NOT (APPLE OR HAIKU))
 
   option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing (under development)" OFF)
   mark_as_advanced(WITH_GHOST_WAYLAND)
-
-  if(WITH_GHOST_WAYLAND)
-    option(WITH_GHOST_WAYLAND_LIBDECOR "Optionally build with LibDecor window decorations" OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_LIBDECOR)
-
-    option(WITH_GHOST_WAYLAND_DBUS "Optionally build with DBUS support (used for Cursor themes). May hang on startup systems where DBUS is not used." OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_DBUS)
-
-    option(WITH_GHOST_WAYLAND_DYNLOAD  "Enable runtime dynamic WAYLAND libraries loading" OFF)
-    mark_as_advanced(WITH_GHOST_WAYLAND_DYNLOAD)
-  endif()
 endif()
 
 if(WITH_GHOST_X11)
@@ -261,14 +251,23 @@ if(WITH_GHOST_X11)
   option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
   option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
   option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
+  option(WITH_X11_ALPHA     "Enable X11 transparent background"                     ON)
 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_FREETYPE "Use the freetype library provided by the operating system" OFF)
-  option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
 else()
+  # not an option for other OS's
+  set(WITH_SYSTEM_GLEW OFF)
+  set(WITH_SYSTEM_GLES OFF)
   set(WITH_SYSTEM_FREETYPE OFF)
-  set(WITH_SYSTEM_EIGEN3 OFF)
+endif()
+
+
+if(UNIX AND NOT APPLE)
+  option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
 endif()
 
 
@@ -364,7 +363,7 @@ if(WIN32 OR APPLE)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 if(UNIX AND NOT APPLE)
-  option(WITH_INSTALL_PORTABLE "Install redistributable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+  option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
   option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
   if(WITH_STATIC_LIBS)
     option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF)
@@ -435,23 +434,17 @@ if(NOT APPLE)
   option(WITH_CYCLES_CUBIN_COMPILER    "Build cubins with nvrtc based compiler instead of nvcc" OFF)
   option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
   option(WITH_CUDA_DYNLOAD             "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON)
-
-  set(OPTIX_ROOT_DIR                   "" CACHE PATH "Path to the OptiX SDK root directory, for building Cycles OptiX kernels.")
-  set(CYCLES_RUNTIME_OPTIX_ROOT_DIR    "" CACHE PATH "Path to the OptiX SDK root directory. When set, this path will be used at runtime to compile OptiX kernels.")
-
   mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
   mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
   mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
   mark_as_advanced(WITH_CUDA_DYNLOAD)
-  mark_as_advanced(OPTIX_ROOT_DIR)
-  mark_as_advanced(CYCLES_RUNTIME_OPTIX_ROOT_DIR)
 endif()
 
 # AMD HIP
 if(NOT APPLE)
   option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx900 gfx906 gfx90c gfx902 gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 CACHE STRING "AMD HIP architectures to build binaries for")
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 CACHE STRING "AMD HIP architectures to build binaries for")
   mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
@@ -461,21 +454,6 @@ if(APPLE)
   option(WITH_CYCLES_DEVICE_METAL       "Enable Cycles Apple Metal compute support" ON)
 endif()
 
-# oneAPI
-if(NOT APPLE)
-  option(WITH_CYCLES_DEVICE_ONEAPI "Enable Cycles oneAPI compute support" OFF)
-  option(WITH_CYCLES_ONEAPI_BINARIES "Enable Ahead-Of-Time compilation for Cycles oneAPI device" OFF)
-  option(WITH_CYCLES_ONEAPI_SYCL_HOST_ENABLED "Enable use of SYCL host (CPU) device execution by oneAPI implementation. This option is for debugging purposes and impacts GPU execution." OFF)
-
-  # https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compilation/ahead-of-time-compilation.html
-  set(CYCLES_ONEAPI_SPIR64_GEN_DEVICES "dg2" CACHE STRING "oneAPI Intel GPU architectures to build binaries for")
-  set(CYCLES_ONEAPI_SYCL_TARGETS spir64 spir64_gen CACHE STRING "oneAPI targets to build AOT binaries for")
-
-  mark_as_advanced(WITH_CYCLES_ONEAPI_SYCL_HOST_ENABLED)
-  mark_as_advanced(CYCLES_ONEAPI_SPIR64_GEN_DEVICES)
-  mark_as_advanced(CYCLES_ONEAPI_SYCL_TARGETS)
-endif()
-
 # Draw Manager
 option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
 mark_as_advanced(WITH_DRAW_DEBUG)
@@ -541,26 +519,42 @@ endif()
 # OpenGL
 
 option(WITH_OPENGL              "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
-option(WITH_GPU_BUILDTIME_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)
+option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
+option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
+option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               OFF)
+option(WITH_GPU_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)
 
 mark_as_advanced(
   WITH_OPENGL
-  WITH_GPU_BUILDTIME_SHADER_BUILDER
+  WITH_GLEW_ES
+  WITH_GL_EGL
+  WITH_GL_PROFILE_ES20
+  WITH_GPU_SHADER_BUILDER
 )
 
 # Metal
 
-if(APPLE)
+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)
+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)
+endif()
+
+if(WITH_GLEW_ES AND WITH_SYSTEM_GLEW)
+  message(WARNING Ignoring WITH_SYSTEM_GLEW and using WITH_GLEW_ES)
+  set(WITH_SYSTEM_GLEW OFF)
+endif()
+
 if(WIN32)
   getDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES)
   set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${})
@@ -737,13 +731,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   endif()
 endif()
 
-# Effective install path including config folder, as a generator expression.
-get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(GENERATOR_IS_MULTI_CONFIG)
-  string(REPLACE "\${BUILD_TYPE}" "$<CONFIG>" CMAKE_INSTALL_PREFIX_WITH_CONFIG ${CMAKE_INSTALL_PREFIX})
-else()
-  string(REPLACE "\${BUILD_TYPE}" "" CMAKE_INSTALL_PREFIX_WITH_CONFIG ${CMAKE_INSTALL_PREFIX})
-endif()
 
 
 # Apple
@@ -864,6 +851,7 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
   set(WITH_X11_XINPUT    OFF)
   set(WITH_X11_XF86VMODE OFF)
   set(WITH_X11_XFIXES    OFF)
+  set(WITH_X11_ALPHA     OFF)
   set(WITH_GHOST_XDND    OFF)
   set(WITH_INPUT_IME     OFF)
   set(WITH_XR_OPENXR     OFF)
@@ -1162,8 +1150,7 @@ if(WITH_OPENVDB)
   list(APPEND OPENVDB_INCLUDE_DIRS
     ${BOOST_INCLUDE_DIR}
     ${TBB_INCLUDE_DIRS}
-    ${OPENEXR_INCLUDE_DIRS}
-  )
+    ${OPENEXR_INCLUDE_DIRS})
 
   list(APPEND OPENVDB_LIBRARIES ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
 
@@ -1178,13 +1165,142 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 
+find_package(OpenGL)
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
+
 if(WITH_OPENGL)
   add_definitions(-DWITH_OPENGL)
 endif()
 
+if(WITH_SYSTEM_GLES)
+  find_package_wrapper(OpenGLES)
+endif()
+
+if(WITH_GL_PROFILE_ES20)
+  if(WITH_SYSTEM_GLES)
+    if(NOT OPENGLES_LIBRARY)
+      message(FATAL_ERROR
+        "Unable to find OpenGL ES libraries. "
+        "Install them or disable WITH_SYSTEM_GLES."
+      )
+    endif()
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+
+  else()
+    set(OPENGLES_LIBRARY "" CACHE FILEPATH "OpenGL ES 2.0 library file")
+    mark_as_advanced(OPENGLES_LIBRARY)
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+
+    if(NOT OPENGLES_LIBRARY)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_LIBRARY "
+        "to the file path of an OpenGL ES 2.0 library."
+      )
+    endif()
+
+  endif()
+
+  if(WIN32)
+    # Setup paths to files needed to install and redistribute Windows Blender with OpenGL ES
+
+    set(OPENGLES_DLL "" CACHE FILEPATH "OpenGL ES 2.0 redistributable DLL file")
+    mark_as_advanced(OPENGLES_DLL)
+
+    if(NOT OPENGLES_DLL)
+      message(FATAL_ERROR
+        "To compile WITH_GL_PROFILE_ES20 you need to set OPENGLES_DLL to the file "
+        "path of an OpenGL ES 2.0 runtime dynamic link library (DLL)."
+      )
+    endif()
+
+    if(WITH_GL_ANGLE)
+      list(APPEND GL_DEFINITIONS -DWITH_ANGLE)
+
+      set(D3DCOMPILER_DLL "" CACHE FILEPATH "Direct3D Compiler redistributable DLL file (needed by ANGLE)")
+
+      get_filename_component(D3DCOMPILER_FILENAME "${D3DCOMPILER_DLL}" NAME)
+      list(APPEND GL_DEFINITIONS "-DD3DCOMPILER=\"\\\"${D3DCOMPILER_FILENAME}\\\"\"")
+
+      mark_as_advanced(D3DCOMPILER_DLL)
+
+      if(D3DCOMPILER_DLL STREQUAL "")
+        message(FATAL_ERROR
+          "To compile WITH_GL_ANGLE you need to set D3DCOMPILER_DLL to the file "
+          "path of a copy of the DirectX redistributable DLL file: D3DCompiler_46.dll"
+        )
+      endif()
+
+    endif()
+
+  endif()
+
+else()
+  if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
+  else()
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+  endif()
+endif()
+
+if(WITH_GL_EGL)
+  find_package(OpenGL REQUIRED EGL)
+  list(APPEND BLENDER_GL_LIBRARIES OpenGL::EGL)
+
+  list(APPEND GL_DEFINITIONS -DWITH_GL_EGL -DGLEW_EGL -DGLEW_INC_EGL)
+
+  if(WITH_SYSTEM_GLES)
+    if(NOT OPENGLES_EGL_LIBRARY)
+      message(FATAL_ERROR
+        "Unable to find OpenGL ES libraries. "
+        "Install them or disable WITH_SYSTEM_GLES."
+      )
+    endif()
+
+    list(APPEND BLENDER_GL_LIBRARIES ${OPENGLES_EGL_LIBRARY})
+
+  else()
+    set(OPENGLES_EGL_LIBRARY "" CACHE FILEPATH "EGL library file")
+    mark_as_advanced(OPENGLES_EGL_LIBRARY)
+
+    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}" "${OPENGLES_EGL_LIBRARY}")
+
+    if(NOT OPENGLES_EGL_LIBRARY)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_EGL_LIBRARY "
+        "to the file path of an EGL library."
+      )
+    endif()
+
+  endif()
+
+  if(WIN32)
+    # Setup paths to files needed to install and redistribute Windows Blender with OpenGL ES
+
+    set(OPENGLES_EGL_DLL "" CACHE FILEPATH "EGL redistributable DLL file")
+    mark_as_advanced(OPENGLES_EGL_DLL)
+
+    if(NOT OPENGLES_EGL_DLL)
+      message(FATAL_ERROR
+        "To compile WITH_GL_EGL you need to set OPENGLES_EGL_DLL "
+        "to the file path of an EGL runtime dynamic link library (DLL)."
+      )
+    endif()
+
+  endif()
+
+endif()
+
+if(WITH_GL_PROFILE_ES20)
+  list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_ES20)
+else()
+  list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
+endif()
+
 #-----------------------------------------------------------------------------
 # Configure Metal.
-if(WITH_METAL_BACKEND)
+if (WITH_METAL_BACKEND)
   add_definitions(-DWITH_METAL_BACKEND)
 
   # No need to add frameworks here, all the ones we need for Metal and
@@ -1225,6 +1341,66 @@ if(WITH_OPENMP)
   )
 endif()
 
+#-----------------------------------------------------------------------------
+# Configure GLEW
+
+if(WITH_SYSTEM_GLEW)
+  find_package(GLEW)
+
+  # Note: There is an assumption here that the system GLEW is not a static library.
+
+  if(NOT GLEW_FOUND)
+    message(FATAL_ERROR "GLEW is required to build Blender. Install it or disable WITH_SYSTEM_GLEW.")
+  endif()
+
+  set(GLEW_INCLUDE_PATH "${GLEW_INCLUDE_DIR}")
+  set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+else()
+  if(WITH_GLEW_ES)
+    set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")
+
+    list(APPEND GL_DEFINITIONS -DGLEW_STATIC -DWITH_GLEW_ES)
+
+    # These definitions remove APIs from glew.h, making GLEW smaller, and catching unguarded API usage
+    if(WITH_GL_PROFILE_ES20)
+      list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
+    else()
+      # No ES functions are needed
+      list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+    endif()
+
+    if(WITH_GL_PROFILE_ES20)
+      if(WITH_GL_EGL)
+        list(APPEND GL_DEFINITIONS -DGLEW_USE_LIB_ES20)
+      endif()
+
+      # ToDo: This is an experiment to eliminate ES 1 symbols,
+      # GLEW doesn't really properly provide this level of control
+      # (for example, without modification it eliminates too many symbols)
+      # so there are lots of modifications to GLEW to make this work,
+      # and no attempt to make it work beyond Blender at this point.
+      list(APPEND GL_DEFINITIONS -DGL_ES_VERSION_1_0=0 -DGL_ES_VERSION_CL_1_1=0 -DGL_ES_VERSION_CM_1_1=0)
+    endif()
+
+    set(BLENDER_GLEW_LIBRARIES extern_glew_es bf_intern_glew_mx)
+
+  else()
+    set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+
+    list(APPEND GL_DEFINITIONS -DGLEW_STATIC)
+
+    # This won't affect the non-experimental glew library,
+    # but is used for conditional compilation elsewhere.
+    list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+
+    set(BLENDER_GLEW_LIBRARIES extern_glew)
+
+  endif()
+
+endif()
+
+list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+
 #-----------------------------------------------------------------------------
 # Configure Bullet
 
@@ -1750,6 +1926,7 @@ if(WITH_BLENDER)
   # internal and external library information first, for test linking
   add_subdirectory(source)
 elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+  add_subdirectory(intern/glew-mx)
   add_subdirectory(intern/guardedalloc)
   add_subdirectory(intern/libc_compat)
   add_subdirectory(intern/sky)
@@ -1767,6 +1944,9 @@ elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
   if(WITH_HIP_DYNLOAD)
     add_subdirectory(extern/hipew)
   endif()
+  if(NOT WITH_SYSTEM_GLEW)
+    add_subdirectory(extern/glew)
+  endif()
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1859,6 +2039,8 @@ if(FIRST_RUN)
   info_cfg_option(WITH_INSTALL_PORTABLE)
   info_cfg_option(WITH_MEM_JEMALLOC)
   info_cfg_option(WITH_MEM_VALGRIND)
+  info_cfg_option(WITH_SYSTEM_GLEW)
+  info_cfg_option(WITH_X11_ALPHA)
   info_cfg_option(WITH_X11_XF86VMODE)
   info_cfg_option(WITH_X11_XFIXES)
   info_cfg_option(WITH_X11_XINPUT)
@@ -1905,6 +2087,14 @@ if(FIRST_RUN)
   info_cfg_option(WITH_MOD_OCEANSIM)
   info_cfg_option(WITH_MOD_REMESH)
 
+  info_cfg_text("OpenGL:")
+  if(WIN32)
+    info_cfg_option(WITH_GL_ANGLE)
+  endif()
+  info_cfg_option(WITH_GL_EGL)
+  info_cfg_option(WITH_GL_PROFILE_ES20)
+  info_cfg_option(WITH_GLEW_ES)
+
   info_cfg_text("")
 
   message("${_config_msg}")

build_files/build_environment/CMakeLists.txt

@@ -29,12 +29,10 @@ cmake_minimum_required(VERSION 3.5)
 
 include(ExternalProject)
 include(cmake/check_software.cmake)
-include(cmake/options.cmake)
-# versions.cmake needs to be included after options.cmake due to the BLENDER_PLATFORM_ARM variable being needed.
 include(cmake/versions.cmake)
+include(cmake/options.cmake)
 include(cmake/boost_build_options.cmake)
 include(cmake/download.cmake)
-include(cmake/macros.cmake)
 
 if(ENABLE_MINGW64)
   include(cmake/setup_mingw64.cmake)
@@ -53,8 +51,8 @@ include(cmake/imath.cmake)
 include(cmake/openexr.cmake)
 include(cmake/brotli.cmake)
 include(cmake/freetype.cmake)
-include(cmake/epoxy.cmake)
 include(cmake/freeglut.cmake)
+include(cmake/glew.cmake)
 include(cmake/alembic.cmake)
 include(cmake/opensubdiv.cmake)
 include(cmake/sdl.cmake)
@@ -98,15 +96,6 @@ include(cmake/fmt.cmake)
 include(cmake/robinmap.cmake)
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
-  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
-    include(cmake/dpcpp.cmake)
-    include(cmake/dpcpp_deps.cmake)
-  endif()
-  if(NOT WIN32)
-    include(cmake/igc.cmake)
-    include(cmake/gmmlib.cmake)
-    include(cmake/ocloc.cmake)
-  endif()
 endif()
 
 # OpenColorIO and dependencies.
@@ -139,7 +128,6 @@ if(NOT WIN32 OR ENABLE_MINGW64)
     include(cmake/vpx.cmake)
     include(cmake/x264.cmake)
     include(cmake/xvidcore.cmake)
-    include(cmake/aom.cmake)
     include(cmake/ffmpeg.cmake)
     include(cmake/fftw.cmake)
     include(cmake/sndfile.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -42,5 +42,4 @@ endif()
 add_dependencies(
   external_alembic
   external_openexr
-  external_imath
 )

build_files/build_environment/cmake/aom.cmake

@@ -1,45 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  # The default generator on windows is msbuild, which we do not
-  # want to use for this dep, as needs to build with mingw
-  set(AOM_GENERATOR "Ninja")
-  # The default flags are full of MSVC options given this will be
-  # building with mingw, it'll have an unhappy time with that and
-  # we need to clear them out.
-  set(AOM_CMAKE_FLAGS )
-  # CMake will correctly identify phreads being available, however
-  # we do not want to use them, as that gains a dependency on
-  # libpthreadswin.dll which we do not want. when pthreads is not
-  # available oam will use a pthreads emulation layer using win32 threads
-  set(AOM_EXTRA_ARGS_WIN32 -DCMAKE_HAVE_PTHREAD_H=OFF)
-else()
-  set(AOM_GENERATOR "Unix Makefiles")
-  set(AOM_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
-endif()
-
-set(AOM_EXTRA_ARGS
-  -DENABLE_TESTDATA=OFF
-  -DENABLE_TESTS=OFF
-  -DENABLE_TOOLS=OFF
-  -DENABLE_EXAMPLES=OFF
-  ${AOM_EXTRA_ARGS_WIN32}
-)
-
-# This is slightly different from all other deps in the way that
-# aom uses cmake as a build system, but still needs the environment setup
-# to include perl so we manually setup the environment and call
-# cmake directly for the configure, build and install commands.
-
-ExternalProject_Add(external_aom
-  URL file://${PACKAGE_DIR}/${AOM_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${AOM_HASH_TYPE}=${AOM_HASH}
-  PREFIX ${BUILD_DIR}/aom
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/aom/src/external_aom-build/ &&
-    ${CMAKE_COMMAND} -G "${AOM_GENERATOR}" -DCMAKE_INSTALL_PREFIX=${LIBDIR}/aom ${AOM_CMAKE_FLAGS} ${AOM_EXTRA_ARGS} ${BUILD_DIR}/aom/src/external_aom/
-  BUILD_COMMAND ${CMAKE_COMMAND} --build .
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
-  INSTALL_DIR ${LIBDIR}/aom
-)

build_files/build_environment/cmake/check_software.cmake

@@ -12,13 +12,21 @@ if(UNIX)
     automake
     bison
     ${_libtoolize_name}
-    meson
-    ninja
     pkg-config
     tclsh
     yasm
   )
 
+  if(NOT APPLE)
+    set(_required_software
+      ${_required_software}
+
+      # Needed for Mesa.
+      meson
+      ninja
+    )
+  endif()
+
   foreach(_software ${_required_software})
     find_program(_software_find NAMES ${_software})
     if(NOT _software_find)
@@ -48,8 +56,11 @@ if(UNIX)
       "On Debian and Ubuntu:\n"
       "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
       "\n"
-      "On macOS (with homebrew):\n"
-      "  brew install autoconf automake bison flex libtool meson ninja pkg-config yasm\n"
+      "On macOS Intel (with homebrew):\n"
+      "  brew install autoconf automake bison libtool pkg-config yasm\n"
+      "\n"
+      "On macOS ARM (with homebrew):\n"
+      "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
       "\n"
       "Other platforms:\n"
       "  Install equivalent packages.\n")

build_files/build_environment/cmake/download.cmake

@@ -36,7 +36,7 @@ download_source(BLOSC)
 download_source(PTHREADS)
 download_source(OPENEXR)
 download_source(FREETYPE)
-download_source(EPOXY)
+download_source(GLEW)
 download_source(FREEGLUT)
 download_source(ALEMBIC)
 download_source(OPENSUBDIV)
@@ -94,7 +94,6 @@ download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
-download_source(SSE2NEON)
 download_source(FLEX)
 download_source(BROTLI)
 download_source(FMT)
@@ -102,19 +101,3 @@ download_source(ROBINMAP)
 download_source(IMATH)
 download_source(PYSTRING)
 download_source(LEVEL_ZERO)
-download_source(DPCPP)
-download_source(VCINTRINSICS)
-download_source(OPENCLHEADERS)
-download_source(ICDLOADER)
-download_source(MP11)
-download_source(SPIRV_HEADERS)
-download_source(IGC)
-download_source(IGC_LLVM)
-download_source(IGC_OPENCL_CLANG)
-download_source(IGC_VCINTRINSICS)
-download_source(IGC_SPIRV_HEADERS)
-download_source(IGC_SPIRV_TOOLS)
-download_source(IGC_SPIRV_TRANSLATOR)
-download_source(GMMLIB)
-download_source(OCLOC)
-download_source(AOM)

build_files/build_environment/cmake/dpcpp.cmake

@@ -1,109 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-
-if(WIN32)
-  set(LLVM_GENERATOR "Ninja")
-else()
-  set(LLVM_GENERATOR "Unix Makefiles")
-endif()
-
-set(DPCPP_CONFIGURE_ARGS
-  # When external deps dpcpp needs are not found it will automatically
-  # download the during the configure stage using FetchContent. Given
-  # we need to keep an archive of all source used during build for compliance
-  # reasons it CANNOT download anything we do not know about. By setting
-  # this property to ON, all downloads are disabled, and we will have to
-  # provide the missing deps some other way, a build error beats a compliance
-  # violation
-  --cmake-opt FETCHCONTENT_FULLY_DISCONNECTED=ON
-)
-set(DPCPP_SOURCE_ROOT ${BUILD_DIR}/dpcpp/src/external_dpcpp/)
-set(DPCPP_EXTRA_ARGS
-  # When external deps dpcpp needs are not found it will automatically
-  # download the during the configure stage using FetchContent. Given
-  # we need to keep an archive of all source used during build for compliance
-  # reasons it CANNOT download anything we do not know about. By setting
-  # this property to ON, all downloads are disabled, and we will have to
-  # provide the missing deps some other way, a build or configure error
-  # beats a compliance violation
-  -DFETCHCONTENT_FULLY_DISCONNECTED=ON
-  -DLLVMGenXIntrinsics_SOURCE_DIR=${BUILD_DIR}/vcintrinsics/src/external_vcintrinsics/
-  -DOpenCL_HEADERS=file://${PACKAGE_DIR}/${OPENCLHEADERS_FILE}
-  -DOpenCL_LIBRARY_SRC=file://${PACKAGE_DIR}/${ICDLOADER_FILE}
-  -DBOOST_MP11_SOURCE_DIR=${BUILD_DIR}/mp11/src/external_mp11/
-  -DLEVEL_ZERO_LIBRARY=${LIBDIR}/level-zero/lib/${LIBPREFIX}ze_loader${SHAREDLIBEXT}
-  -DLEVEL_ZERO_INCLUDE_DIR=${LIBDIR}/level-zero/include
-  -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${BUILD_DIR}/spirvheaders/src/external_spirvheaders/
-  # Below here is copied from an invocation of buildbot/config.py
-  -DLLVM_ENABLE_ASSERTIONS=ON
-  -DLLVM_TARGETS_TO_BUILD=X86
-  -DLLVM_EXTERNAL_PROJECTS=sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
-  -DLLVM_EXTERNAL_SYCL_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/sycl
-  -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/llvm-spirv
-  -DLLVM_EXTERNAL_XPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
-  -DXPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
-  -DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xptifw
-  -DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/libdevice
-  -DLLVM_ENABLE_PROJECTS=clang^^sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
-  -DLIBCLC_TARGETS_TO_BUILD=
-  -DLIBCLC_GENERATE_REMANGLED_VARIANTS=OFF
-  -DSYCL_BUILD_PI_HIP_PLATFORM=AMD
-  -DLLVM_BUILD_TOOLS=ON
-  -DSYCL_ENABLE_WERROR=OFF
-  -DSYCL_INCLUDE_TESTS=ON
-  -DLLVM_ENABLE_DOXYGEN=OFF
-  -DLLVM_ENABLE_SPHINX=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DSYCL_ENABLE_XPTI_TRACING=ON
-  -DLLVM_ENABLE_LLD=OFF
-  -DXPTI_ENABLE_WERROR=OFF
-  -DSYCL_CLANG_EXTRA_FLAGS=
-  -DSYCL_ENABLE_PLUGINS=level_zero
-  -DCMAKE_INSTALL_RPATH=\$ORIGIN
-  -DPython3_ROOT_DIR=${LIBDIR}/python/
-  -DPython3_EXECUTABLE=${PYTHON_BINARY}
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DLLDB_ENABLE_CURSES=OFF
-  -DLLVM_ENABLE_TERMINFO=OFF
-)
-
-if(WIN32)
-   list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
-endif()
-
-ExternalProject_Add(external_dpcpp
-  URL file://${PACKAGE_DIR}/${DPCPP_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${DPCPP_HASH_TYPE}=${DPCPP_HASH}
-  PREFIX ${BUILD_DIR}/dpcpp
-  CMAKE_GENERATOR ${LLVM_GENERATOR}
-  SOURCE_SUBDIR llvm
-  LIST_SEPARATOR ^^
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DEFAULT_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
-  #CONFIGURE_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
-  #BUILD_COMMAND echo "." #${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . -- deploy-sycl-toolchain
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/dpcpp/src/external_dpcpp < ${PATCH_DIR}/dpcpp.diff
-  INSTALL_DIR ${LIBDIR}/dpcpp
-)
-
-add_dependencies(
-  external_dpcpp
-  external_python
-  external_python_site_packages
-  external_vcintrinsics
-  external_openclheaders
-  external_icdloader
-  external_mp11
-  external_level-zero
-  external_spirvheaders
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_dpcpp after_install
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cl.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cpp.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang.exe
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/dpcpp ${HARVEST_TARGET}/dpcpp
-  )
-endif()

build_files/build_environment/cmake/dpcpp_deps.cmake

@@ -1,61 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# These are build time requirements for dpcpp
-# We only have to unpack these dpcpp will build
-# them.
-
-ExternalProject_Add(external_vcintrinsics
-  URL file://${PACKAGE_DIR}/${VCINTRINSICS_FILE}
-  URL_HASH ${VCINTRINSICS_HASH_TYPE}=${VCINTRINSICS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/vcintrinsics
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-# opencl headers do not have to be unpacked, dpcpp will do it
-# but it wouldn't hurt to do it anyway as an opertunity to validate
-# the hash is correct.
-ExternalProject_Add(external_openclheaders
-  URL file://${PACKAGE_DIR}/${OPENCLHEADERS_FILE}
-  URL_HASH ${OPENCLHEADERS_HASH_TYPE}=${OPENCLHEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/openclheaders
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-# icdloader does not have to be unpacked, dpcpp will do it
-# but it wouldn't hurt to do it anyway as an opertunity to validate
-# the hash is correct.
-ExternalProject_Add(external_icdloader
-  URL file://${PACKAGE_DIR}/${ICDLOADER_FILE}
-  URL_HASH ${ICDLOADER_HASH_TYPE}=${ICDLOADER_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/icdloader
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_mp11
-  URL file://${PACKAGE_DIR}/${MP11_FILE}
-  URL_HASH ${MP11_HASH_TYPE}=${MP11_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/mp11
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_spirvheaders
-  URL file://${PACKAGE_DIR}/${SPIRV_HEADERS_FILE}
-  URL_HASH ${SPIRV_HEADERS_HASH_TYPE}=${SPIRV_HEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/spirvheaders
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)

build_files/build_environment/cmake/embree.cmake

@@ -10,12 +10,18 @@ set(EMBREE_EXTRA_ARGS
   -DEMBREE_RAY_MASK=ON
   -DEMBREE_FILTER_FUNCTION=ON
   -DEMBREE_BACKFACE_CULLING=OFF
+  -DEMBREE_MAX_ISA=AVX2
   -DEMBREE_TASKING_SYSTEM=TBB
   -DEMBREE_TBB_ROOT=${LIBDIR}/tbb
   -DTBB_ROOT=${LIBDIR}/tbb
+  -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
 )
 
-if (NOT BLENDER_PLATFORM_ARM)
+if(BLENDER_PLATFORM_ARM)
+  set(EMBREE_EXTRA_ARGS
+    ${EMBREE_EXTRA_ARGS}
+    -DEMBREE_MAX_ISA=NEON)
+else()
   set(EMBREE_EXTRA_ARGS
     ${EMBREE_EXTRA_ARGS}
     -DEMBREE_MAX_ISA=AVX2)
@@ -24,10 +30,23 @@ endif()
 if(TBB_STATIC_LIBRARY)
   set(EMBREE_EXTRA_ARGS
     ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_TBB_COMPONENT=tbb_static
+    -DEMBREE_TBB_LIBRARY_NAME=tbb_static
+    -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_static
   )
 endif()
 
+if(WIN32)
+  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
+  if(BUILD_MODE STREQUAL Debug)
+    list(APPEND EMBREE_EXTRA_ARGS
+     -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_debug
+     -DEMBREE_TBB_LIBRARY_NAME=tbb_debug
+    )
+  endif()
+else()
+  set(EMBREE_BUILD_DIR)
+endif()
+
 ExternalProject_Add(external_embree
   URL file://${PACKAGE_DIR}/${EMBREE_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}

build_files/build_environment/cmake/epoxy.cmake

@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-if(WIN32)
-  set(EPOXY_LIB_TYPE shared)
-else()
-  set(EPOXY_LIB_TYPE static)
-endif()
-ExternalProject_Add(external_epoxy
-  URL file://${PACKAGE_DIR}/${EPOXY_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
-  PREFIX ${BUILD_DIR}/epoxy
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/epoxy/src/external_epoxy/ < ${PATCH_DIR}/epoxy.diff
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && meson setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_epoxy after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/epoxy/include ${HARVEST_TARGET}/epoxy/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/bin/epoxy-0.dll ${HARVEST_TARGET}/epoxy/bin/epoxy-0.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/lib/epoxy.lib ${HARVEST_TARGET}/epoxy/lib/epoxy.lib
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/ffmpeg.cmake

@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include -I${mingw_LIBDIR}/aom/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib -L${mingw_LIBDIR}/aom/lib")
+set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
+set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
 set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR}/aom/lib/pkgconfig:)
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:)
 
 if(WIN32)
   set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
@@ -79,7 +79,6 @@ ExternalProject_Add(external_ffmpeg
     --disable-librtmp
     --enable-libx264
     --enable-libxvid
-    --enable-libaom
     --disable-libopencore-amrnb
     --disable-libopencore-amrwb
     --disable-libdc1394
@@ -126,7 +125,6 @@ add_dependencies(
   external_vorbis
   external_ogg
   external_lame
-  external_aom
 )
 if(WIN32)
   add_dependencies(

build_files/build_environment/cmake/glew.cmake

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(GLEW_EXTRA_ARGS
+  -DBUILD_UTILS=Off
+  -DBUILD_SHARED_LIBS=Off
+)
+
+ExternalProject_Add(external_glew
+  URL file://${PACKAGE_DIR}/${GLEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${GLEW_HASH_TYPE}=${GLEW_HASH}
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
+  PREFIX ${BUILD_DIR}/glew
+  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glew
+)

build_files/build_environment/cmake/gmmlib.cmake

@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(GMMLIB_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_gmmlib
-  URL file://${PACKAGE_DIR}/${GMMLIB_FILE}
-  URL_HASH ${GMMLIB_HASH_TYPE}=${GMMLIB_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/gmmlib
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib ${DEFAULT_CMAKE_FLAGS} ${GMMLIB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/gmmlib
-)

build_files/build_environment/cmake/harvest.cmake

@@ -22,6 +22,12 @@ if(BUILD_MODE STREQUAL Release)
         # freeglut-> opengl
         ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
         ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # glew-> opengl
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # tiff
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
     DEPENDS
   )
 endif()
@@ -40,8 +46,7 @@ function(harvest from to)
     install(
       FILES ${LIBDIR}/${from}
       DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename}
-    )
+      RENAME ${filename})
   else()
     install(
       DIRECTORY ${LIBDIR}/${from}/
@@ -51,8 +56,7 @@ function(harvest from to)
       PATTERN "pkgconfig" EXCLUDE
       PATTERN "cmake" EXCLUDE
       PATTERN "__pycache__" EXCLUDE
-      PATTERN "tests" EXCLUDE
-    )
+      PATTERN "tests" EXCLUDE)
   endif()
 endfunction()
 
@@ -72,8 +76,8 @@ harvest(fftw3/lib fftw3/lib "*.a")
 harvest(flac/lib sndfile/lib "libFLAC.a")
 harvest(freetype/include freetype/include "*.h")
 harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
-harvest(epoxy/include epoxy/include "*.h")
-harvest(epoxy/lib epoxy/lib "*.a")
+harvest(glew/include glew/include "*.h")
+harvest(glew/lib glew/lib "*.a")
 harvest(gmp/include gmp/include "*.h")
 harvest(gmp/lib gmp/lib "*.a")
 harvest(jemalloc/include jemalloc/include "*.h")
@@ -173,7 +177,6 @@ harvest(opus/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(aom/lib ffmpeg/lib "*.a")
 harvest(webp/lib webp/lib "*.a")
 harvest(webp/include webp/include "*.h")
 harvest(usd/include usd/include "*.h")
@@ -189,10 +192,6 @@ harvest(zstd/lib zstd/lib "*.a")
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")
   harvest(mesa/lib64 mesa/lib "*.so*")
-
-  harvest(dpcpp dpcpp "*")
-  harvest(igc dpcpp/lib/igc "*")
-  harvest(ocloc dpcpp/lib/ocloc "*")
- endif()
+endif()
 
 endif()

build_files/build_environment/cmake/igc.cmake

@@ -1,126 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-unpack_only(igc_vcintrinsics)
-unpack_only(igc_spirv_headers)
-unpack_only(igc_spirv_tools)
-
-#
-# igc_opencl_clang contains patches that need to be applied
-# to external_igc_llvm and igc_spirv_translator, we unpack
-# igc_opencl_clang first, then have the patch stages of
-# external_igc_llvm and igc_spirv_translator apply them.
-#
-
-ExternalProject_Add(external_igc_opencl_clang
-  URL file://${PACKAGE_DIR}/${IGC_OPENCL_CLANG_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_OPENCL_CLANG_HASH_TYPE}=${IGC_OPENCL_CLANG_HASH}
-  PREFIX ${BUILD_DIR}/igc_opencl_clang
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ < ${PATCH_DIR}/igc_opencl_clang.diff
-)
-
-set(IGC_OPENCL_CLANG_PATCH_DIR ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/patches)
-set(IGC_LLVM_SOURCE_DIR ${BUILD_DIR}/igc_llvm/src/external_igc_llvm)
-set(IGC_SPIRV_TRANSLATOR_SOURCE_DIR ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator)
-
-ExternalProject_Add(external_igc_llvm
-  URL file://${PACKAGE_DIR}/${IGC_LLVM_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_LLVM_HASH_TYPE}=${IGC_LLVM_HASH}
-  PREFIX ${BUILD_DIR}/igc_llvm
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0001-OpenCL-3.0-support.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0002-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0003-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0004-OpenCL-support-cl_ext_float_atomics.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0005-OpenCL-Add-cl_khr_integer_dot_product.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0001-Memory-leak-fix-for-Managed-Static-Mutex.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0002-Remove-repo-name-in-LLVM-IR.patch
-)
-add_dependencies(
-  external_igc_llvm
-  external_igc_opencl_clang
-)
-
-ExternalProject_Add(external_igc_spirv_translator
-  URL file://${PACKAGE_DIR}/${IGC_SPIRV_TRANSLATOR_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_SPIRV_TRANSLATOR_HASH_TYPE}=${IGC_SPIRV_TRANSLATOR_HASH}
-  PREFIX ${BUILD_DIR}/igc_spirv_translator
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0001-update-SPIR-V-headers-for-SPV_INTEL_split_barrier.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0002-Add-support-for-split-barriers-extension-SPV_INTEL_s.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0003-Support-cl_bf16_conversions.patch
-)
-add_dependencies(
-  external_igc_spirv_translator
-  external_igc_opencl_clang
-)
-
-if(WIN32)
-  set(IGC_GENERATOR "Ninja")
-  set(IGC_TARGET Windows64)
-else()
-  set(IGC_GENERATOR "Unix Makefiles")
-  set(IGC_TARGET Linux64)
-endif()
-
-set(IGC_EXTRA_ARGS
-  -DIGC_OPTION__ARCHITECTURE_TARGET=${IGC_TARGET}
-  -DIGC_OPTION__ARCHITECTURE_HOST=${IGC_TARGET}
-)
-
-if(UNIX AND NOT APPLE)
-  list(APPEND IGC_EXTRA_ARGS
-       -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
-       -DFLEX_INCLUDE_DIR=${LIBDIR}/flex/include
-  )
-endif()
-
-ExternalProject_Add(external_igc
-  URL file://${PACKAGE_DIR}/${IGC_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IGC_HASH_TYPE}=${IGC_HASH}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc ${DEFAULT_CMAKE_FLAGS} ${IGC_EXTRA_ARGS}
-
-  # IGC is pretty set in its way where sub projects ought to live, for some it offers
-  # hooks to supply alternatives folders, other are just hardocded with no way to configure
-  # we symlink everything here, since it's less work than trying to convince the cmake
-  # scripts to accept alternative locations.
-  #
-  PATCH_COMMAND ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_llvm/src/external_igc_llvm/ ${BUILD_DIR}/igc/src/llvm-project &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/opencl-clang &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/llvm-spirv &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_tools/src/external_igc_spirv_tools/ ${BUILD_DIR}/igc/src/SPIRV-Tools &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_headers/src/external_igc_spirv_headers/ ${BUILD_DIR}/igc/src/SPIRV-Headers &&
-    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_vcintrinsics/src/external_igc_vcintrinsics/ ${BUILD_DIR}/igc/src/vc-intrinsics
-  PREFIX ${BUILD_DIR}/igc
-  INSTALL_DIR ${LIBDIR}/igc
-  INSTALL_COMMAND ${CMAKE_COMMAND} --install . --strip
-  CMAKE_GENERATOR ${IGC_GENERATOR}
-)
-
-add_dependencies(
-  external_igc
-  external_igc_vcintrinsics
-  external_igc_llvm
-  external_igc_opencl_clang
-  external_igc_vcintrinsics
-  external_igc_spirv_headers
-  external_igc_spirv_tools
-  external_igc_spirv_translator
-)
-
-if(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_igc
-    external_flex
-  )
-endif()

build_files/build_environment/cmake/ispc.cmake

@@ -28,7 +28,7 @@ elseif(UNIX)
   set(ISPC_EXTRA_ARGS_UNIX
     -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
     -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-    -DARM_ENABLED=${BLENDER_PLATFORM_ARM}
+    -DARM_ENABLED=Off
     -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
   )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -82,3 +82,4 @@ add_dependencies(
   ll
   external_python
 )
+

build_files/build_environment/cmake/macros.cmake

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# shorthand to only unpack a certain dependency
-macro(unpack_only name)
-  string(TOUPPER ${name} UPPER_NAME)
-  set(TARGET_FILE ${${UPPER_NAME}_FILE})
-  set(TARGET_HASH_TYPE ${${UPPER_NAME}_HASH_TYPE})
-  set(TARGET_HASH ${${UPPER_NAME}_HASH})
-  ExternalProject_Add(external_${name}
-    URL file://${PACKAGE_DIR}/${TARGET_FILE}
-    URL_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    PREFIX ${BUILD_DIR}/${name}
-    CONFIGURE_COMMAND echo .
-    BUILD_COMMAND echo .
-    INSTALL_COMMAND echo .
-  )
-endmacro()

build_files/build_environment/cmake/ocloc.cmake

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(OCLOC_EXTRA_ARGS
-  -DNEO_SKIP_UNIT_TESTS=1
-  -DNEO_BUILD_WITH_OCL=0
-  -DBUILD_WITH_L0=0
-  -DIGC_DIR=${LIBDIR}/igc
-  -DGMM_DIR=${LIBDIR}/gmmlib
-)
-
-ExternalProject_Add(external_ocloc
-  URL file://${PACKAGE_DIR}/${OCLOC_FILE}
-  URL_HASH ${OCLOC_HASH_TYPE}=${OCLOC_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/ocloc
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc ${DEFAULT_CMAKE_FLAGS} ${OCLOC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/ocloc
-)
-
-add_dependencies(
-  external_ocloc
-  external_igc
-  external_gmmlib
-)

build_files/build_environment/cmake/openimageio.cmake

@@ -18,15 +18,9 @@ if(WIN32)
   set(PNG_LIBNAME libpng16_static${LIBEXT})
   set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
   set(OPENJPEG_POSTFIX _msvc)
-  if(BUILD_MODE STREQUAL Debug)
-    set(TIFF_POSTFIX d)
-  else()
-    set(TIFF_POSTFIX)
-  endif()
 else()
   set(PNG_LIBNAME libpng${LIBEXT})
   set(OIIO_SIMD_FLAGS)
-  set(TIFF_POSTFIX)
 endif()
 
 if(MSVC)
@@ -71,7 +65,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
   -DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
   -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
-  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${TIFF_POSTFIX}${LIBEXT}
+  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
   -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
   -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
   -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include

build_files/build_environment/cmake/options.cmake

@@ -38,7 +38,6 @@ message("BUILD_DIR = ${BUILD_DIR}")
 if(WIN32)
   set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
   set(LIBEXT ".lib")
-  set(SHAREDLIBEXT ".lib")
   set(LIBPREFIX "")
 
   # For OIIO and OSL
@@ -97,7 +96,6 @@ if(WIN32)
 else()
   set(PATCH_CMD patch)
   set(LIBEXT ".a")
-  set(SHAREDLIBEXT ".so")
   set(LIBPREFIX "lib")
 
   if(APPLE)

build_files/build_environment/cmake/python.cmake

@@ -27,7 +27,6 @@ if(WIN32)
     PREFIX ${BUILD_DIR}/python
     CONFIGURE_COMMAND ""
     BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
-    PATCH_COMMAND ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
 

build_files/build_environment/cmake/sse2neon.cmake

@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ExternalProject_Add(external_sse2neon
-  URL file://${PACKAGE_DIR}/${SSE2NEON_FILE}
+  GIT_REPOSITORY  ${SSE2NEON_GIT}
+  GIT_TAG ${SSE2NEON_GIT_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SSE2NEON_HASH_TYPE}=${SSE2NEON_HASH}
   PREFIX ${BUILD_DIR}/sse2neon
   CONFIGURE_COMMAND echo sse2neon - Nothing to configure
   BUILD_COMMAND echo sse2neon - nothing to build

build_files/build_environment/cmake/tiff.cmake

@@ -3,8 +3,6 @@
 set(TIFF_EXTRA_ARGS
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-  -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
-  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
   -DPNG_STATIC=ON
   -DBUILD_SHARED_LIBS=OFF
   -Dlzma=OFF
@@ -26,12 +24,10 @@ add_dependencies(
   external_tiff
   external_zlib
 )
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_tiff after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-              ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
-      DEPENDEES install
-    )
-  endif()
+
+if(WIN32 AND BUILD_MODE STREQUAL Debug)
+  ExternalProject_Add_Step(external_tiff after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
+    DEPENDEES install
+  )
 endif()

build_files/build_environment/cmake/versions.cmake

@@ -45,15 +45,15 @@ set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 set(PTHREADS_HASH_TYPE MD5)
 set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)
 
-set(OPENEXR_VERSION 3.1.5)
+set(OPENEXR_VERSION 3.1.4)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH a92f38eedd43e56c0af56d4852506886)
+set(OPENEXR_HASH e990be1ff765797bc2d93a8060e1c1f2)
 set(OPENEXR_HASH_TYPE MD5)
 set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
 
-set(IMATH_VERSION 3.1.5)
+set(IMATH_VERSION 3.1.4)
 set(IMATH_URI https://github.com/AcademySoftwareFoundation/Imath/archive/v${OPENEXR_VERSION}.tar.gz)
-set(IMATH_HASH dd375574276c54872b7b3d54053baff0)
+set(IMATH_HASH fddf14ec73e12c34e74c3c175e311a3f)
 set(IMATH_HASH_TYPE MD5)
 set(IMATH_FILE imath-${IMATH_VERSION}.tar.gz)
 
@@ -80,11 +80,11 @@ set(FREETYPE_HASH bd4e3b007474319909a6b79d50908e85)
 set(FREETYPE_HASH_TYPE MD5)
 set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
 
-set(EPOXY_VERSION 1.5.10)
-set(EPOXY_URI https://github.com/anholt/libepoxy/archive/refs/tags/${EPOXY_VERSION}.tar.gz)
-set(EPOXY_HASH f0730aad115c952e77591fcc805b1dc1)
-set(EPOXY_HASH_TYPE MD5)
-set(EPOXY_FILE libepoxy-${EPOXY_VERSION}.tar.gz)
+set(GLEW_VERSION 1.13.0)
+set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
+set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)
+set(GLEW_HASH_TYPE MD5)
+set(GLEW_FILE glew-${GLEW_VERSION}.tgz)
 
 set(FREEGLUT_VERSION 3.0.0)
 set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
@@ -147,7 +147,7 @@ set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
-# 8.0.0 is currently oiio's preferred version although never versions may be available.
+# 8.0.0 is currently oiio's preferred vesion although never versions may be available.
 # the preferred version can be found in oiio's externalpackages.cmake
 set(FMT_VERSION 8.0.0)
 set(FMT_URI https://github.com/fmtlib/fmt/archive/refs/tags/${FMT_VERSION}.tar.gz)
@@ -155,7 +155,7 @@ set(FMT_HASH 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83)
 set(FMT_HASH_TYPE SHA256)
 set(FMT_FILE fmt-${FMT_VERSION}.tar.gz)
 
-# 0.6.2 is currently oiio's preferred version although never versions may be available.
+# 0.6.2 is currently oiio's preferred vesion although never versions may be available.
 # the preferred version can be found in oiio's externalpackages.cmake
 set(ROBINMAP_VERSION v0.6.2)
 set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz)
@@ -163,9 +163,9 @@ set(ROBINMAP_HASH c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8e
 set(ROBINMAP_HASH_TYPE SHA256)
 set(ROBINMAP_FILE robinmap-${ROBINMAP_VERSION}.tar.gz)
 
-set(TIFF_VERSION 4.4.0)
+set(TIFF_VERSION 4.3.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 376f17f189e9d02280dfe709b2b2bbea)
+set(TIFF_HASH 0a2e4744d1426a8fc8211c0cdbc3a1b3)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
@@ -410,9 +410,9 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-src-3240000.zip)
 
-set(EMBREE_VERSION 3.13.4)
+set(EMBREE_VERSION 3.13.3)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
+set(EMBREE_HASH f62766ba54e48a2f327c3a22596e7133)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
@@ -488,11 +488,8 @@ set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
 set(ZSTD_HASH_TYPE SHA256)
 set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
 
-set(SSE2NEON_VERSION fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
-set(SSE2NEON_URI https://github.com/DLTcollab/sse2neon/archive/${SSE2NEON_VERSION}.tar.gz)
-set(SSE2NEON_HASH 0780253525d299c31775ef95853698d03db9c7739942af8570000f4a25a5d605)
-set(SSE2NEON_HASH_TYPE SHA256)
-set(SSE2NEON_FILE sse2neon-${SSE2NEON_VERSION}.tar.gz)
+set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
+set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
 
 set(BROTLI_VERSION v1.0.9)
 set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/${BROTLI_VERSION}.tar.gz)
@@ -505,140 +502,3 @@ set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${
 set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
 set(LEVEL_ZERO_HASH_TYPE SHA256)
 set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
-
-set(DPCPP_VERSION 20220812)
-set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH 0e3c95346c295f5cf80f3a42d80b1c49481955898530242636ddc002627248d6)
-set(DPCPP_HASH_TYPE SHA256)
-set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
-
-########################
-### DPCPP DEPS BEGIN ###
-########################
-# The following deps are build time requirements for dpcpp, when possible
-# the source in the dpcpp source tree for the version chosen is documented
-# by each dep, these will only have to be downloaded and unpacked, dpcpp
-# will take care of building them, unpack is being done in dpcpp_deps.cmake
-
-# Source llvm/lib/SYCLLowerIR/CMakeLists.txt
-set(VCINTRINSICS_VERSION 984bb27baacce6ee5c716c2e64845f2a1928025b)
-set(VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
-set(VCINTRINSICS_HASH abea415a15a0dd11fdc94dee8fb462910f2548311b787e02f42509789e1b0d7b)
-set(VCINTRINSICS_HASH_TYPE SHA256)
-set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
-
-# Source opencl/CMakeLists.txt
-set(OPENCLHEADERS_VERSION dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
-set(OPENCLHEADERS_URI https://github.com/KhronosGroup/OpenCL-Headers/archive/${OPENCLHEADERS_VERSION}.tar.gz)
-set(OPENCLHEADERS_HASH ca8090359654e94f2c41e946b7e9d826253d795ae809ce7c83a7d3c859624693)
-set(OPENCLHEADERS_HASH_TYPE SHA256)
-set(OPENCLHEADERS_FILE opencl_headers-${OPENCLHEADERS_VERSION}.tar.gz)
-
-# Source opencl/CMakeLists.txt
-set(ICDLOADER_VERSION aec3952654832211636fc4af613710f80e203b0a)
-set(ICDLOADER_URI https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${ICDLOADER_VERSION}.tar.gz)
-set(ICDLOADER_HASH e1880551d67bd8dc31d13de63b94bbfd6b1f315b6145dad1ffcd159b89bda93c)
-set(ICDLOADER_HASH_TYPE SHA256)
-set(ICDLOADER_FILE icdloader-${ICDLOADER_VERSION}.tar.gz)
-
-# Source sycl/cmake/modules/AddBoostMp11Headers.cmake
-# Using external MP11 here, getting AddBoostMp11Headers.cmake to recognize
-# our copy in boost directly was more trouble than it was worth.
-set(MP11_VERSION 7bc4e1ae9b36ec8ee635c3629b59ec525bbe82b9)
-set(MP11_URI https://github.com/boostorg/mp11/archive/${MP11_VERSION}.tar.gz)
-set(MP11_HASH 071ee2bd3952ec89882edb3af25dd1816f6b61723f66e42eea32f4d02ceef426)
-set(MP11_HASH_TYPE SHA256)
-set(MP11_FILE mp11-${MP11_VERSION}.tar.gz)
-
-# Source llvm-spirv/CMakeLists.txt (repo)
-# Source llvm-spirv/spirv-headers-tag.conf (hash)
-set(SPIRV_HEADERS_VERSION 36c0c1596225e728bd49abb7ef56a3953e7ed468)
-set(SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_VERSION}.tar.gz)
-set(SPIRV_HEADERS_HASH 7a5c89633f8740456fe8adee052033e134476d267411d1336c0cb1e587a9229a)
-set(SPIRV_HEADERS_HASH_TYPE SHA256)
-set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
-
-######################
-### DPCPP DEPS END ###
-######################
-
-##########################################
-### Intel Graphics Compiler DEPS BEGIN ###
-##########################################
-# The following deps are build time requirements for the intel graphics
-# compiler, the versions used are taken from the following location
-# https://github.com/intel/intel-graphics-compiler/releases
-
-set(IGC_VERSION 1.0.11222)
-set(IGC_URI https://github.com/intel/intel-graphics-compiler/archive/refs/tags/igc-${IGC_VERSION}.tar.gz)
-set(IGC_HASH d92f0608dcbb52690855685f9447282e5c09c0ba98ae35fabf114fcf8b1e9fcf)
-set(IGC_HASH_TYPE SHA256)
-set(IGC_FILE igc-${IGC_VERSION}.tar.gz)
-
-set(IGC_LLVM_VERSION llvmorg-11.1.0)
-set(IGC_LLVM_URI https://github.com/llvm/llvm-project/archive/refs/tags/${IGC_LLVM_VERSION}.tar.gz)
-set(IGC_LLVM_HASH 53a0719f3f4b0388013cfffd7b10c7d5682eece1929a9553c722348d1f866e79)
-set(IGC_LLVM_HASH_TYPE SHA256)
-set(IGC_LLVM_FILE ${IGC_LLVM_VERSION}.tar.gz)
-
-# WARNING WARNING WARNING
-#
-# IGC_OPENCL_CLANG contains patches for some of its dependencies.
-#
-# Whenever IGC_OPENCL_CLANG_VERSION changes, one *MUST* inspect
-# IGC_OPENCL_CLANG's patches folder and update igc.cmake to account for
-# any added or removed patches.
-#
-# WARNING WARNING WARNING
-
-set(IGC_OPENCL_CLANG_VERSION bbdd1587f577397a105c900be114b56755d1f7dc)
-set(IGC_OPENCL_CLANG_URI https://github.com/intel/opencl-clang/archive/${IGC_OPENCL_CLANG_VERSION}.tar.gz)
-set(IGC_OPENCL_CLANG_HASH d08315f1b0d8a6fef33de2b3e6aa7356534c324910634962c72523d970773efc)
-set(IGC_OPENCL_CLANG_HASH_TYPE SHA256)
-set(IGC_OPENCL_CLANG_FILE opencl-clang-${IGC_OPENCL_CLANG_VERSION}.tar.gz)
-
-set(IGC_VCINTRINSICS_VERSION v0.4.0)
-set(IGC_VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/refs/tags/${IGC_VCINTRINSICS_VERSION}.tar.gz)
-set(IGC_VCINTRINSICS_HASH c8b92682ad5031cf9d5b82a40e7d5c0e763cd9278660adbcaa69aab988e4b589)
-set(IGC_VCINTRINSICS_HASH_TYPE SHA256)
-set(IGC_VCINTRINSICS_FILE vc-intrinsics-${IGC_VCINTRINSICS_VERSION}.tar.gz)
-
-set(IGC_SPIRV_HEADERS_VERSION sdk-1.3.204.1)
-set(IGC_SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
-set(IGC_SPIRV_HEADERS_HASH 262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c)
-set(IGC_SPIRV_HEADERS_HASH_TYPE SHA256)
-set(IGC_SPIRV_HEADERS_FILE SPIR-V-Headers-${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
-
-set(IGC_SPIRV_TOOLS_VERSION sdk-1.3.204.1)
-set(IGC_SPIRV_TOOLS_URI https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
-set(IGC_SPIRV_TOOLS_HASH 6e19900e948944243024aedd0a201baf3854b377b9cc7a386553bc103b087335)
-set(IGC_SPIRV_TOOLS_HASH_TYPE SHA256)
-set(IGC_SPIRV_TOOLS_FILE SPIR-V-Tools-${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
-
-set(IGC_SPIRV_TRANSLATOR_VERSION 99420daab98998a7e36858befac9c5ed109d4920)
-set(IGC_SPIRV_TRANSLATOR_URI https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
-set(IGC_SPIRV_TRANSLATOR_HASH 77dfb4ddb6bfb993535562c02ddea23f0a0d1c5a0258c1afe7e27c894ff783a8)
-set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256)
-set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
-
-########################################
-### Intel Graphics Compiler DEPS END ###
-########################################
-
-set(GMMLIB_VERSION intel-gmmlib-22.1.2)
-set(GMMLIB_URI https://github.com/intel/gmmlib/archive/refs/tags/${GMMLIB_VERSION}.tar.gz)
-set(GMMLIB_HASH 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334)
-set(GMMLIB_HASH_TYPE SHA256)
-set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz)
-
-set(OCLOC_VERSION 22.20.23198)
-set(OCLOC_URI https://github.com/intel/compute-runtime/archive/refs/tags/${OCLOC_VERSION}.tar.gz)
-set(OCLOC_HASH ab22b8bf2560a57fdd3def0e35a62ca75991406f959c0263abb00cd6cd9ae998)
-set(OCLOC_HASH_TYPE SHA256)
-set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz)
-
-set(AOM_VERSION 3.4.0)
-set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.tar.gz)
-set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
-set(AOM_HASH_TYPE SHA256)
-set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)

build_files/build_environment/cmake/vpx.cmake

@@ -1,13 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 if(WIN32)
-  # VPX is determined to use pthreads which it will tell ffmpeg to dynamically
-  # link, which is not something we're super into distribution wise. However
-  # if it cannot find pthread.h it'll happily provide a pthread emulation
-  # layer using win32 threads. So all this patch does is make it not find
-  # pthead.h
-  set(VPX_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/vpx/src/external_vpx < ${PATCH_DIR}/vpx_windows.diff)
-  set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
+  else()
+    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+  endif()
 else()
   if(APPLE)
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
@@ -20,16 +18,6 @@ else()
   endif()
 endif()
 
-if(NOT BLENDER_PLATFORM_ARM)
-  list(APPEND VPX_EXTRA_FLAGS
-    --enable-sse4_1
-    --enable-sse3
-    --enable-ssse3
-    --enable-avx
-    --enable-avx2
-  )
-endif()
-
 ExternalProject_Add(external_vpx
   URL file://${PACKAGE_DIR}/${VPX_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -42,6 +30,11 @@ ExternalProject_Add(external_vpx
       --enable-static
       --disable-install-bins
       --disable-install-srcs
+      --disable-sse4_1
+      --disable-sse3
+      --disable-ssse3
+      --disable-avx
+      --disable-avx2
       --disable-unit-tests
       --disable-examples
       --enable-vp8
@@ -49,7 +42,6 @@ ExternalProject_Add(external_vpx
       ${VPX_EXTRA_FLAGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-  PATCH_COMMAND ${VPX_PATCH}
   INSTALL_DIR ${LIBDIR}/vpx
 )
 

build_files/build_environment/install_deps.sh

@@ -465,7 +465,7 @@ TBB_VERSION="2020"
 TBB_VERSION_SHORT="2020"
 TBB_VERSION_UPDATE="_U3"  # Used for source packages...
 TBB_VERSION_MIN="2018"
-TBB_VERSION_MEX="2021"  # 2021 introduces 'oneTBB', which has lots of compatibility breakage with previous versions
+TBB_VERSION_MEX="2022"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false
@@ -478,7 +478,7 @@ OCIO_FORCE_BUILD=false
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false
 
-IMATH_VERSION="3.1.5"
+IMATH_VERSION="3.1.4"
 IMATH_VERSION_SHORT="3.1"
 IMATH_VERSION_MIN="3.0"
 IMATH_VERSION_MEX="4.0"
@@ -487,7 +487,7 @@ IMATH_FORCE_REBUILD=false
 IMATH_SKIP=false
 _with_built_imath=false
 
-OPENEXR_VERSION="3.1.5"
+OPENEXR_VERSION="3.1.4"
 OPENEXR_VERSION_SHORT="3.1"
 OPENEXR_VERSION_MIN="3.0"
 OPENEXR_VERSION_MEX="4.0"
@@ -567,7 +567,7 @@ OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
-EMBREE_VERSION="3.13.4"
+EMBREE_VERSION="3.13.3"
 EMBREE_VERSION_SHORT="3.13"
 EMBREE_VERSION_MIN="3.13"
 EMBREE_VERSION_MEX="4.0"
@@ -627,9 +627,6 @@ WEBP_DEV=""
 VPX_USE=false
 VPX_VERSION_MIN=0.9.7
 VPX_DEV=""
-AOM_USE=false
-AOM_VERSION_MIN=3.3.0
-AOM_DEV=""
 OPUS_USE=false
 OPUS_VERSION_MIN=1.1.1
 OPUS_DEV=""
@@ -638,6 +635,9 @@ MP3LAME_DEV=""
 OPENJPEG_USE=false
 OPENJPEG_DEV=""
 
+# Whether to use system GLEW or not (OpenSubDiv needs recent glew to work).
+NO_SYSTEM_GLEW=false
+
 # Switch to english language, else some things (like check_package_DEB()) won't work!
 LANG_BACK=$LANG
 LANG=""
@@ -1193,7 +1193,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
     * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
     * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
-    * libsdl2, libepoxy, libpugixml, libpotrace, [libgmp], fontconfig, [libharu/libhpdf].\""
+    * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
 
@@ -1212,7 +1212,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
     ** [NumPy $PYTHON_NUMPY_VERSION] (use pip).
     * Boost $BOOST_VERSION (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
     * TBB $TBB_VERSION (from $TBB_SOURCE).
-    * [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libaom, libwebp, ...)] (from $FFMPEG_SOURCE).
+    * [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libwebp, ...)] (from $FFMPEG_SOURCE).
     * [OpenColorIO $OCIO_VERSION] (from $OCIO_SOURCE).
     * Imath $IMATH_VERSION (from $IMATH_SOURCE).
     * OpenEXR $OPENEXR_VERSION (from $OPENEXR_SOURCE).
@@ -1687,7 +1687,7 @@ compile_TBB() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  tbb_magic=1
+  tbb_magic=0
   _init_tbb
 
   # Force having own builds for the dependencies.
@@ -2696,13 +2696,14 @@ compile_OSD() {
     mkdir build
     cd build
 
-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_LOCATION=$INST/tbb"
+      cmake_d="$cmake_d $cmake_d -D TBB_LOCATION=$INST/tbb"
     fi
+    cmake_d="-D CMAKE_BUILD_TYPE=Release"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+    # ptex is only needed when nicholas bishop is ready
     cmake_d="$cmake_d -D NO_PTEX=1"
-    cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1 -D NO_GLEW=1"
+    cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1"
     # maya plugin, docs, tutorials, regression tests and examples are not needed
     cmake_d="$cmake_d -D NO_MAYA=1 -D NO_DOC=1 -D NO_TUTORIALS=1 -D NO_REGRESSION=1 -DNO_EXAMPLES=1"
 
@@ -3003,7 +3004,7 @@ compile_ALEMBIC() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  alembic_magic=3
+  alembic_magic=2
   _init_alembic
 
   # Force having own builds for the dependencies.
@@ -3051,7 +3052,7 @@ compile_ALEMBIC() {
     fi
     if [ "$_with_built_openexr" = true ]; then
       cmake_d="$cmake_d -D USE_ARNOLD=OFF"
-      cmake_d="$cmake_d -D USE_BINARIES=ON"  # Tests use some Alembic binaries...
+      cmake_d="$cmake_d -D USE_BINARIES=OFF"
       cmake_d="$cmake_d -D USE_EXAMPLES=OFF"
       cmake_d="$cmake_d -D USE_HDF5=OFF"
       cmake_d="$cmake_d -D USE_MAYA=OFF"
@@ -3325,7 +3326,7 @@ compile_Embree() {
   fi
 
   # To be changed each time we make edits that would modify the compiled results!
-  embree_magic=11
+  embree_magic=10
   _init_embree
 
   # Force having own builds for the dependencies.
@@ -3385,7 +3386,7 @@ compile_Embree() {
 
     cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=TBB"
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D EMBREE_TBB_ROOT=$INST/tbb"
+      make_d="$make_d EMBREE_TBB_ROOT=$INST/tbb"
     fi
 
     cmake $cmake_d ../
@@ -3524,7 +3525,7 @@ compile_OIDN() {
   install_ISPC
 
   # To be changed each time we make edits that would modify the compiled results!
-  oidn_magic=10
+  oidn_magic=9
   _init_oidn
 
   # Force having own builds for the dependencies.
@@ -3580,7 +3581,7 @@ compile_OIDN() {
     cmake_d="$cmake_d -D ISPC_DIR_HINT=$_ispc_path_bin"
 
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_ROOT=$INST/tbb"
+      make_d="$make_d TBB_ROOT=$INST/tbb"
     fi
 
     cmake $cmake_d ../
@@ -3637,7 +3638,7 @@ compile_FFmpeg() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  ffmpeg_magic=6
+  ffmpeg_magic=5
   _init_ffmpeg
 
   # Force having own builds for the dependencies.
@@ -3690,10 +3691,6 @@ compile_FFmpeg() {
       extra="$extra --enable-libvpx"
     fi
 
-    if [ "$AOM_USE" = true ]; then
-      extra="$extra --enable-libaom"
-    fi
-
     if [ "$WEBP_USE" = true ]; then
       extra="$extra --enable-libwebp"
     fi
@@ -4062,9 +4059,10 @@ install_DEB() {
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
              libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
-             libopenal-dev libepoxy-dev yasm \
+             libopenal-dev libglew-dev yasm \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
              libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev libpystring-dev"
+             # libglewmx-dev  (broken in deb testing currently...)
 
   VORBIS_USE=true
   OGG_USE=true
@@ -4147,37 +4145,33 @@ install_DEB() {
     WEBP_USE=true
   fi
 
-  XVID_DEV="libxvidcore-dev"
-  check_package_DEB $XVID_DEV
-  if [ $? -eq 0 ]; then
-    XVID_USE=true
+  if [ "$WITH_ALL" = true ]; then
+    XVID_DEV="libxvidcore-dev"
+    check_package_DEB $XVID_DEV
+    if [ $? -eq 0 ]; then
+      XVID_USE=true
+    fi
+
+    MP3LAME_DEV="libmp3lame-dev"
+    check_package_DEB $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      MP3LAME_USE=true
+    fi
+
+    VPX_DEV="libvpx-dev"
+    check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi
+
+    OPUS_DEV="libopus-dev"
+    check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
   fi
 
-  MP3LAME_DEV="libmp3lame-dev"
-  check_package_DEB $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    MP3LAME_USE=true
-  fi
-
-  VPX_DEV="libvpx-dev"
-  check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
-
-  AOM_DEV="libaom-dev"
-  check_package_version_ge_DEB $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="libopus-dev"
-  check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
-  fi
-
-  # Check cmake version and disable features for older distros.
+  # Check cmake/glew versions and disable features for older distros.
   # This is so Blender can at least compile.
   PRINT ""
   _cmake=`get_package_version_DEB cmake`
@@ -4194,6 +4188,28 @@ install_DEB() {
     fi
   fi
 
+  PRINT ""
+  _glew=`get_package_version_DEB libglew-dev`
+  if [ -z $_glew ]; then
+    # Stupid virtual package in Ubuntu 12.04 doesn't show version number...
+    _glew=`apt-cache showpkg libglew-dev|tail -n1|awk '{print $2}'|sed 's/-.*//'`
+  fi
+  version_ge $_glew "1.9.0"
+  if [ $? -eq 1 ]; then
+    version_ge $_glew "1.7.0"
+    if [ $? -eq 1 ]; then
+      WARNING "OpenSubdiv disabled because GLEW-$_glew is not enough"
+      WARNING "Blender will not use system GLEW library"
+      OSD_SKIP=true
+      NO_SYSTEM_GLEW=true
+    else
+      WARNING "OpenSubdiv will compile with GLEW-$_glew but with limited capability"
+      WARNING "Blender will not use system GLEW library"
+      NO_SYSTEM_GLEW=true
+    fi
+  fi
+
+
   PRINT ""
   _do_compile_python=false
   if [ "$PYTHON_SKIP" = true ]; then
@@ -4557,9 +4573,6 @@ install_DEB() {
     if [ "$VPX_USE" = true ]; then
       _packages="$_packages $VPX_DEV"
     fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
     if [ "$OPUS_USE" = true ]; then
       _packages="$_packages $OPUS_DEV"
     fi
@@ -4772,7 +4785,7 @@ install_RPM() {
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
              wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
-             libepoxy-devel yasm patch \
+             glew-devel yasm patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \
              gmp-devel pugixml-devel potrace-devel libharu-devel libzstd-devel pystring-devel"
 
@@ -4860,27 +4873,21 @@ install_RPM() {
     WEBP_USE=true
   fi
 
-  VPX_DEV="libvpx-devel"
-  check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
-
-  AOM_DEV="libaom-devel"
-  check_package_version_ge_RPM $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="libopus-devel"
-  check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
-  fi
-
   if [ "$WITH_ALL" = true ]; then
+    VPX_DEV="libvpx-devel"
+    check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi
+
     PRINT ""
     install_packages_RPM libspnav-devel
+
+    OPUS_DEV="libopus-devel"
+    check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
   fi
 
   PRINT ""
@@ -5265,9 +5272,6 @@ install_RPM() {
     if [ "$VPX_USE" = true ]; then
       _packages="$_packages $VPX_DEV"
     fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
     if [ "$OPUS_USE" = true ]; then
       _packages="$_packages $OPUS_DEV"
     fi
@@ -5412,7 +5416,7 @@ install_ARCH() {
   fi
 
   _packages="$BASE_DEVEL git cmake fontconfig flex \
-             libxi libxcursor libxrandr libxinerama libepoxy libpng libtiff wget openal \
+             libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
              $OPENJPEG_DEV yasm sdl2 fftw \
              libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu \
              zstd pystring"
@@ -5457,34 +5461,30 @@ install_ARCH() {
     WEBP_USE=true
   fi
 
-  XVID_DEV="xvidcore"
-  check_package_ARCH $XVID_DEV
-  if [ $? -eq 0 ]; then
-    XVID_USE=true
-  fi
+  if [ "$WITH_ALL" = true ]; then
+    XVID_DEV="xvidcore"
+    check_package_ARCH $XVID_DEV
+    if [ $? -eq 0 ]; then
+      XVID_USE=true
+    fi
 
-  MP3LAME_DEV="lame"
-  check_package_ARCH $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    MP3LAME_USE=true
-  fi
+    MP3LAME_DEV="lame"
+    check_package_ARCH $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      MP3LAME_USE=true
+    fi
 
-  VPX_DEV="libvpx"
-  check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    VPX_USE=true
-  fi
+    VPX_DEV="libvpx"
+    check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      VPX_USE=true
+    fi
 
-  AOM_DEV="libaom"
-  check_package_version_ge_ARCH $AOM_DEV $AOM_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    AOM_USE=true
-  fi
-
-  OPUS_DEV="opus"
-  check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    OPUS_USE=true
+    OPUS_DEV="opus"
+    check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      OPUS_USE=true
+    fi
   fi
 
 
@@ -5862,9 +5862,6 @@ install_ARCH() {
     if [ "$VPX_USE" = true ]; then
       _packages="$_packages $VPX_DEV"
     fi
-    if [ "$AOM_USE" = true ]; then
-      _packages="$_packages $AOM_DEV"
-    fi
     if [ "$OPUS_USE" = true ]; then
       _packages="$_packages $OPUS_DEV"
     fi
@@ -6293,6 +6290,12 @@ print_info() {
     fi
   fi
 
+  if [ "$NO_SYSTEM_GLEW" = true ]; then
+    _1="-D WITH_SYSTEM_GLEW=OFF"
+    PRINT "  $_1"
+    _buildargs="$_buildargs $_1"
+  fi
+
   if [ "$FFMPEG_SKIP" = false ]; then
     _1="-D WITH_CODEC_FFMPEG=ON"
     PRINT "  $_1"

build_files/build_environment/patches/cmakelists_glew.txt

@@ -0,0 +1,2 @@
+cmake_minimum_required (VERSION 2.4)
+add_subdirectory(build/cmake)

build_files/build_environment/patches/dpcpp.diff

@@ -1,36 +0,0 @@
-diff -Naur llvm-sycl-nightly-20220501.orig\opencl/CMakeLists.txt llvm-sycl-nightly-20220501\opencl/CMakeLists.txt
---- llvm-sycl-nightly-20220501.orig/opencl/CMakeLists.txt       2022-04-29 13:47:11 -0600
-+++ llvm-sycl-nightly-20220501/opencl/CMakeLists.txt    2022-05-21 15:25:06 -0600
-@@ -11,6 +11,11 @@
-   )
- endif()
-
-+# Blender code below is determined to use FetchContent_Declare
-+# temporarily allow it (but feed it our downloaded tarball
-+# in the OpenCL_HEADERS variable
-+set(FETCHCONTENT_FULLY_DISCONNECTED OFF)
-+
- # Repo URLs
-
- set(OCL_HEADERS_REPO
-@@ -77,5 +82,6 @@
-
- FetchContent_MakeAvailable(ocl-icd)
- add_library(OpenCL-ICD ALIAS OpenCL)
-+set(FETCHCONTENT_FULLY_DISCONNECTED ON)
-
- add_subdirectory(opencl-aot)
-diff -Naur llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake
---- llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake	2022-02-08 09:17:24 -0700
-+++ llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake	2022-05-24 11:35:51 -0600
-@@ -36,7 +36,9 @@
- add_custom_target(libsycldevice-obj)
- add_custom_target(libsycldevice-spv)
- 
--add_custom_target(libsycldevice DEPENDS
-+# Blender: add ALL here otherwise this target will not build
-+# and cause an error due to missing files during the install phase.
-+add_custom_target(libsycldevice ALL DEPENDS
-   libsycldevice-obj
-   libsycldevice-spv)
- 

build_files/build_environment/patches/embree.diff

@@ -1,37 +1,30 @@
-diff -Naur org/kernels/rtcore_config.h.in embree-3.13.4/kernels/rtcore_config.h.in
---- org/kernels/rtcore_config.h.in      2022-06-14 22:13:52 -0600
-+++ embree-3.13.4/kernels/rtcore_config.h.in    2022-06-24 15:20:12 -0600
-@@ -14,6 +14,7 @@
- #cmakedefine01 EMBREE_MIN_WIDTH
- #define RTC_MIN_WIDTH EMBREE_MIN_WIDTH
-
-+#cmakedefine EMBREE_STATIC_LIB
- #cmakedefine EMBREE_API_NAMESPACE
-
- #if defined(EMBREE_API_NAMESPACE)
-diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
-index 7c2f43d..106b1d5 100644
---- a/kernels/CMakeLists.txt
-+++ b/kernels/CMakeLists.txt
-@@ -201,6 +201,12 @@ embree_files(EMBREE_LIBRARY_FILES_AVX512 ${AVX512})
- #message("AVX2: ${EMBREE_LIBRARY_FILES_AVX2}")
- #message("AVX512: ${EMBREE_LIBRARY_FILES_AVX512}")
+diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
+--- orig/common/sys/platform.h	2020-05-13 23:08:53 -0600
++++ external_embree/common/sys/platform.h	2020-06-13 17:40:26 -0600
+@@ -84,8 +84,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
  
-+# Bundle Neon2x into the main static library.
-+IF(EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB)
-+  LIST(APPEND EMBREE_LIBRARY_FILES ${EMBREE_LIBRARY_FILES_AVX2})
-+  LIST(REMOVE_DUPLICATES EMBREE_LIBRARY_FILES)
-+ENDIF()
-+
- # replaces all .cpp files with a dummy file that includes that .cpp file
- # this is to work around an ICC name mangling issue related to lambda functions under windows
- MACRO (CreateISADummyFiles list isa)
-@@ -277,7 +283,7 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
-   ENDIF()
- ENDIF()
- 
--IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2)
-+IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2 AND NOT (EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB))
-   DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES_AVX2})
-   ADD_LIBRARY(embree_avx2 STATIC ${EMBREE_LIBRARY_FILES_AVX2})
-   TARGET_LINK_LIBRARIES(embree_avx2 PRIVATE tasking)
+ #ifdef __WIN32__
+-#define dll_export __declspec(dllexport)
+-#define dll_import __declspec(dllimport)
++#define dll_export 
++#define dll_import 
+ #else
+ #define dll_export __attribute__ ((visibility ("default")))
+ #define dll_import 
+diff --git orig/common/tasking/CMakeLists.txt external_embree/common/tasking/CMakeLists.txt
+--- orig/common/tasking/CMakeLists.txt
++++ external_embree/common/tasking/CMakeLists.txt
+@@ -27,7 +27,11 @@
+     else()
+       # If not found try getting older TBB via module (FindTBB.cmake)
+       unset(TBB_DIR CACHE)
+-      find_package(TBB 4.1 REQUIRED tbb)
++      if (TBB_STATIC_LIB)
++        find_package(TBB 4.1 REQUIRED tbb_static)
++      else()
++        find_package(TBB 4.1 REQUIRED tbb)
++      endif()
+       if (TBB_FOUND)
+         TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
+         TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")

build_files/build_environment/patches/epoxy.diff

@@ -1,19 +0,0 @@
---- a/src/dispatch_wgl.c	2022-08-04 17:45:13.144924705 +0200
-+++ b/src/dispatch_wgl.c	2022-08-04 17:45:47.657482971 +0200
-@@ -78,6 +78,8 @@
-     if (!first_context_current) {
-         first_context_current = true;
-     } else {
-+      /* BLENDER: disable slow dispatch table switching. */
-+#if 0
-         if (!already_switched_to_dispatch_table) {
-             already_switched_to_dispatch_table = true;
-             gl_switch_to_dispatch_table();
-@@ -86,6 +88,7 @@
- 
-         gl_init_dispatch_table();
-         wgl_init_dispatch_table();
-+#endif
-     }
- }
- 

build_files/build_environment/patches/igc_opencl_clang.diff

@@ -1,44 +0,0 @@
-diff -Naur external_igc_opencl_clang.orig/CMakeLists.txt external_igc_opencl_clang/CMakeLists.txt
---- external_igc_opencl_clang.orig/CMakeLists.txt	2022-03-16 05:51:10 -0600
-+++ external_igc_opencl_clang/CMakeLists.txt	2022-05-23 10:40:09 -0600
-@@ -126,22 +126,24 @@
-         )
-     endif()
- 
--
--    set(SPIRV_BASE_REVISION llvm_release_110)
--    set(TARGET_BRANCH "ocl-open-110")
--    get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
--    set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
--                          ${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)
--    apply_patches(${LLVM_MONOREPO_DIR}
--                  "${LLVM_PATCHES_DIRS}"
--                  ${LLVM_BASE_REVISION}
--                  ${TARGET_BRANCH}
--                  ret)
--    apply_patches(${SPIRV_SOURCE_DIR}
--                  ${CMAKE_CURRENT_SOURCE_DIR}/patches/spirv
--                  ${SPIRV_BASE_REVISION}
--                  ${TARGET_BRANCH}
--                  ret)
-+    #
-+    # Blender: Why apply these manually in igc.cmake
-+    #
-+    #set(SPIRV_BASE_REVISION llvm_release_110)
-+    #set(TARGET_BRANCH "ocl-open-110")
-+    #get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
-+    #set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
-+    #                      ${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)
-+    #apply_patches(${LLVM_MONOREPO_DIR}
-+    #              "${LLVM_PATCHES_DIRS}"
-+    #              ${LLVM_BASE_REVISION}
-+    #              ${TARGET_BRANCH}
-+    #              ret)
-+    #apply_patches(${SPIRV_SOURCE_DIR}
-+    #              ${CMAKE_CURRENT_SOURCE_DIR}/patches/spirv
-+    #              ${SPIRV_BASE_REVISION}
-+    #              ${TARGET_BRANCH}
-+    #              ret)
- endif(NOT USE_PREBUILT_LLVM)
- 
- #

build_files/build_environment/patches/python_windows.diff

@@ -1,24 +0,0 @@
-diff -Naur orig/PCbuild/get_externals.bat Python-3.10.2/PCbuild/get_externals.bat
---- orig/PCbuild/get_externals.bat      2022-01-13 11:52:14 -0700
-+++ Python-3.10.2/PCbuild/get_externals.bat     2022-08-17 11:24:42 -0600
-@@ -51,7 +51,7 @@
- echo.Fetching external libraries...
-
- set libraries=
--set libraries=%libraries%                                       bzip2-1.0.6
-+set libraries=%libraries%                                       bzip2-1.0.8
- if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
- if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1m
- set libraries=%libraries%                                       sqlite-3.35.5.0
- diff -Naur orig/PCbuild/python.props external_python/PCbuild/python.props
---- orig/PCbuild/python.props   2022-01-13 11:52:14 -0700
-+++ external_python/PCbuild/python.props        2022-08-17 11:38:38 -0600
-@@ -58,7 +58,7 @@
-     <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
-     <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
-     <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
--    <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
-+    <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
-     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
-     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>

build_files/build_environment/patches/vpx_windows.diff

@@ -1,11 +0,0 @@
-diff -Naur orig/configure external_vpx/configure
---- orig/configure	2022-07-06 09:22:04 -0600
-+++ external_vpx/configure	2022-07-06 09:24:12 -0600
-@@ -270,7 +270,6 @@
- HAVE_LIST="
-     ${ARCH_EXT_LIST}
-     vpx_ports
--    pthread_h
-     unistd_h
- "
- EXPERIMENT_LIST="

build_files/cmake/Modules/FindEpoxy.cmake

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# This module defines
-#  Epoxy_INCLUDE_DIRS, where to find epoxy/gl.h
-#  Epoxy_LIBRARY, where to find the epoxy library.
-#  Epoxy_ROOT_DIR, The base directory to search for epoxy.
-#                     This can also be an environment variable.
-#  Epoxy_FOUND, If false, do not try to use epoxy.
-
-IF(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "")
-  SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
-ENDIF()
-
-FIND_PATH(Epoxy_INCLUDE_DIR
-  NAMES
-    epoxy/gl.h
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(Epoxy_LIBRARY
-  NAMES
-    epoxy
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set Epoxy_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Epoxy DEFAULT_MSG
-    Epoxy_LIBRARY Epoxy_INCLUDE_DIR)
-
-IF(Epoxy_FOUND)
-  SET(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR})
-  SET(Epoxy_LIBRARIES ${Epoxy_LIBRARY})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  Epoxy_INCLUDE_DIR
-  Epoxy_LIBRARY
-)

build_files/cmake/Modules/FindGLEW.cmake

@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2014 Blender Foundation.
+
+# - Find GLEW library
+# Find the native Glew includes and library
+# This module defines
+#  GLEW_INCLUDE_DIRS, where to find glew.h, Set when
+#                        GLEW_INCLUDE_DIR is found.
+#  GLEW_ROOT_DIR, The base directory to search for Glew.
+#                    This can also be an environment variable.
+#  GLEW_FOUND, If false, do not try to use Glew.
+#
+# also defined,
+#  GLEW_LIBRARY, where to find the Glew library.
+
+# 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})
+ENDIF()
+
+SET(_glew_SEARCH_DIRS
+  ${GLEW_ROOT_DIR}
+)
+
+FIND_PATH(GLEW_INCLUDE_DIR
+  NAMES
+    GL/glew.h
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+)
+
+FIND_LIBRARY(GLEW_LIBRARY
+  NAMES
+    GLEW
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG
+    GLEW_LIBRARY GLEW_INCLUDE_DIR)
+
+IF(GLEW_FOUND)
+  SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+ENDIF()
+
+MARK_AS_ADVANCED(
+  GLEW_INCLUDE_DIR
+  GLEW_LIBRARY
+)
+
+UNSET(_glew_SEARCH_DIRS)

build_files/cmake/Modules/FindLevelZero.cmake

@@ -1,56 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021-2022 Intel Corporation
-
-# - Find Level Zero library
-# Find Level Zero headers and libraries needed by oneAPI implementation
-# This module defines
-#  LEVEL_ZERO_LIBRARY, libraries to link against in order to use L0.
-#  LEVEL_ZERO_INCLUDE_DIR, directories where L0 headers can be found.
-#  LEVEL_ZERO_ROOT_DIR, The base directory to search for L0 files.
-#                 This can also be an environment variable.
-#  LEVEL_ZERO_FOUND, If false, then don't try to use L0.
-
-IF(NOT LEVEL_ZERO_ROOT_DIR AND NOT $ENV{LEVEL_ZERO_ROOT_DIR} STREQUAL "")
-  SET(LEVEL_ZERO_ROOT_DIR $ENV{LEVEL_ZERO_ROOT_DIR})
-ENDIF()
-
-SET(_level_zero_search_dirs
-  ${LEVEL_ZERO_ROOT_DIR}
-  /usr/lib
-  /usr/local/lib
-)
-
-FIND_LIBRARY(_LEVEL_ZERO_LIBRARY
-  NAMES
-    ze_loader
-  HINTS
-    ${_level_zero_search_dirs}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(_LEVEL_ZERO_INCLUDE_DIR
-  NAMES
-    level_zero/ze_api.h
-  HINTS
-    ${_level_zero_search_dirs}
-  PATH_SUFFIXES
-    include
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LevelZero DEFAULT_MSG _LEVEL_ZERO_LIBRARY _LEVEL_ZERO_INCLUDE_DIR)
-
-IF(LevelZero_FOUND)
-  SET(LEVEL_ZERO_LIBRARY ${_LEVEL_ZERO_LIBRARY})
-  SET(LEVEL_ZERO_INCLUDE_DIR ${_LEVEL_ZERO_INCLUDE_DIR} ${_LEVEL_ZERO_INCLUDE_PARENT_DIR})
-  SET(LEVEL_ZERO_FOUND TRUE)
-ELSE()
-  SET(LEVEL_ZERO_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  LEVEL_ZERO_LIBRARY
-  LEVEL_ZERO_INCLUDE_DIR
-)

build_files/cmake/Modules/FindLibEpoxy.cmake

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# This module defines
-#  LibEpoxy_INCLUDE_DIRS, where to find epoxy/gl.h
-#  LibEpoxy_LIBRARY, where to find the epoxy library.
-#  LibEpoxy_ROOT_DIR, The base directory to search for libepoxy.
-#                     This can also be an environment variable.
-#  LibEpoxy_FOUND, If false, do not try to use libepoxy.
-
-IF(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "")
-  SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
-ENDIF()
-
-FIND_PATH(LibEpoxy_INCLUDE_DIR
-  NAMES
-    epoxy/gl.h
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(LibEpoxy_LIBRARY
-  NAMES
-    epoxy
-  HINTS
-    ${EPOXY_ROOT_DIR}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set LibEpoxy_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEpoxy DEFAULT_MSG
-    LibEpoxy_LIBRARY LibEpoxy_INCLUDE_DIR)
-
-IF(LibEpoxy_FOUND)
-  SET(LibEpoxy_INCLUDE_DIRS ${LibEpoxy_INCLUDE_DIR})
-  SET(LibEpoxy_LIBRARIES ${LibEpoxy_LIBRARY})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  LibEpoxy_INCLUDE_DIR
-  LibEpoxy_LIBRARY
-)

build_files/cmake/Modules/FindOpenGLES.cmake

@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2014 Blender Foundation.
+
+# - Try to find OpenGLES
+# Once done this will define
+#
+#  OPENGLES_FOUND           - system has OpenGLES and EGL
+#  OPENGL_EGL_FOUND         - system has EGL
+#  OPENGLES_INCLUDE_DIR     - the GLES include directory
+#  OPENGLES_LIBRARY         - the GLES library
+#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
+#  OPENGLES_EGL_LIBRARY     - the EGL library
+#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
+#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
+
+# 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})
+ENDIF()
+
+SET(_opengles_SEARCH_DIRS
+  ${OPENGLES_ROOT_DIR}
+)
+
+FIND_PATH(OPENGLES_INCLUDE_DIR
+  NAMES
+    GLES2/gl2.h
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+)
+
+FIND_LIBRARY(OPENGLES_LIBRARY
+  NAMES
+    GLESv2
+  PATHS
+    ${_opengles_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+
+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR
+  NAMES
+    EGL/egl.h
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+)
+
+FIND_LIBRARY(OPENGLES_EGL_LIBRARY
+  NAMES
+    EGL
+  HINTS
+    ${_opengles_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+
+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+  SET(OPENGL_EGL_FOUND "YES")
+ELSE()
+  SET(OPENGL_EGL_FOUND "NO")
+ENDIF()
+
+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
+   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+  SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
+                           ${OPENGLES_EGL_LIBRARY})
+  SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
+  SET(OPENGLES_FOUND "YES")
+ELSE()
+  SET(OPENGLES_FOUND "NO")
+ENDIF()
+
+MARK_AS_ADVANCED(
+  OPENGLES_EGL_INCLUDE_DIR
+  OPENGLES_EGL_LIBRARY
+  OPENGLES_LIBRARY
+  OPENGLES_INCLUDE_DIR
+)
+
+UNSET(_opengles_SEARCH_DIRS)

build_files/cmake/Modules/FindSYCL.cmake

@@ -1,88 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021-2022 Intel Corporation
-
-# - Find SYCL library
-# Find the native SYCL header and libraries needed by oneAPI implementation
-# This module defines
-#  SYCL_COMPILER, compiler which will be used for compilation of SYCL code
-#  SYCL_LIBRARY, libraries to link against in order to use SYCL.
-#  SYCL_INCLUDE_DIR, directories where SYCL headers can be found
-#  SYCL_ROOT_DIR, The base directory to search for SYCL files.
-#                 This can also be an environment variable.
-#  SYCL_FOUND, If false, then don't try to use SYCL.
-
-IF(NOT SYCL_ROOT_DIR AND NOT $ENV{SYCL_ROOT_DIR} STREQUAL "")
-  SET(SYCL_ROOT_DIR $ENV{SYCL_ROOT_DIR})
-ENDIF()
-
-SET(_sycl_search_dirs
-  ${SYCL_ROOT_DIR}
-  /usr/lib
-  /usr/local/lib
-  /opt/intel/oneapi/compiler/latest/linux/
-  C:/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/windows
-)
-
-# Find DPC++ compiler.
-# Since the compiler name is possibly conflicting with the system-wide
-# CLang start with looking for either dpcpp or clang binary in the given
-# list of search paths only. If that fails, try to look for a system-wide
-# dpcpp binary.
-FIND_PROGRAM(SYCL_COMPILER
-  NAMES
-    dpcpp
-    clang++
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    bin
-  NO_CMAKE_FIND_ROOT_PATH
-  NAMES_PER_DIR
-)
-
-# NOTE: No clang++ here so that we do not pick up a system-wide CLang
-# compiler.
-if(NOT SYCL_COMPILER)
-  FIND_PROGRAM(SYCL_COMPILER
-   NAMES
-      dpcpp
-    HINTS
-      ${_sycl_search_dirs}
-    PATH_SUFFIXES
-      bin
-  )
-endif()
-
-FIND_LIBRARY(SYCL_LIBRARY
-  NAMES
-    sycl
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(SYCL_INCLUDE_DIR
-  NAMES
-    CL/sycl.hpp
-  HINTS
-    ${_sycl_search_dirs}
-  PATH_SUFFIXES
-    include
-    include/sycl
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL DEFAULT_MSG SYCL_LIBRARY SYCL_INCLUDE_DIR)
-
-IF(SYCL_FOUND)
-  get_filename_component(_SYCL_INCLUDE_PARENT_DIR ${SYCL_INCLUDE_DIR} DIRECTORY)
-  SET(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${_SYCL_INCLUDE_PARENT_DIR})
-ELSE()
-  SET(SYCL_SYCL_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  _SYCL_INCLUDE_PARENT_DIR
-)

build_files/cmake/cmake_static_check_cppcheck.py

@@ -10,77 +10,40 @@ import tempfile
 from typing import (
     Any,
     List,
-    Tuple,
 )
 
-USE_VERBOSE = (os.environ.get("VERBOSE", None) is not None)
-# Could make configurable.
-USE_VERBOSE_PROGRESS = True
 
-CHECKER_BIN = "cppcheck"
+USE_QUIET = (os.environ.get("QUIET", None) is not None)
 
 CHECKER_IGNORE_PREFIX = [
     "extern",
 ]
 
-CHECKER_EXCLUDE_SOURCE_FILES = set(os.path.join(*f.split("/")) for f in (
-    # These files hang (taking longer than 5min with v2.8.2 at time of writing).
-    # All other files process in under around 10seconds.
-    "source/blender/editors/space_text/text_format_pov.c",
-    "source/blender/editors/space_text/text_format_pov_ini.c",
-))
+CHECKER_BIN = "cppcheck"
 
 CHECKER_ARGS = [
-    # Speed up execution.
-    # As Blender has many defines, the total number of configurations is large making execution unreasonably slow.
-    # This could be increased but do so with care.
-    "--max-configs=1",
-
-    # Enable this when includes are missing.
-    #  "--check-config",
-
-    # Shows many pedantic issues, some are quite useful.
-    "--enable=all",
-
-    # Also shows useful messages, even if some are false-positives.
-    "--inconclusive",
+    # not sure why this is needed, but it is.
+    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
+    "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+    "--max-configs=1",  # speeds up execution
+    #  "--check-config", # when includes are missing
+    "--enable=all",  # if you want sixty hundred pedantic suggestions
 
     # Quiet output, otherwise all defines/includes are printed (overly verbose).
     # Only enable this for troubleshooting (if defines are not set as expected for example).
-    *(() if USE_VERBOSE else ("--quiet",))
+    "--quiet",
 
     # NOTE: `--cppcheck-build-dir=<dir>` is added later as a temporary directory.
 ]
 
-
-def source_info_filter(
-        source_info: List[Tuple[str, List[str], List[str]]],
-) -> List[Tuple[str, List[str], List[str]]]:
-    source_dir = project_source_info.SOURCE_DIR
-    if not source_dir.endswith(os.sep):
-        source_dir += os.sep
-    source_info_result = []
-    for i, item in enumerate(source_info):
-        c = item[0]
-        if c.startswith(source_dir):
-            c_relative = c[len(source_dir):]
-            if c_relative in CHECKER_EXCLUDE_SOURCE_FILES:
-                CHECKER_EXCLUDE_SOURCE_FILES.remove(c_relative)
-                continue
-        source_info_result.append(item)
-    if CHECKER_EXCLUDE_SOURCE_FILES:
-        sys.stderr.write("Error: exclude file(s) are missing: %r\n" % list(sorted(CHECKER_EXCLUDE_SOURCE_FILES)))
-        sys.exit(1)
-    return source_info_result
+if USE_QUIET:
+    CHECKER_ARGS.append("--quiet")
 
 
 def cppcheck() -> None:
     source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
     source_defines = project_source_info.build_defines_as_args()
 
-    # Apply exclusion.
-    source_info = source_info_filter(source_info)
-
     check_commands = []
     for c, inc_dirs, defs in source_info:
         cmd = (
@@ -97,7 +60,7 @@ def cppcheck() -> None:
     process_functions = []
 
     def my_process(i: int, c: str, cmd: List[str]) -> subprocess.Popen[Any]:
-        if USE_VERBOSE_PROGRESS:
+        if not USE_QUIET:
             percent = 100.0 * (i / len(check_commands))
             percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 

build_files/cmake/config/blender_full.cmake

@@ -13,7 +13,7 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -18,7 +18,7 @@ set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      OFF CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
@@ -35,7 +35,6 @@ set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 set(WITH_IO_STL              OFF CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -14,7 +14,7 @@ set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR_CPU      ON  CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
@@ -70,7 +70,7 @@ if(NOT WIN32)
   set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 endif()
 if(WIN32)
-  set(WITH_WASAPI               ON  CACHE BOOL "" FORCE)
+  set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
@@ -86,6 +86,4 @@ if(NOT APPLE)
   set(WITH_CYCLES_CUDA_BINARIES   ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_CUBIN_COMPILER  OFF CACHE BOOL "" FORCE)
   set(WITH_CYCLES_HIP_BINARIES    ON  CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_DEVICE_ONEAPI   ON  CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_ONEAPI_BINARIES ON  CACHE BOOL "" FORCE)
 endif()

build_files/cmake/have_features.cmake

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
-
-# This file is used to test the system for headers & symbols.
-# Variables should use the `HAVE_` prefix.
-# Defines should use the same name as the CMAKE variable.
-
-include(CheckSymbolExists)
-
-# Used for: `intern/guardedalloc/intern/mallocn_intern.h`.
-# Function `malloc_stats` is only available on GLIBC,
-# so check that before defining `HAVE_MALLOC_STATS`.
-check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H)
-
-# Used for: `source/creator/creator_signals.c`.
-# The function `feenableexcept` is not present non-GLIBC systems,
-# hence we need to check if it's available in the `fenv.h` file.
-set(HAVE_FEENABLEEXCEPT OFF)
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-endif()
-
-# Used for: `source/blender/blenlib/intern/system.c`.
-# `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC),
-# so check the presence of the header before including it and  using the it for back-trace.
-set(HAVE_EXECINFO_H OFF)
-if(NOT MSVC)
-  include(CheckIncludeFiles)
-  check_include_files("execinfo.h" HAVE_EXECINFO_H)
-  if(HAVE_EXECINFO_H)
-    add_definitions(-DHAVE_EXECINFO_H)
-  endif()
-endif()

build_files/cmake/platform/platform_apple.cmake

@@ -21,18 +21,6 @@ function(print_found_status
   endif()
 endfunction()
 
-# Utility to install precompiled shared libraries.
-macro(add_bundled_libraries library)
-  if(EXISTS ${LIBDIR})
-    set(_library_dir ${LIBDIR}/${library}/lib)
-    file(GLOB _all_library_versions ${_library_dir}/*\.dylib*)
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
-    unset(_all_library_versions)
-    unset(_library_dir)
- endif()
-endmacro()
-
 # ------------------------------------------------------------------------
 # Find system provided libraries.
 
@@ -174,9 +162,6 @@ if(WITH_CODEC_FFMPEG)
     mp3lame ogg opus swresample swscale
     theora theoradec theoraenc vorbis vorbisenc
     vorbisfile vpx x264 xvidcore)
-  if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
-    list(APPEND FFMPEG_FIND_COMPONENTS aom)
-  endif()
   find_package(FFmpeg)
 endif()
 
@@ -238,9 +223,6 @@ if(WITH_SDL)
   endif()
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-find_package(Epoxy REQUIRED)
-
 set(PNG_ROOT ${LIBDIR}/png)
 find_package(PNG REQUIRED)
 
@@ -427,7 +409,6 @@ if(WITH_OPENMP)
     set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
     set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
     set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
-    add_bundled_libraries(openmp)
   endif()
 endif()
 
@@ -486,9 +467,8 @@ string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
 
 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.
-set(PLATFORM_SYMBOLS_MAP ${CMAKE_SOURCE_DIR}/source/creator/symbols_apple.map)
 string(APPEND PLATFORM_LINKFLAGS
-  " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
+  " -Wl,-unexported_symbols_list,'${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
 )
 
 string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
@@ -517,27 +497,17 @@ if(WITH_COMPILER_CCACHE)
   endif()
 endif()
 
-if(WITH_COMPILER_ASAN)
-  list(APPEND PLATFORM_BUNDLED_LIBRARIES ${COMPILER_ASAN_LIBRARY})
-endif()
+# For binaries that are built but not installed (also not distributed) (datatoc,
+# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
+# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
+#
+# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
+# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
 
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the location where install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  if(WITH_PYTHON_MODULE)
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/lib")
-  else()
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/lib")
-  endif()
-
-  # For binaries that are built but not installed (like makesdan or tests), we add
-  # the original directory of all shared libraries to the rpath. This is needed because
-  # these can be in different folders, and because the build and install folder may be
-  # different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH ${PLATFORM_BUNDLED_LIBRARY_DIRS})
-endif()
+set(CMAKE_SKIP_INSTALL_RPATH FALSE)
+list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")
 
 # Same as `CFBundleIdentifier` in Info.plist.
 set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.blenderfoundation.blender")

build_files/cmake/platform/platform_unix.cmake

@@ -38,15 +38,9 @@ if(EXISTS ${LIBDIR})
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
 
   file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
-
   # Ignore Mesa software OpenGL libraries, they are not intended to be
   # linked against but to optionally override at runtime.
   list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/mesa)
-
-  # Ignore DPC++ as it contains its own copy of LLVM/CLang which we do
-  # not need to be ever discovered for the Blender linking.
-  list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/dpcpp)
-
   # NOTE: Make sure "proper" compiled zlib comes first before the one
   # which is a part of OpenCollada. They have different ABI, and we
   # do need to use the official one.
@@ -81,15 +75,6 @@ macro(find_package_wrapper)
   endif()
 endmacro()
 
-# Utility to install precompiled shared libraries.
-macro(add_bundled_libraries library)
-  if(EXISTS ${LIBDIR})
-    file(GLOB _all_library_versions ${LIBDIR}/${library}/lib/*\.so*)
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    unset(_all_library_versions)
- endif()
-endmacro()
-
 # ----------------------------------------------------------------------------
 # Precompiled Libraries
 #
@@ -104,19 +89,6 @@ find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
-find_package_wrapper(Epoxy REQUIRED)
-
-function(check_freetype_for_brotli)
-  include(CheckSymbolExists)
-  set(CMAKE_REQUIRED_INCLUDES ${FREETYPE_INCLUDE_DIRS})
-  check_symbol_exists(FT_CONFIG_OPTION_USE_BROTLI "freetype/config/ftconfig.h" HAVE_BROTLI)
-  unset(CMAKE_REQUIRED_INCLUDES)
-  if(NOT HAVE_BROTLI)
-    unset(HAVE_BROTLI CACHE)
-    message(FATAL_ERROR "Freetype needs to be compiled with brotli support!")
-  endif()
-  unset(HAVE_BROTLI CACHE)
-endfunction()
 
 if(NOT WITH_SYSTEM_FREETYPE)
   # FreeType compiled with Brotli compression for woff2.
@@ -132,7 +104,6 @@ if(NOT WITH_SYSTEM_FREETYPE)
     #   ${BROTLI_LIBRARIES}
     # )
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_PYTHON)
@@ -225,9 +196,6 @@ if(WITH_CODEC_FFMPEG)
       vpx
       x264
       xvidcore)
-    if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
-      list(APPEND FFMPEG_FIND_COMPONENTS aom)
-    endif()
   elseif(FFMPEG)
     # Old cache variable used for root dir, convert to new standard.
     set(FFMPEG_ROOT_DIR ${FFMPEG})
@@ -303,18 +271,6 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
   endif()
 endif()
 
-if(WITH_CYCLES_DEVICE_ONEAPI)
-  set(CYCLES_LEVEL_ZERO ${LIBDIR}/level-zero CACHE PATH "Path to Level Zero installation")
-  if(EXISTS ${CYCLES_LEVEL_ZERO} AND NOT LEVEL_ZERO_ROOT_DIR)
-    set(LEVEL_ZERO_ROOT_DIR ${CYCLES_LEVEL_ZERO})
-  endif()
-
-  set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to DPC++ and SYCL installation")
-  if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
-    set(SYCL_ROOT_DIR ${CYCLES_SYCL})
-  endif()
-endif()
-
 if(WITH_OPENVDB)
   find_package_wrapper(OpenVDB)
   find_package_wrapper(Blosc)
@@ -610,7 +566,6 @@ if(WITH_SYSTEM_FREETYPE)
   if(NOT FREETYPE_FOUND)
     message(FATAL_ERROR "Failed finding system FreeType version!")
   endif()
-  check_freetype_for_brotli()
 endif()
 
 if(WITH_LZO AND WITH_SYSTEM_LZO)
@@ -653,93 +608,22 @@ endif()
 
 if(WITH_GHOST_WAYLAND)
   find_package(PkgConfig)
-  pkg_check_modules(wayland-client wayland-client>=1.12)
-  pkg_check_modules(wayland-egl wayland-egl)
-  pkg_check_modules(wayland-scanner wayland-scanner)
-  pkg_check_modules(xkbcommon xkbcommon)
-  pkg_check_modules(wayland-cursor wayland-cursor)
-  pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
+  pkg_check_modules(wayland-client REQUIRED wayland-client>=1.12)
+  pkg_check_modules(wayland-egl REQUIRED wayland-egl)
+  pkg_check_modules(wayland-scanner REQUIRED wayland-scanner)
+  pkg_check_modules(xkbcommon REQUIRED xkbcommon)
+  pkg_check_modules(wayland-cursor REQUIRED wayland-cursor)
+  pkg_check_modules(dbus REQUIRED dbus-1)
 
-  if(${wayland-protocols_FOUND})
-    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-  else()
-    # CentOS 7 packages have too old a version, a newer version exist in the
-    # precompiled libraries.
-    find_path(WAYLAND_PROTOCOLS_DIR
-      NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-      PATH_SUFFIXES share/wayland-protocols
-      PATHS ${LIBDIR}/wayland-protocols
-    )
+  set(WITH_GL_EGL ON)
 
-    if(EXISTS ${WAYLAND_PROTOCOLS_DIR})
-      set(wayland-protocols_FOUND ON)
-    endif()
-  endif()
-
-  if (NOT ${wayland-client_FOUND})
-    message(STATUS "wayland-client not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-egl_FOUND})
-    message(STATUS "wayland-egl not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-scanner_FOUND})
-    message(STATUS "wayland-scanner not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-cursor_FOUND})
-    message(STATUS "wayland-cursor not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${wayland-protocols_FOUND})
-    message(STATUS "wayland-protocols not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-  if (NOT ${xkbcommon_FOUND})
-    message(STATUS "xkbcommon not found, disabling WITH_GHOST_WAYLAND")
-    set(WITH_GHOST_WAYLAND OFF)
-  endif()
-
-  if(WITH_GHOST_WAYLAND)
-    if(WITH_GHOST_WAYLAND_DBUS)
-      pkg_check_modules(dbus REQUIRED dbus-1)
-    endif()
-
-    if(WITH_GHOST_WAYLAND_LIBDECOR)
-      pkg_check_modules(libdecor REQUIRED libdecor-0>=0.1)
-    endif()
-
-    list(APPEND PLATFORM_LINKLIBS
-      ${xkbcommon_LINK_LIBRARIES}
-    )
-
-    if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
-      list(APPEND PLATFORM_LINKLIBS
-        ${wayland-client_LINK_LIBRARIES}
-        ${wayland-egl_LINK_LIBRARIES}
-        ${wayland-cursor_LINK_LIBRARIES}
-      )
-    endif()
-
-    if(WITH_GHOST_WAYLAND_DBUS)
-      list(APPEND PLATFORM_LINKLIBS
-        ${dbus_LINK_LIBRARIES}
-      )
-      add_definitions(-DWITH_GHOST_WAYLAND_DBUS)
-    endif()
-
-    if(WITH_GHOST_WAYLAND_LIBDECOR)
-      if(NOT WITH_GHOST_WAYLAND_DYNLOAD)
-        list(APPEND PLATFORM_LINKLIBS
-          ${libdecor_LIBRARIES}
-        )
-      endif()
-      add_definitions(-DWITH_GHOST_WAYLAND_LIBDECOR)
-    endif()
-
-    pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-  endif()
+  list(APPEND PLATFORM_LINKLIBS
+    ${wayland-client_LINK_LIBRARIES}
+    ${wayland-egl_LINK_LIBRARIES}
+    ${xkbcommon_LINK_LIBRARIES}
+    ${wayland-cursor_LINK_LIBRARIES}
+    ${dbus_LINK_LIBRARIES}
+  )
 endif()
 
 if(WITH_GHOST_X11)
@@ -859,8 +743,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
           "The mold linker could not find the directory containing the linker command "
           "(typically "
           "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
-          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker."
-        )
+          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
         set(WITH_LINKER_MOLD OFF)
       endif()
       unset(MOLD_PREFIX)
@@ -959,9 +842,8 @@ unset(_IS_LINKER_DEFAULT)
 
 # Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may
 # use the same libraries as Blender with a different version or build options.
-set(PLATFORM_SYMBOLS_MAP ${CMAKE_SOURCE_DIR}/source/creator/symbols_unix.map)
 set(PLATFORM_LINKFLAGS
-  "${PLATFORM_LINKFLAGS} -Wl,--version-script='${PLATFORM_SYMBOLS_MAP}'"
+  "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
 )
 
 # Don't use position independent executable for portable install since file
@@ -999,8 +881,7 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
       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)
@@ -1012,7 +893,6 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
 
     set(CMAKE_REQUIRED_LIBRARIES atomic)
     check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC)
-    unset(CMAKE_REQUIRED_LIBRARIES)
 
     if(ATOMIC_OPS_WITH_LIBATOMIC)
       set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE)
@@ -1026,16 +906,3 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
 endfunction()
 
 CONFIGURE_ATOMIC_LIB_IF_NEEDED()
-
-if(PLATFORM_BUNDLED_LIBRARIES)
-  # For the installed Python module and installed Blender executable, we set the
-  # rpath to the relative path where the install step will copy the shared libraries.
-  set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-  list(APPEND CMAKE_INSTALL_RPATH $ORIGIN/lib)
-
-  # For executables that are built but not installed (mainly tests) we set an absolute
-  # rpath to the lib folder. This is needed because these can be in different folders,
-  # and because the build and install folder may be different.
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  list(APPEND CMAKE_BUILD_RPATH $ORIGIN/lib ${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib)
-endif()

build_files/cmake/platform/platform_win32.cmake

@@ -146,7 +146,7 @@ endif()
 if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
   if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
     #set a flag so we don't have to do this comparison all the time
-    set(MSVC_ASAN ON)
+    SET(MSVC_ASAN ON)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
     set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /fsanitize=address")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
@@ -185,20 +185,20 @@ endif()
 
 
 if(WITH_WINDOWS_SCCACHE)
-  set(CMAKE_C_COMPILER_LAUNCHER sccache)
-  set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
-  set(SYMBOL_FORMAT /Z7)
-  set(SYMBOL_FORMAT_RELEASE /Z7)
-else()
-  unset(CMAKE_C_COMPILER_LAUNCHER)
-  unset(CMAKE_CXX_COMPILER_LAUNCHER)
-  if(MSVC_ASAN)
+    set(CMAKE_C_COMPILER_LAUNCHER sccache)
+    set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
     set(SYMBOL_FORMAT /Z7)
     set(SYMBOL_FORMAT_RELEASE /Z7)
-  else()
-    set(SYMBOL_FORMAT /ZI)
-    set(SYMBOL_FORMAT_RELEASE /Zi)
-  endif()
+else()
+    unset(CMAKE_C_COMPILER_LAUNCHER)
+    unset(CMAKE_CXX_COMPILER_LAUNCHER)
+    if(MSVC_ASAN)
+      set(SYMBOL_FORMAT /Z7)
+      set(SYMBOL_FORMAT_RELEASE /Z7)
+    else()
+      set(SYMBOL_FORMAT /ZI)
+      set(SYMBOL_FORMAT_RELEASE /Zi)
+    endif()
 endif()
 
 if(WITH_WINDOWS_PDB)
@@ -323,13 +323,6 @@ if(NOT JPEG_FOUND)
   set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
 endif()
 
-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-windows_find_package(Epoxy REQUIRED)
-if(NOT EPOXY_FOUND)
-  set(Epoxy_INCLUDE_DIRS ${LIBDIR}/epoxy/include)
-  set(Epoxy_LIBRARIES ${LIBDIR}/epoxy/lib/epoxy.lib)
-endif()
-
 set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
 set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib)
 
@@ -423,7 +416,7 @@ if(WITH_CODEC_FFMPEG)
       ${LIBDIR}/ffmpeg/lib/avdevice.lib
       ${LIBDIR}/ffmpeg/lib/avutil.lib
       ${LIBDIR}/ffmpeg/lib/swscale.lib
-    )
+      )
   endif()
 endif()
 
@@ -572,14 +565,12 @@ if(WITH_BOOST)
     if(WITH_CYCLES AND WITH_CYCLES_OSL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
         optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX}
-      )
+        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX})
     endif()
     if(WITH_INTERNATIONAL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
         optimized ${BOOST_LIBPATH}/libboost_locale-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX}
-      )
+        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX})
     endif()
   else() # we found boost using find_package
     set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -686,8 +677,7 @@ if(WITH_OPENIMAGEDENOISE)
     optimized ${OPENIMAGEDENOISE_LIBPATH}/dnnl.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib
     debug ${OPENIMAGEDENOISE_LIBPATH}/common_d.lib
-    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib
-  )
+    debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib)
   set(OPENIMAGEDENOISE_DEFINITIONS)
 endif()
 
@@ -842,8 +832,7 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
       debug ${LIBDIR}/embree/lib/math_d.lib
       debug ${LIBDIR}/embree/lib/simd_d.lib
       debug ${LIBDIR}/embree/lib/sys_d.lib
-      debug ${LIBDIR}/embree/lib/tasking_d.lib
-    )
+      debug ${LIBDIR}/embree/lib/tasking_d.lib)
   endif()
 endif()
 
@@ -961,6 +950,3 @@ endif()
 
 set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
 set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
-
-set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
-set(SYCL_ROOT_DIR ${LIBDIR}/dpcpp)

build_files/config/pipeline_config.yaml

@@ -54,8 +54,6 @@ buildbot:
         version: '10.1.243'
     cuda11:
         version: '11.4.1'
-    hip:
-        version: '5.2.21440'
     optix:
         version: '7.3.0'
     cmake:

build_files/utils/make_update.py

@@ -110,9 +110,6 @@ def svn_update(args, release_version):
                 if not make_utils.command_missing(args.svn_command):
                     call(svn_non_interactive + ["cleanup", lib_dirpath])
                 continue
-            elif dirname.startswith("."):
-                # Temporary paths such as ".mypy_cache" will report a warning, skip hidden directories.
-                continue
 
             svn_dirpath = os.path.join(dirpath, ".svn")
             svn_root_dirpath = os.path.join(lib_dirpath, ".svn")

doc/doxygen/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = V3.4
+PROJECT_NUMBER         = V3.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/python_api/examples/bpy.props.4.py

@@ -6,10 +6,6 @@ It can be useful to perform an action when a property is changed and can be
 used to update other properties or synchronize with external data.
 
 All properties define update functions except for CollectionProperty.
-
-.. warning::
-   Remember that these callbacks may be executed in threaded context.
-
 """
 
 import bpy

doc/python_api/examples/bpy.props.5.py

@@ -6,10 +6,6 @@ Getter/setter functions can be used for boolean, int, float, string and enum pro
 If these callbacks are defined the property will not be stored in the ID properties
 automatically. Instead, the `get` and `set` functions will be called when the property
 is respectively read or written from the API.
-
-.. warning::
-   Remember that these callbacks may be executed in threaded context.
-
 """
 import bpy
 

doc/python_api/examples/bpy.props.py

@@ -7,15 +7,6 @@ Custom properties can be added to any subclass of an :class:`ID`,
 
 These properties can be animated, accessed by the user interface and python
 like Blender's existing properties.
-
-.. warning::
-
-   Access to these properties might happen in threaded context, on a per-data-block level.
-   This has to be carefully considered when using accessors or update callbacks.
-
-   Typically, these callbacks should not affect any other data that the one owned by their data-block.
-   When accessing external non-Blender data, thread safety mechanisms should be considered.
-
 """
 
 import bpy

doc/python_api/examples/bpy.types.Menu.4.py

@@ -3,8 +3,8 @@ Extending the Button Context Menu
 +++++++++++++++++++++++++++++++++
 
 This example enables you to insert your own menu entry into the common
-right click menu that you get while hovering over a UI button (e.g. operator,
-value field, color, string, etc.)
+right click menu that you get while hovering over a value field,
+color, string, etc.
 
 To make the example work, you have to first select an object
 then right click on an user interface element (maybe a color in the
@@ -14,6 +14,7 @@ Executing the operator will then print all values.
 """
 
 import bpy
+from bpy.types import Menu
 
 
 def dump(obj, text):
@@ -46,20 +47,36 @@ class WM_OT_button_context_test(bpy.types.Operator):
         return {'FINISHED'}
 
 
-def draw_menu(self, context):
+# This class has to be exactly named like that to insert an entry in the right click menu
+class WM_MT_button_context(Menu):
+    bl_label = "Unused"
+
+    def draw(self, context):
+        pass
+
+
+def menu_func(self, context):
     layout = self.layout
     layout.separator()
     layout.operator(WM_OT_button_context_test.bl_idname)
 
 
+classes = (
+    WM_OT_button_context_test,
+    WM_MT_button_context,
+)
+
+
 def register():
-    bpy.utils.register_class(WM_OT_button_context_test)
-    bpy.types.UI_MT_button_context_menu.append(draw_menu)
+    for cls in classes:
+        bpy.utils.register_class(cls)
+    bpy.types.WM_MT_button_context.append(menu_func)
 
 
 def unregister():
-    bpy.types.UI_MT_button_context_menu.remove(draw_menu)
-    bpy.utils.unregister_class(WM_OT_button_context_test)
+    for cls in classes:
+        bpy.utils.unregister_class(cls)
+    bpy.types.WM_MT_button_context.remove(menu_func)
 
 
 if __name__ == "__main__":

doc/python_api/examples/bpy.types.Operator.5.py

@@ -1,6 +1,4 @@
 """
-.. _modal_operator:
-
 Modal Execution
 +++++++++++++++
 

doc/python_api/examples/gpu.10.py

@@ -14,36 +14,33 @@ from random import random
 from mathutils import Vector
 from gpu_extras.batch import batch_for_shader
 
-vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
-vert_out.smooth('FLOAT', "v_ArcLength")
+vertex_shader = '''
+    uniform mat4 u_ViewProjectionMatrix;
 
-shader_info = gpu.types.GPUShaderCreateInfo()
-shader_info.push_constant('MAT4', "u_ViewProjectionMatrix")
-shader_info.push_constant('FLOAT', "u_Scale")
-shader_info.vertex_in(0, 'VEC3', "position")
-shader_info.vertex_in(1, 'FLOAT', "arcLength")
-shader_info.vertex_out(vert_out)
-shader_info.fragment_out(0, 'VEC4', "FragColor")
+    in vec3 position;
+    in float arcLength;
 
-shader_info.vertex_source(
-    "void main()"
-    "{"
-    "  v_ArcLength = arcLength;"
-    "  gl_Position = u_ViewProjectionMatrix * vec4(position, 1.0f);"
-    "}"
-)
+    out float v_ArcLength;
 
-shader_info.fragment_source(
-    "void main()"
-    "{"
-    "  if (step(sin(v_ArcLength * u_Scale), 0.5) == 1) discard;"
-    "  FragColor = vec4(1.0);"
-    "}"
-)
+    void main()
+    {
+        v_ArcLength = arcLength;
+        gl_Position = u_ViewProjectionMatrix * vec4(position, 1.0f);
+    }
+'''
 
-shader = gpu.shader.create_from_info(shader_info)
-del vert_out
-del shader_info
+fragment_shader = '''
+    uniform float u_Scale;
+
+    in float v_ArcLength;
+    out vec4 FragColor;
+
+    void main()
+    {
+        if (step(sin(v_ArcLength * u_Scale), 0.5) == 1) discard;
+        FragColor = vec4(1.0);
+    }
+'''
 
 coords = [Vector((random(), random(), random())) * 5 for _ in range(5)]
 
@@ -51,6 +48,7 @@ arc_lengths = [0]
 for a, b in zip(coords[:-1], coords[1:]):
     arc_lengths.append(arc_lengths[-1] + (a - b).length)
 
+shader = gpu.types.GPUShader(vertex_shader, fragment_shader)
 batch = batch_for_shader(
     shader, 'LINE_STRIP',
     {"position": coords, "arcLength": arc_lengths},

doc/python_api/examples/gpu.2.py

@@ -6,37 +6,33 @@ import bpy
 import gpu
 from gpu_extras.batch import batch_for_shader
 
+vertex_shader = '''
+    uniform mat4 viewProjectionMatrix;
 
-vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
-vert_out.smooth('VEC3', "pos")
+    in vec3 position;
+    out vec3 pos;
 
-shader_info = gpu.types.GPUShaderCreateInfo()
-shader_info.push_constant('MAT4', "viewProjectionMatrix")
-shader_info.push_constant('FLOAT', "brightness")
-shader_info.vertex_in(0, 'VEC3', "position")
-shader_info.vertex_out(vert_out)
-shader_info.fragment_out(0, 'VEC4', "FragColor")
+    void main()
+    {
+        pos = position;
+        gl_Position = viewProjectionMatrix * vec4(position, 1.0f);
+    }
+'''
 
-shader_info.vertex_source(
-    "void main()"
-    "{"
-    "  pos = position;"
-    "  gl_Position = viewProjectionMatrix * vec4(position, 1.0f);"
-    "}"
-)
+fragment_shader = '''
+    uniform float brightness;
 
-shader_info.fragment_source(
-    "void main()"
-    "{"
-    "  FragColor = vec4(pos * brightness, 1.0);"
-    "}"
-)
+    in vec3 pos;
+    out vec4 FragColor;
 
-shader = gpu.shader.create_from_info(shader_info)
-del vert_out
-del shader_info
+    void main()
+    {
+        FragColor = vec4(pos * brightness, 1.0);
+    }
+'''
 
 coords = [(1, 1, 1), (2, 0, 0), (-2, -1, 3)]
+shader = gpu.types.GPUShader(vertex_shader, fragment_shader)
 batch = batch_for_shader(shader, 'TRIS', {"position": coords})
 
 

doc/python_api/examples/gpu.7.py

@@ -35,37 +35,35 @@ with offscreen.bind():
 # Drawing the generated texture in 3D space
 #############################################
 
-vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
-vert_out.smooth('VEC2', "uvInterp")
+vertex_shader = '''
+    uniform mat4 modelMatrix;
+    uniform mat4 viewProjectionMatrix;
 
-shader_info = gpu.types.GPUShaderCreateInfo()
-shader_info.push_constant('MAT4', "viewProjectionMatrix")
-shader_info.push_constant('MAT4', "modelMatrix")
-shader_info.sampler(0, 'FLOAT_2D', "image")
-shader_info.vertex_in(0, 'VEC2', "position")
-shader_info.vertex_in(1, 'VEC2', "uv")
-shader_info.vertex_out(vert_out)
-shader_info.fragment_out(0, 'VEC4', "FragColor")
+    in vec2 position;
+    in vec2 uv;
 
-shader_info.vertex_source(
-    "void main()"
-    "{"
-    "  uvInterp = uv;"
-    "  gl_Position = viewProjectionMatrix * modelMatrix * vec4(position, 0.0, 1.0);"
-    "}"
-)
+    out vec2 uvInterp;
 
-shader_info.fragment_source(
-    "void main()"
-    "{"
-    "  FragColor = texture(image, uvInterp);"
-    "}"
-)
+    void main()
+    {
+        uvInterp = uv;
+        gl_Position = viewProjectionMatrix * modelMatrix * vec4(position, 0.0, 1.0);
+    }
+'''
 
-shader = gpu.shader.create_from_info(shader_info)
-del vert_out
-del shader_info
+fragment_shader = '''
+    uniform sampler2D image;
 
+    in vec2 uvInterp;
+    out vec4 FragColor;
+
+    void main()
+    {
+        FragColor = texture(image, uvInterp);
+    }
+'''
+
+shader = gpu.types.GPUShader(vertex_shader, fragment_shader)
 batch = batch_for_shader(
     shader, 'TRI_FAN',
     {

doc/python_api/rst/info_gotcha.rst

@@ -86,8 +86,7 @@ No updates after setting values
 Sometimes you want to modify values from Python and immediately access the updated values, e.g:
 Once changing the objects :class:`bpy.types.Object.location`
 you may want to access its transformation right after from :class:`bpy.types.Object.matrix_world`,
-but this doesn't work as you might expect. There are similar issues with changes to the UI, that
-are covered in the next section.
+but this doesn't work as you might expect.
 
 Consider the calculations that might contribute to the object's final transformation, this includes:
 
@@ -111,35 +110,6 @@ Now all dependent data (child objects, modifiers, drivers, etc.)
 have been recalculated and are available to the script within the active view layer.
 
 
-No updates after changing UI context
-------------------------------------
-
-Similar to the previous issue, some changes to the UI  may also not have an immediate effect. For example, setting
-:class:`bpy.types.Window.workspace` doesn't seem to cause an observable effect in the immediately following code
-(:class:`bpy.types.Window.workspace` is still the same), but the UI will in fact reflect the change. Some of the
-properties that behave that way are:
-
-- :class:`bpy.types.Window.workspace`
-- :class:`bpy.types.Window.screen`
-- :class:`bpy.types.Window.scene`
-- :class:`bpy.types.Area.type`
-- :class:`bpy.types.Area.uitype`
-
-Such changes impact the UI, and with that the context (:class:`bpy.context`) quite drastically. This can break
-Blender's context management. So Blender delays this change until after operators have run and just before the UI is
-redrawn, making sure that context can be changed safely.
-
-If you rely on executing code with an updated context this can be worked around by executing the code in a delayed
-fashion as well. Possible options include:
-
- - :ref:`Modal Operator <modal_operator>`.
- - :class:`bpy.app.handlers`.
- - :class:`bpy.app.timer`.
-
-It's also possible to depend on drawing callbacks although these should generally be avoided as failure to draw a
-hidden panel, region, cursor, etc. could cause your script to be unreliable
-
-
 Can I redraw during script execution?
 -------------------------------------
 

doc/python_api/sphinx_changelog_gen.py

@@ -1,111 +1,59 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 """
----------------
+Dump the python API into a text file so we can generate changelogs.
 
-Dump the python API into a JSON file, or generate changelogs from those JSON API dumps.
+output from this tool should be added into "doc/python_api/rst/change_log.rst"
 
-Typically, changelog output from this tool should be added into "doc/python_api/rst/change_log.rst"
+# dump api blender_version.py in CWD
+blender --background --python doc/python_api/sphinx_changelog_gen.py -- --dump
 
-API dump files are saved together with the generated API doc on the server, with a general index file.
-This way the changelog generation simply needs to re-download the previous version's dump for the diffing process.
-
----------------
-
-# Dump api blender_version.json in CWD:
-blender --background  --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        dump --filepath-out="path/to/api/docs/<version>/api_dump.json"
-
-# Create changelog:
+# create changelog
 blender --background --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-out doc/python_api/rst/change_log.rst
+        --api_from blender_2_63_0.py \
+        --api_to   blender_2_64_0.py \
+        --api_out changes.rst
 
-# Api comparison can also run without blender,
-# will by default generate changeloig between the last two available versions listed in the index,
-# unless input files are provided explicitely:
+
+# Api comparison can also run without blender
 python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-in-from blender_api_2_63_0.json \
-                  --filepath-in-to   blender_api_2_64_0.json \
-                  --filepath-out changes.rst
+        --api_from blender_api_2_63_0.py \
+        --api_to   blender_api_2_64_0.py \
+        --api_out changes.rst
 
---------------
-
-API dump index format:
-
-{[version_main, version_sub]: "<version>/api_dump.json", ...
-}
-
-API dump format:
-
-[
-    [version_main, vserion_sub, version_path],
-    {"module.name":
-        {"parent.class":
-            {"basic_type", "member_name":
-                ["Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types]}, ...
-        }, ...
-    }
-]
+# Save the latest API dump in this folder, renaming it with its revision.
+# This way the next person updating it doesn't need to build an old Blender only for that
 
 """
 
-import json
-import os
-
+# format
+'''
+{"module.name":
+    {"parent.class":
+        {"basic_type", "member_name":
+            ("Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types)}, ...
+    }, ...
+}
+'''
 
 api_names = "basic_type" "name", "type", "range", "length", "default", "descr", "f_args", "f_arg_types", "f_ret_types"
+
 API_BASIC_TYPE = 0
 API_F_ARGS = 7
 
 
-def api_version():
-    try:
-        import bpy
-    except:
-        return None, None
-    version = tuple(bpy.app.version[:2])
-    version_key = "%d.%d" % (version[0], version[1])
-    return version, version_key
+def api_dunp_fname():
+    import bpy
+    return "blender_api_%s.py" % "_".join([str(i) for i in bpy.app.version])
 
 
-def api_version_previous_in_index(index, version):
-    print("Searching for previous version to %s in %r" % (version, index))
-    version_prev = (version[0], version[1])
-    while True:
-        version_prev = (version_prev[0], version_prev[1] - 1)
-        if version_prev[1] < 0:
-            version_prev = (version_prev[0] - 1, 99)
-        if version_prev[0] < 0:
-            return None, None
-        version_prev_key = "%d.%d" % (version_prev[0], version_prev[1])
-        if version_prev_key in index:
-            print("Found previous version %s: %r" % (version_prev, index[version_prev_key]))
-            return version_prev, version_prev_key
-
-
-class JSONEncoderAPIDump(json.JSONEncoder):
-    def default(self, o):
-        if o is ...:
-            return "..."
-        if isinstance(o, set):
-            return tuple(o)
-        return json.JSONEncoder.default(self, o)
-
-
-def api_dump(args):
-    import rna_info
-    import inspect
-
-    version, version_key = api_version()
-    if version is None:
-        raise(ValueError("API dumps can only be generated from within Blender."))
-
+def api_dump():
     dump = {}
     dump_module = dump["bpy.types"] = {}
 
+    import rna_info
+    import inspect
+
     struct = rna_info.BuildRNAInfo()[0]
     for struct_id, struct_info in sorted(struct.items()):
 
@@ -207,25 +155,17 @@ def api_dump(args):
             )
         del funcs
 
-    filepath_out = args.filepath_out
-    with open(filepath_out, 'w', encoding='utf-8') as file_handle:
-        json.dump((version, dump), file_handle, cls=JSONEncoderAPIDump)
+    import pprint
 
-    indexpath = args.indexpath
-    rootpath = os.path.dirname(indexpath)
-    if os.path.exists(indexpath):
-        with open(indexpath, 'r', encoding='utf-8') as file_handle:
-            index = json.load(file_handle)
-    else:
-        index = {}
-    index[version_key] = os.path.relpath(filepath_out, rootpath)
-    with open(indexpath, 'w', encoding='utf-8') as file_handle:
-        json.dump(index, file_handle)
-
-    print("API version %s dumped into %r, and index %r has been updated" % (version_key, filepath_out, indexpath))
+    filename = api_dunp_fname()
+    filehandle = open(filename, 'w', encoding='utf-8')
+    tot = filehandle.write(pprint.pformat(dump, width=1))
+    filehandle.close()
+    print("%s, %d bytes written" % (filename, tot))
 
 
 def compare_props(a, b, fuzz=0.75):
+
     # must be same basic_type, function != property
     if a[0] != b[0]:
         return False
@@ -240,44 +180,15 @@ def compare_props(a, b, fuzz=0.75):
     return ((tot / totlen) >= fuzz)
 
 
-def api_changelog(args):
-    indexpath = args.indexpath
-    filepath_in_from = args.filepath_in_from
-    filepath_in_to = args.filepath_in_to
-    filepath_out = args.filepath_out
+def api_changelog(api_from, api_to, api_out):
 
-    rootpath = os.path.dirname(indexpath)
+    file_handle = open(api_from, 'r', encoding='utf-8')
+    dict_from = eval(file_handle.read())
+    file_handle.close()
 
-    version, version_key = api_version()
-    if version is None and (filepath_in_from is None or filepath_in_to is None):
-        raise(ValueError("API dumps files must be given when ran outside of Blender."))
-
-    with open(indexpath, 'r', encoding='utf-8') as file_handle:
-        index = json.load(file_handle)
-
-    if filepath_in_to is None:
-        filepath_in_to = index.get(version_key, None)
-    if filepath_in_to is None:
-        raise(ValueError("Cannot find API dump file for Blender version " + str(version) + " in index file."))
-
-    print("Found to file: %r" % filepath_in_to)
-
-    if filepath_in_from is None:
-        version_from, version_from_key = api_version_previous_in_index(index, version)
-        if version_from is None:
-            raise(ValueError("No previous version of Blender could be found in the index."))
-        filepath_in_from = index.get(version_from_key, None)
-    if filepath_in_from is None:
-        raise(ValueError("Cannot find API dump file for previous Blender version " + str(version_from) + " in index file."))
-
-    print("Found from file: %r" % filepath_in_from)
-
-    with open(os.path.join(rootpath, filepath_in_from), 'r', encoding='utf-8') as file_handle:
-        _, dict_from = json.load(file_handle)
-
-    with open(os.path.join(rootpath, filepath_in_to), 'r', encoding='utf-8') as file_handle:
-        dump_version, dict_to = json.load(file_handle)
-        assert(tuple(dump_version) == version)
+    file_handle = open(api_to, 'r', encoding='utf-8')
+    dict_to = eval(file_handle.read())
+    file_handle.close()
 
     api_changes = []
 
@@ -338,66 +249,63 @@ def api_changelog(args):
 
     # also document function argument changes
 
-    with open(filepath_out, 'w', encoding='utf-8') as fout:
-        fw = fout.write
+    fout = open(api_out, 'w', encoding='utf-8')
+    fw = fout.write
+    # print(api_changes)
 
-        # Write header.
-        fw(""
-           ":tocdepth: 2\n"
-           "\n"
-           "Blender API Change Log\n"
-           "**********************\n"
-           "\n"
-           ".. note, this document is auto generated by sphinx_changelog_gen.py\n"
-           "\n"
-           "\n"
-           "%s to %s\n"
-           "============\n"
-           "\n" % (version_from_key, version_key))
+    # :class:`bpy_struct.id_data`
 
-        def write_title(title, title_char):
-            fw("%s\n%s\n\n" % (title, title_char * len(title)))
+    def write_title(title, title_char):
+        fw("%s\n%s\n\n" % (title, title_char * len(title)))
 
-        for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
-            class_name = class_id.split(".")[-1]
-            title = mod_id + "." + class_name
-            write_title(title, "-")
+    for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
+        class_name = class_id.split(".")[-1]
+        title = mod_id + "." + class_name
+        write_title(title, "-")
 
-            if props_new:
-                write_title("Added", "^")
-                for prop_id in props_new:
-                    fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
-                fw("\n")
+        if props_new:
+            write_title("Added", "^")
+            for prop_id in props_new:
+                fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
+            fw("\n")
 
-            if props_old:
-                write_title("Removed", "^")
-                for prop_id in props_old:
-                    fw("* **%s**\n" % prop_id)  # can't link to removed docs
-                fw("\n")
+        if props_old:
+            write_title("Removed", "^")
+            for prop_id in props_old:
+                fw("* **%s**\n" % prop_id)  # can't link to removed docs
+            fw("\n")
 
-            if props_moved:
-                write_title("Renamed", "^")
-                for prop_id_old, prop_id in props_moved:
-                    fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
-                fw("\n")
+        if props_moved:
+            write_title("Renamed", "^")
+            for prop_id_old, prop_id in props_moved:
+                fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
+            fw("\n")
 
-            if func_args:
-                write_title("Function Arguments", "^")
-                for func_id, args_old, args_new in func_args:
-                    args_new = ", ".join(args_new)
-                    args_old = ", ".join(args_old)
-                    fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
-                fw("\n")
+        if func_args:
+            write_title("Function Arguments", "^")
+            for func_id, args_old, args_new in func_args:
+                args_new = ", ".join(args_new)
+                args_old = ", ".join(args_old)
+                fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
+            fw("\n")
 
-    print("Written: %r" % filepath_out)
+    fout.close()
+
+    print("Written: %r" % api_out)
 
 
-def main(argv=None):
+def main():
     import sys
-    import argparse
+    import os
 
-    if argv is None:
-        argv = sys.argv
+    try:
+        import argparse
+    except ImportError:
+        print("Old Blender, just dumping")
+        api_dump()
+        return
+
+    argv = sys.argv
 
     if "--" not in argv:
         argv = []  # as if no args are passed
@@ -408,42 +316,42 @@ def main(argv=None):
     usage_text = "Run blender in background mode with this script: "
     "blender --background --factory-startup --python %s -- [options]" % os.path.basename(__file__)
 
-    parser = argparse.ArgumentParser(description=usage_text,
-                                     epilog=__doc__,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+    epilog = "Run this before releases"
+
+    parser = argparse.ArgumentParser(description=usage_text, epilog=epilog)
+
     parser.add_argument(
-        "--indexpath", dest="indexpath", metavar='FILE', required=True,
-        help="Path of the JSON file containing the index of all available API dumps.")
+        "--dump", dest="dump", action='store_true',
+        help="When set the api will be dumped into blender_version.py")
 
-    parser_commands = parser.add_subparsers(required=True)
+    parser.add_argument(
+        "--api_from", dest="api_from", metavar='FILE',
+        help="File to compare from (previous version)")
+    parser.add_argument(
+        "--api_to", dest="api_to", metavar='FILE',
+        help="File to compare from (current)")
+    parser.add_argument(
+        "--api_out", dest="api_out", metavar='FILE',
+        help="Output sphinx changelog")
 
-    parser_dump = parser_commands.add_parser('dump', help="Dump the current Blender Python API into a JSON file.")
-    parser_dump.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Path of the JSON file containing the dump of the API.")
-    parser_dump.set_defaults(func=api_dump)
+    args = parser.parse_args(argv)  # In this example we won't use the args
 
-    parser_changelog = parser_commands.add_parser(
-        'changelog',
-        help="Generate the RST changelog page based on two Blender Python API JSON dumps.",
-    )
+    if not argv:
+        print("No args given!")
+        parser.print_help()
+        return
 
-    parser_changelog.add_argument(
-        "--filepath-in-from", dest="filepath_in_from", metavar='FILE', default=None,
-        help="JSON dump file to compare from (typically, previous version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-in-to", dest="filepath_in_to", metavar='FILE', default=None,
-        help="JSON dump file to compare to (typically, current version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Output sphinx changelog RST file.")
-    parser_changelog.set_defaults(func=api_changelog)
+    if args.dump:
+        api_dump()
+    else:
+        if args.api_from and args.api_to and args.api_out:
+            api_changelog(args.api_from, args.api_to, args.api_out)
+        else:
+            print("Error: --api_from/api_to/api_out args needed")
+            parser.print_help()
+            return
 
-    args = parser.parse_args(argv)
-
-    args.func(args)
+    print("batch job finished, exiting")
 
 
 if __name__ == "__main__":

doc/python_api/sphinx_doc_gen.py

@@ -141,26 +141,6 @@ def handle_args():
         required=False,
     )
 
-    parser.add_argument(
-        "--api-changelog-generate",
-        dest="changelog",
-        default=False,
-        action='store_true',
-        help="Generate the API changelog RST file "
-        "(default=False, requires `--api-dump-index-path` parameter)",
-        required=False,
-    )
-
-    parser.add_argument(
-        "--api-dump-index-path",
-        dest="api_dump_index_path",
-        metavar='FILE',
-        default=None,
-        help="Path to the API dump index JSON file "
-        "(required when `--api-changelog-generate` is True)",
-        required=False,
-    )
-
     parser.add_argument(
         "-o", "--output",
         dest="output_dir",
@@ -534,42 +514,6 @@ if ARGS.sphinx_build_pdf:
         sphinx_make_pdf_log = os.path.join(ARGS.output_dir, ".latex_make.log")
         SPHINX_MAKE_PDF_STDOUT = open(sphinx_make_pdf_log, "w", encoding="utf-8")
 
-
-# --------------------------------CHANGELOG GENERATION--------------------------------------
-
-def generate_changelog():
-    import importlib.util
-    spec = importlib.util.spec_from_file_location(
-        "sphinx_changelog_gen",
-        os.path.abspath(os.path.join(SCRIPT_DIR, "sphinx_changelog_gen.py")),
-    )
-    sphinx_changelog_gen = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(sphinx_changelog_gen)
-
-    API_DUMP_INDEX_FILEPATH = ARGS.api_dump_index_path
-    API_DUMP_ROOT = os.path.dirname(API_DUMP_INDEX_FILEPATH)
-    API_DUMP_FILEPATH = os.path.abspath(os.path.join(API_DUMP_ROOT, BLENDER_VERSION_DOTS, "api_dump.json"))
-    API_CHANGELOG_FILEPATH = os.path.abspath(os.path.join(SPHINX_IN_TMP, "change_log.rst"))
-
-    sphinx_changelog_gen.main((
-        "--",
-        "--indexpath",
-        API_DUMP_INDEX_FILEPATH,
-        "dump",
-        "--filepath-out",
-        API_DUMP_FILEPATH,
-    ))
-
-    sphinx_changelog_gen.main((
-        "--",
-        "--indexpath",
-        API_DUMP_INDEX_FILEPATH,
-        "changelog",
-        "--filepath-out",
-        API_CHANGELOG_FILEPATH,
-    ))
-
-
 # --------------------------------API DUMP--------------------------------------
 
 # Lame, python won't give some access.
@@ -1131,7 +1075,6 @@ def pymodule2sphinx(basepath, module_name, module, title, module_all_extra):
 # Changes In Blender will force errors here.
 context_type_map = {
     # context_member: (RNA type, is_collection)
-    "active_action": ("Action", False),
     "active_annotation_layer": ("GPencilLayer", False),
     "active_bone": ("EditBone", False),
     "active_file": ("FileSelectEntry", False),
@@ -1530,8 +1473,7 @@ def pyrna2sphinx(basepath):
         else:
             fw(".. class:: %s\n\n" % struct_id)
 
-        write_indented_lines("   ", fw, struct.description, False)
-        fw("\n")
+        fw("   %s\n\n" % struct.description)
 
         # Properties sorted in alphabetical order.
         sorted_struct_properties = struct.properties[:]
@@ -2531,9 +2473,6 @@ def main():
 
     rna2sphinx(SPHINX_IN_TMP)
 
-    if ARGS.changelog:
-        generate_changelog()
-
     if ARGS.full_rebuild:
         # Only for full updates.
         shutil.rmtree(SPHINX_IN, True)

extern/CMakeLists.txt

@@ -32,6 +32,14 @@ if(WITH_BINRELOC)
   add_subdirectory(binreloc)
 endif()
 
+if(NOT WITH_SYSTEM_GLEW)
+  if(WITH_GLEW_ES)
+    add_subdirectory(glew-es)
+  else()
+    add_subdirectory(glew)
+  endif()
+endif()
+
 if(WITH_LZO AND NOT WITH_SYSTEM_LZO)
   add_subdirectory(lzo)
 endif()
@@ -40,7 +48,7 @@ if(WITH_LZMA)
   add_subdirectory(lzma)
 endif()
 
-if(WITH_CYCLES OR WITH_COMPOSITOR_CPU OR WITH_OPENSUBDIV)
+if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
   add_subdirectory(clew)
   if((WITH_CYCLES_DEVICE_CUDA OR WITH_CYCLES_DEVICE_OPTIX) AND WITH_CUDA_DYNLOAD)
     add_subdirectory(cuew)
@@ -88,6 +96,6 @@ if(WITH_MOD_FLUID)
   add_subdirectory(mantaflow)
 endif()
 
-if(WITH_COMPOSITOR_CPU)
+if(WITH_COMPOSITOR)
   add_subdirectory(smaa_areatex)
 endif()

extern/audaspace/bindings/C/AUD_Special.cpp

@@ -270,7 +270,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl
 	return length;
 }
 
-AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data, char* error, size_t errorsize)
+AUD_API const char* AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data)
 {
 	try
 	{
@@ -282,20 +282,15 @@ AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int lengt
 		std::shared_ptr<IWriter> writer = FileWriter::createWriter(filename, convCToDSpec(specs), static_cast<Container>(format), static_cast<Codec>(codec), bitrate);
 		FileWriter::writeReader(reader, writer, length, buffersize, callback, data);
 
-		return true;
+		return nullptr;
 	}
 	catch(Exception& e)
 	{
-		if(error && errorsize)
-		{
-			std::strncpy(error, e.getMessage().c_str(), errorsize);
-			error[errorsize - 1] = '\0';
-		}
-		return false;
+		return e.getMessage().c_str();
 	}
 }
 
-AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data, char* error, size_t errorsize)
+AUD_API const char* AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length, unsigned int buffersize, const char* filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate, void(*callback)(float, void*), void* data)
 {
 	try
 	{
@@ -333,16 +328,11 @@ AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsign
 		reader->seek(start);
 		FileWriter::writeReader(reader, writers, length, buffersize, callback, data);
 
-		return true;
+		return nullptr;
 	}
 	catch(Exception& e)
 	{
-		if(error && errorsize)
-		{
-			std::strncpy(error, e.getMessage().c_str(), errorsize);
-			error[errorsize - 1] = '\0';
-		}
-		return false;
+		return e.getMessage().c_str();
 	}
 }
 

extern/audaspace/bindings/C/AUD_Special.h

@@ -70,15 +70,13 @@ extern AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, in
  * \param bitrate The bitrate for encoding.
  * \param callback A callback function that is called periodically during mixdown, reporting progress if length > 0. Can be NULL.
  * \param data Pass through parameter that is passed to the callback.
- * \param error String buffer to copy the error message to in case of failure.
- * \param errorsize The size of the error buffer.
- * \return Whether or not the operation succeeded.
+ * \return An error message or NULL in case of success.
  */
-extern AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length,
+extern AUD_API const char* AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned int length,
 							   unsigned int buffersize, const char* filename,
 							   AUD_DeviceSpecs specs, AUD_Container format,
 							   AUD_Codec codec, unsigned int bitrate,
-							   void(*callback)(float, void*), void* data, char* error, size_t errorsize);
+							   void(*callback)(float, void*), void* data);
 
 /**
  * Mixes a sound down into multiple files.
@@ -93,15 +91,13 @@ extern AUD_API int AUD_mixdown(AUD_Sound* sound, unsigned int start, unsigned in
  * \param bitrate The bitrate for encoding.
  * \param callback A callback function that is called periodically during mixdown, reporting progress if length > 0. Can be NULL.
  * \param data Pass through parameter that is passed to the callback.
- * \param error String buffer to copy the error message to in case of failure.
- * \param errorsize The size of the error buffer.
- * \return Whether or not the operation succeeded.
+ * \return An error message or NULL in case of success.
  */
-extern AUD_API int AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length,
+extern AUD_API const char* AUD_mixdown_per_channel(AUD_Sound* sound, unsigned int start, unsigned int length,
 										   unsigned int buffersize, const char* filename,
 										   AUD_DeviceSpecs specs, AUD_Container format,
 										   AUD_Codec codec, unsigned int bitrate,
-										   void(*callback)(float, void*), void* data, char* error, size_t errorsize);
+										   void(*callback)(float, void*), void* data);
 
 /**
  * Opens a read device and prepares it for mixdown of the sound scene.

extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp

@@ -363,8 +363,8 @@ int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
 
 	long long size = std::min(static_cast<long long>(buf_size), reader->m_membuffer->getSize() - reader->m_membufferpos);
 
-	if(size <= 0)
-		return AVERROR_EOF;
+	if(size < 0)
+		return -1;
 
 	std::memcpy(buf, ((data_t*)reader->m_membuffer->getBuffer()) + reader->m_membufferpos, size);
 	reader->m_membufferpos += size;

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -41,7 +41,7 @@ double PulseAudioDevice::PulseAudioSynchronizer::getPosition(std::shared_ptr<IHa
 
 void PulseAudioDevice::updateRingBuffer()
 {
-	unsigned int samplesize = AUD_DEVICE_SAMPLE_SIZE(m_specs);
+	unsigned int samplesize = AUD_SAMPLE_SIZE(m_specs);
 
 	std::unique_lock<std::mutex> lock(m_mixingLock);
 

extern/curve_fit_nd/README.blender

@@ -1,5 +1,5 @@
 Project: Curve-Fit-nD
 URL: https://github.com/ideasman42/curve-fit-nd
 License: BSD 3-Clause
-Upstream version: ae32da9de264c3ed399673e2bc1bc09003799416 (Last Release)
+Upstream version: ddcd5bd (Last Release)
 Local modifications: None

extern/curve_fit_nd/curve_fit_nd.h

@@ -39,7 +39,7 @@
  * Takes a flat array of points and evaluates that to calculate a bezier spline.
  *
  * \param points, points_len: The array of points to calculate a cubics from.
- * \param dims: The number of dimensions for each element in \a points.
+ * \param dims: The number of dimensions for for each element in \a points.
  * \param error_threshold: the error threshold to allow for,
  * the curve will be within this distance from \a points.
  * \param corners, corners_len: indices for points which will not have aligned tangents (optional).
@@ -47,10 +47,10 @@
  * to evaluate a line to detect corner indices.
  *
  * \param r_cubic_array, r_cubic_array_len: Resulting array of tangents and knots, formatted as follows:
- * `r_cubic_array[r_cubic_array_len][3][dims]`,
+ * ``r_cubic_array[r_cubic_array_len][3][dims]``,
  * where each point has 0 and 2 for the tangents and the middle index 1 for the knot.
- * The size of the *flat* array will be `r_cubic_array_len * 3 * dims`.
- * \param r_corner_index_array, r_corner_index_len: Corner indices in \a r_cubic_array (optional).
+ * The size of the *flat* array will be ``r_cubic_array_len * 3 * dims``.
+ * \param r_corner_index_array, r_corner_index_len: Corner indices in in \a r_cubic_array (optional).
  * This allows you to access corners on the resulting curve.
  *
  * \returns zero on success, nonzero is reserved for error values.
@@ -85,7 +85,7 @@ int curve_fit_cubic_to_points_fl(
  * Takes a flat array of points and evaluates that to calculate handle lengths.
  *
  * \param points, points_len: The array of points to calculate a cubics from.
- * \param dims: The number of dimensions for each element in \a points.
+ * \param dims: The number of dimensions for for each element in \a points.
  * \param points_length_cache: Optional pre-calculated lengths between points.
  * \param error_threshold: the error threshold to allow for,
  * \param tan_l, tan_r: Normalized tangents the handles will be aligned to.
@@ -166,7 +166,7 @@ int curve_fit_cubic_to_points_refit_fl(
  * A helper function that takes a line and outputs its corner indices.
  *
  * \param points, points_len: Curve to evaluate.
- * \param dims: The number of dimensions for each element in \a points.
+ * \param dims: The number of dimensions for for each element in \a points.
  * \param radius_min: Corners on the curve between points below this radius are ignored.
  * \param radius_max: Corners on the curve above this radius are ignored.
  * \param samples_max: Prevent testing corners beyond this many points

extern/curve_fit_nd/intern/curve_fit_cubic.c

@@ -43,24 +43,20 @@
 
 #include "../curve_fit_nd.h"
 
-/** Take curvature into account when calculating the least square solution isn't usable. */
+/* Take curvature into account when calculating the least square solution isn't usable. */
 #define USE_CIRCULAR_FALLBACK
 
-/**
- * Use the maximum distance of any points from the direct line between 2 points
+/* Use the maximum distance of any points from the direct line between 2 points
  * to calculate how long the handles need to be.
  * Can do a 'perfect' reversal of subdivision when for curve has symmetrical handles and doesn't change direction
- * (as with an 'S' shape).
- */
+ * (as with an 'S' shape). */
 #define USE_OFFSET_FALLBACK
 
-/** Avoid re-calculating lengths multiple times. */
+/* avoid re-calculating lengths multiple times */
 #define USE_LENGTH_CACHE
 
-/**
- * Store the indices in the cubic data so we can return the original indices,
- * useful when the caller has data associated with the curve.
- */
+/* store the indices in the cubic data so we can return the original indices,
+ * useful when the caller has data associated with the curve. */
 #define USE_ORIG_INDEX_DATA
 
 typedef unsigned int uint;
@@ -99,15 +95,13 @@ typedef unsigned int uint;
  * \{ */
 
 typedef struct Cubic {
-	/** Single linked lists. */
+	/* single linked lists */
 	struct Cubic *next;
 #ifdef USE_ORIG_INDEX_DATA
 	uint orig_span;
 #endif
-	/**
-	 * 0: point_0, 1: handle_0, 2: handle_1, 3: point_1,
-	 * each one is offset by 'dims'.
-	 */
+	/* 0: point_0, 1: handle_0, 2: handle_1, 3: point_1,
+	 * each one is offset by 'dims' */
 	double pt_data[0];
 } Cubic;
 
@@ -201,7 +195,7 @@ static double *cubic_list_as_array(
 	bool use_orig_index = (r_orig_index != NULL);
 #endif
 
-	/* Fill the array backwards. */
+	/* fill the array backwards */
 	const size_t array_chunk = 3 * dims;
 	double *array_iter = array + array_flat_len;
 	for (Cubic *citer = clist->items; citer; citer = citer->next) {
@@ -227,15 +221,15 @@ static double *cubic_list_as_array(
 	}
 #endif
 
-	/* Flip tangent for first and last (we could leave at zero, but set to something useful). */
+	/* flip tangent for first and last (we could leave at zero, but set to something useful) */
 
-	/* First. */
+	/* first */
 	array_iter -= array_chunk;
 	memcpy(&array_iter[dims], handle_prev, sizeof(double) * 2 * dims);
 	flip_vn_vnvn(&array_iter[0 * dims], &array_iter[1 * dims], &array_iter[2 * dims], dims);
 	assert(array == array_iter);
 
-	/* Last. */
+	/* last */
 	array_iter += array_flat_len - (3 * dims);
 	flip_vn_vnvn(&array_iter[2 * dims], &array_iter[1 * dims], &array_iter[0 * dims], dims);
 
@@ -461,7 +455,7 @@ static double points_calc_circumference_factor(
 	const double dot = dot_vnvn(tan_l, tan_r, dims);
 	const double len_tangent = dot < 0.0 ? len_vnvn(tan_l, tan_r, dims) : len_negated_vnvn(tan_l, tan_r, dims);
 	if (len_tangent > DBL_EPSILON) {
-		/* Only clamp to avoid precision error. */
+		/* only clamp to avoid precision error */
 		double angle = acos(max(-fabs(dot), -1.0));
 		/* Angle may be less than the length when the tangents define >180 degrees of the circle,
 		 * (tangents that point away from each other).
@@ -472,7 +466,7 @@ static double points_calc_circumference_factor(
 		return factor;
 	}
 	else {
-		/* Tangents are exactly aligned (think two opposite sides of a circle). */
+		/* tangents are exactly aligned (think two opposite sides of a circle). */
 		return (M_PI / 2);
 	}
 }
@@ -491,18 +485,18 @@ static double points_calc_circle_tangent_factor(
 	const double eps = 1e-8;
 	const double tan_dot = dot_vnvn(tan_l, tan_r, dims);
 	if (tan_dot > 1.0 - eps) {
-		/* No angle difference (use fallback, length won't make any difference). */
+		/* no angle difference (use fallback, length wont make any difference) */
 		return (1.0 / 3.0) * 0.75;
 	}
 	else if (tan_dot < -1.0 + eps) {
-		/* Parallel tangents (half-circle). */
+		/* parallel tangents (half-circle) */
 		return (1.0 / 2.0);
 	}
 	else {
-		/* Non-aligned tangents, calculate handle length. */
+		/* non-aligned tangents, calculate handle length */
 		const double angle = acos(tan_dot) / 2.0;
 
-		/* Could also use `angle_sin = len_vnvn(tan_l, tan_r, dims) / 2.0`. */
+		/* could also use 'angle_sin = len_vnvn(tan_l, tan_r, dims) / 2.0' */
 		const double angle_sin = sin(angle);
 		const double angle_cos = cos(angle);
 		return ((1.0 - angle_cos) / (angle_sin * 2.0)) / angle_sin;
@@ -522,15 +516,15 @@ static double points_calc_cubic_scale(
 	const double len_direct = len_vnvn(v_l, v_r, dims);
 	const double len_circle_factor = points_calc_circle_tangent_factor(tan_l, tan_r, dims);
 
-	/* If this curve is a circle, this value doesn't need modification. */
+	/* if this curve is a circle, this value doesn't need modification */
 	const double len_circle_handle = (len_direct * (len_circle_factor / 0.75));
 
-	/* Scale by the difference from the circumference distance. */
+	/* scale by the difference from the circumference distance */
 	const double len_circle = len_direct * points_calc_circumference_factor(tan_l, tan_r, dims);
 	double scale_handle = (coords_length / len_circle);
 
 	/* Could investigate an accurate calculation here,
-	 * though this gives close results. */
+	 * though this gives close results */
 	scale_handle = ((scale_handle - 1.0) * 1.75) + 1.0;
 
 	return len_circle_handle * scale_handle;
@@ -560,8 +554,9 @@ static void cubic_from_points_fallback(
 	r_cubic->orig_span = (points_offset_len - 1);
 #endif
 
-	/* `p1 = p0 - (tan_l * alpha);`
-	 * `p2 = p3 + (tan_r * alpha);` */
+	/* p1 = p0 - (tan_l * alpha);
+	 * p2 = p3 + (tan_r * alpha);
+	 */
 	msub_vn_vnvn_fl(p1, p0, tan_l, alpha, dims);
 	madd_vn_vnvn_fl(p2, p3, tan_r, alpha, dims);
 }
@@ -599,7 +594,7 @@ static void cubic_from_points_offset_fallback(
 	project_plane_vn_vnvn_normalized(a[0], tan_l, dir_unit, dims);
 	project_plane_vn_vnvn_normalized(a[1], tan_r, dir_unit, dims);
 
-	/* Only for better accuracy, not essential. */
+	/* only for better accuracy, not essential */
 	normalize_vn(a[0], dims);
 	normalize_vn(a[1], dims);
 
@@ -625,7 +620,7 @@ static void cubic_from_points_offset_fallback(
 	 *
 	 * The 'dists[..] + dir_dirs' limit is just a rough approximation.
 	 * While a more exact value could be calculated,
-	 * in this case the error values approach divide by zero (infinite)
+	 * in this case the error values approach divide by zero (inf)
 	 * so there is no need to be too precise when checking if limits have been exceeded. */
 
 	double alpha_l = (dists[0] / 0.75) / fabs(dot_vnvn(tan_l, a[0], dims));
@@ -649,8 +644,9 @@ static void cubic_from_points_offset_fallback(
 	r_cubic->orig_span = (points_offset_len - 1);
 #endif
 
-	/* `p1 = p0 - (tan_l * alpha_l);`
-	 * `p2 = p3 + (tan_r * alpha_r);` */
+	/* p1 = p0 - (tan_l * alpha_l);
+	 * p2 = p3 + (tan_r * alpha_r);
+	 */
 	msub_vn_vnvn_fl(p1, p0, tan_l, alpha_l, dims);
 	madd_vn_vnvn_fl(p2, p3, tan_r, alpha_r, dims);
 }
@@ -678,7 +674,7 @@ static void cubic_from_points(
 	const double *p0 = &points_offset[0];
 	const double *p3 = &points_offset[(points_offset_len - 1) * dims];
 
-	/* Point Pairs. */
+	/* Point Pairs */
 	double alpha_l, alpha_r;
 #ifdef USE_VLA
 	double a[2][dims];
@@ -700,7 +696,7 @@ static void cubic_from_points(
 			const double b0_plus_b1 = B0plusB1(u_prime[i]);
 			const double b2_plus_b3 = B2plusB3(u_prime[i]);
 
-			/* Inline dot product. */
+			/* inline dot product */
 			for (uint j = 0; j < dims; j++) {
 				const double tmp = (pt[j] - (p0[j] * b0_plus_b1)) + (p3[j] * b2_plus_b3);
 
@@ -723,7 +719,7 @@ static void cubic_from_points(
 			det_C0_C1 = c[0][0] * c[1][1] * 10e-12;
 		}
 
-		/* May still divide-by-zero, check below will catch NAN values. */
+		/* may still divide-by-zero, check below will catch nan values */
 		alpha_l = det_X_C1 / det_C0_C1;
 		alpha_r = det_C_0X / det_C0_C1;
 	}
@@ -740,7 +736,7 @@ static void cubic_from_points(
 
 	bool use_clamp = true;
 
-	/* Flip check to catch NAN values. */
+	/* flip check to catch nan values */
 	if (!(alpha_l >= 0.0) ||
 	    !(alpha_r >= 0.0))
 	{
@@ -754,7 +750,7 @@ static void cubic_from_points(
 		alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
 #endif
 
-		/* Skip clamping when we're using default handles. */
+		/* skip clamping when we're using default handles */
 		use_clamp = false;
 	}
 
@@ -768,8 +764,9 @@ static void cubic_from_points(
 	r_cubic->orig_span = (points_offset_len - 1);
 #endif
 
-	/* `p1 = p0 - (tan_l * alpha_l);`
-	 * `p2 = p3 + (tan_r * alpha_r);` */
+	/* p1 = p0 - (tan_l * alpha_l);
+	 * p2 = p3 + (tan_r * alpha_r);
+	 */
 	msub_vn_vnvn_fl(p1, p0, tan_l, alpha_l, dims);
 	madd_vn_vnvn_fl(p2, p3, tan_r, alpha_r, dims);
 
@@ -784,7 +781,7 @@ static void cubic_from_points(
 #endif
 		points_calc_center_weighted(points_offset, points_offset_len, dims, center);
 
-		const double clamp_scale = 3.0;  /* Clamp to 3x. */
+		const double clamp_scale = 3.0;  /* clamp to 3x */
 		double dist_sq_max = 0.0;
 
 		{
@@ -793,7 +790,7 @@ static void cubic_from_points(
 #if 0
 				double dist_sq_test = sq(len_vnvn(center, pt, dims) * clamp_scale);
 #else
-				/* Do inline. */
+				/* do inline */
 				double dist_sq_test = 0.0;
 				for (uint j = 0; j < dims; j++) {
 					dist_sq_test += sq((pt[j] - center[j]) * clamp_scale);
@@ -819,8 +816,10 @@ static void cubic_from_points(
 			alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
 #endif
 
-			/* `p1 = p0 - (tan_l * alpha_l);`
-			 * `p2 = p3 + (tan_r * alpha_r);` */
+			/*
+			 * p1 = p0 - (tan_l * alpha_l);
+			 * p2 = p3 + (tan_r * alpha_r);
+			 */
 			for (uint j = 0; j < dims; j++) {
 				p1[j] = p0[j] - (tan_l[j] * alpha_l);
 				p2[j] = p3[j] + (tan_r[j] * alpha_r);
@@ -830,7 +829,7 @@ static void cubic_from_points(
 			p2_dist_sq = len_squared_vnvn(center, p2, dims);
 		}
 
-		/* Clamp within the 3x radius. */
+		/* clamp within the 3x radius */
 		if (p1_dist_sq > dist_sq_max) {
 			isub_vnvn(p1, center, dims);
 			imul_vn_fl(p1, sqrt(dist_sq_max) / sqrt(p1_dist_sq), dims);
@@ -842,7 +841,7 @@ static void cubic_from_points(
 			iadd_vnvn(p2, center, dims);
 		}
 	}
-	/* End clamping. */
+	/* end clamping */
 }
 
 #ifdef USE_LENGTH_CACHE
@@ -918,7 +917,7 @@ static double cubic_find_root(
         const uint dims)
 {
 	/* Newton-Raphson Method. */
-	/* All vectors. */
+	/* all vectors */
 #ifdef USE_VLA
 	double q0_u[dims];
 	double q1_u[dims];
@@ -933,8 +932,8 @@ static double cubic_find_root(
 	cubic_calc_speed(cubic, u, dims, q1_u);
 	cubic_calc_acceleration(cubic, u, dims, q2_u);
 
-	/* May divide-by-zero, caller must check for that case. */
-	/* `u - ((q0_u - p) * q1_u) / (q1_u.length_squared() + (q0_u - p) * q2_u)` */
+	/* may divide-by-zero, caller must check for that case */
+	/* u - ((q0_u - p) * q1_u) / (q1_u.length_squared() + (q0_u - p) * q2_u) */
 	isub_vnvn(q0_u, p, dims);
 	return u - dot_vnvn(q0_u, q1_u, dims) /
 	       (len_squared_vn(q1_u, dims) + dot_vnvn(q0_u, q2_u, dims));
@@ -1033,7 +1032,7 @@ static bool fit_cubic_to_points(
 	double error_max_sq;
 	uint split_index;
 
-	/* Parameterize points, and attempt to fit curve. */
+	/* Parameterize points, and attempt to fit curve */
 	cubic_from_points(
 	        points_offset, points_offset_len,
 #ifdef USE_CIRCULAR_FALLBACK
@@ -1041,7 +1040,7 @@ static bool fit_cubic_to_points(
 #endif
 	        u, tan_l, tan_r, dims, r_cubic);
 
-	/* Find max deviation of points to fitted curve. */
+	/* Find max deviation of points to fitted curve */
 	error_max_sq = cubic_calc_error(
 	        r_cubic, points_offset, points_offset_len, u, dims,
 	        &split_index);
@@ -1063,7 +1062,7 @@ static bool fit_cubic_to_points(
 		        cubic_test, points_offset, points_offset_len, u, dims,
 		        &split_index);
 
-		/* Intentionally use the newly calculated 'split_index',
+		/* intentionally use the newly calculated 'split_index',
 		 * even if the 'error_max_sq_test' is worse. */
 		if (error_max_sq > error_max_sq_test) {
 			error_max_sq = error_max_sq_test;
@@ -1072,7 +1071,7 @@ static bool fit_cubic_to_points(
 	}
 #endif
 
-	/* Test the offset fallback. */
+	/* Test the offset fallback */
 #ifdef USE_OFFSET_FALLBACK
 	if (!(error_max_sq < error_threshold_sq)) {
 		/* Using the offset from the curve to calculate cubic handle length may give better results
@@ -1096,7 +1095,7 @@ static bool fit_cubic_to_points(
 	if (!(error_max_sq < error_threshold_sq)) {
 		cubic_copy(cubic_test, r_cubic, dims);
 
-		/* If error not too large, try some re-parameterization and iteration. */
+		/* If error not too large, try some reparameterization and iteration */
 		double *u_prime = malloc(sizeof(double) * points_offset_len);
 		for (uint iter = 0; iter < iteration_max; iter++) {
 			if (!cubic_reparameterize(
@@ -1124,7 +1123,7 @@ static bool fit_cubic_to_points(
 			}
 
 			if (!(error_max_sq < error_threshold_sq)) {
-				/* Continue. */
+				/* continue */
 			}
 			else {
 				assert((error_max_sq < error_threshold_sq));
@@ -1157,7 +1156,7 @@ static void fit_cubic_to_points_recursive(
         const double  error_threshold_sq,
         const uint    calc_flag,
         const uint    dims,
-        /* Fill in the list. */
+        /* fill in the list */
         CubicList *clist)
 {
 	Cubic *cubic = cubic_alloc(dims);
@@ -1181,7 +1180,7 @@ static void fit_cubic_to_points_recursive(
 	cubic_free(cubic);
 
 
-	/* Fitting failed -- split at max error point and fit recursively. */
+	/* Fitting failed -- split at max error point and fit recursively */
 
 	/* Check splinePoint is not an endpoint?
 	 *
@@ -1213,7 +1212,7 @@ static void fit_cubic_to_points_recursive(
 #endif
 		const double *pt   = &points_offset[split_index * dims];
 
-		/* `tan_center = ((pt_a - pt).normalized() + (pt - pt_b).normalized()).normalized()`. */
+		/* tan_center = ((pt_a - pt).normalized() + (pt - pt_b).normalized()).normalized() */
 		normalize_vn_vnvn(tan_center_a, pt_a, pt, dims);
 		normalize_vn_vnvn(tan_center_b, pt, pt_b, dims);
 		add_vn_vnvn(tan_center, tan_center_a, tan_center_b, dims);
@@ -1307,8 +1306,9 @@ int curve_fit_cubic_to_points_db(
 			const double *pt_l_next = pt_l + dims;
 			const double *pt_r_prev = pt_r - dims;
 
-			/* `tan_l = (pt_l - pt_l_next).normalized();`
-			 * `tan_r = (pt_r_prev - pt_r).normalized();` */
+			/* tan_l = (pt_l - pt_l_next).normalized()
+			 * tan_r = (pt_r_prev - pt_r).normalized()
+			 */
 			normalize_vn_vnvn(tan_l, pt_l, pt_l_next, dims);
 			normalize_vn_vnvn(tan_r, pt_r_prev, pt_r, dims);
 
@@ -1362,7 +1362,7 @@ int curve_fit_cubic_to_points_db(
 	*r_cubic_orig_index = NULL;
 #endif
 
-	/* Allocate a contiguous array and free the linked list. */
+	/* allocate a contiguous array and free the linked list */
 	*r_cubic_array = cubic_list_as_array(
 	        &clist
 #ifdef USE_ORIG_INDEX_DATA
@@ -1454,7 +1454,7 @@ int curve_fit_cubic_to_points_single_db(
 {
 	Cubic *cubic = alloca(cubic_alloc_size(dims));
 
-	/* In this instance there are no advantage in using length cache,
+	/* in this instance theres no advantage in using length cache,
 	 * since we're not recursively calculating values. */
 #ifdef USE_LENGTH_CACHE
 	double *points_length_cache_alloc = NULL;

extern/curve_fit_nd/intern/curve_fit_cubic_refit.c

@@ -1490,4 +1490,3 @@ int curve_fit_cubic_to_points_refit_fl(
 
 	return result;
 }
-

extern/curve_fit_nd/intern/generic_alloc_impl.h

@@ -37,7 +37,7 @@
  * - #TPOOL_STRUCT: Name for pool struct name.
  * - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
  *
- * \note #TPOOL_ALLOC_TYPE must be at least `sizeof(void *)`.
+ * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
  *
  * Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
  *

extern/curve_fit_nd/intern/generic_heap.c

@@ -305,3 +305,5 @@ void *HEAP_node_ptr(HeapNode *node)
 {
 	return node->ptr;
 }
+
+/** \} */

extern/gflags/CMakeLists.txt

@@ -1,13 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright 2016 Blender Foundation. All rights reserved.
 
-# Too noisy for code we don't maintain.
-if(CMAKE_COMPILER_IS_GNUCC)
-  if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "8.0")
-    add_cxx_flag("-Wno-cast-function-type")
-  endif()
-endif()
-
 set(INC
   src
   src/gflags

extern/glew-es/CMakeLists.txt

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright 2013 Blender Foundation. All rights reserved.
+
+set(INC
+  include
+)
+
+set(INC_SYS
+
+)
+
+if(UNIX)
+  list(APPEND INC_SYS
+    ${X11_X11_INCLUDE_PATH}
+  )
+endif()
+
+set(SRC
+  src/glew.c
+
+  include/GL/eglew.h
+  include/GL/glesew.h
+  include/GL/glew.h
+  include/GL/glxew.h
+  include/GL/wglew.h
+)
+
+set(LIB
+)
+
+add_definitions(${GL_DEFINITIONS})
+
+blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/glew-es/LICENSE.txt

@@ -0,0 +1,73 @@
+The OpenGL Extension Wrangler Library
+Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
+Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
+Copyright (C) 2002, Lev Povalahev
+All rights reserved.
+
+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.
+* The name of the author 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.
+
+
+Mesa 3-D graphics library
+Version:  7.0
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Copyright (c) 2007 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

extern/glew-es/README.blender

@@ -0,0 +1,5 @@
+Project: The OpenGL Extension Wrangler Library
+URL: http://glew.sourceforge.net/
+License: Check LICENSE.txt
+Upstream version: 2.0.0
+Local modifications: None

extern/glew/CMakeLists.txt

@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright 2006 Blender Foundation. All rights reserved.
+
+# avoid noisy warnings
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  add_c_flag(
+    "-Wno-strict-prototypes"
+  )
+endif()
+if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "12.1"))
+  add_c_flag(
+    "-Wno-address"
+  )
+endif()
+
+# MSVC's inliner is not having a happy time with glewIsSupported
+# causing this to be one of the most expensive things to build
+# in blender. Optimize for size rather than speed sidesteps this
+# problem, more details at
+# https://developercommunity.visualstudio.com/content/problem/732941/slow-compilation-of-glewc-for-visual-studio-2019-x.html
+
+if(MSVC)
+  add_c_flag("/Os")
+endif()
+
+set(INC
+  include
+)
+
+set(INC_SYS
+
+)
+
+if(UNIX)
+  list(APPEND INC_SYS
+    ${X11_X11_INCLUDE_PATH}
+  )
+endif()
+
+set(SRC
+  src/glew.c
+
+  include/GL/eglew.h
+  include/GL/glew.h
+  include/GL/glxew.h
+  include/GL/wglew.h
+)
+
+set(LIB
+)
+
+add_definitions(${GL_DEFINITIONS})
+
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/glew/LICENSE.txt

@@ -0,0 +1,73 @@
+The OpenGL Extension Wrangler Library
+Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
+Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
+Copyright (C) 2002, Lev Povalahev
+All rights reserved.
+
+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.
+* The name of the author 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.
+
+
+Mesa 3-D graphics library
+Version:  7.0
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Copyright (c) 2007 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

extern/glew/README.blender

@@ -0,0 +1,5 @@
+Project: The OpenGL Extension Wrangler Library
+URL: http://glew.sourceforge.net/
+License: Check LICENSE.txt
+Upstream version: 2.0.0
+Local modifications: None

extern/mantaflow/README.blender

@@ -2,5 +2,4 @@ Project: Mantaflow
 URL: http://mantaflow.com/
 License: Apache 2.0
 Upstream version: 0.13
-Local modifications:
-* ./patches/local_namespace.diff to support loading MANTA variables into an isolated __main__ name-space.
+Local modifications: None

extern/mantaflow/helper/pwrapper/registry.cpp

@@ -115,7 +115,7 @@ class WrapperRegistry {
   void construct(const std::string &scriptname, const vector<string> &args);
   void cleanup();
   void renameObjects();
-  void runPreInit(PyObject *name_space);
+  void runPreInit();
   PyObject *initModule();
   ClassData *lookup(const std::string &name);
   bool canConvert(ClassData *from, ClassData *to);
@@ -505,7 +505,7 @@ void WrapperRegistry::addConstants(PyObject *module)
   }
 }
 
-void WrapperRegistry::runPreInit(PyObject *name_space)
+void WrapperRegistry::runPreInit()
 {
   // add python directories to path
   PyObject *sys_path = PySys_GetObject((char *)"path");
@@ -518,15 +518,7 @@ void WrapperRegistry::runPreInit(PyObject *name_space)
   }
   if (!mCode.empty()) {
     mCode = "from manta import *\n" + mCode;
-    PyObject *return_value = PyRun_String(mCode.c_str(), Py_file_input, name_space, name_space);
-    if (return_value == nullptr) {
-      if (PyErr_Occurred()) {
-        PyErr_Print();
-      }
-    }
-    else {
-      Py_DECREF(return_value);
-    }
+    PyRun_SimpleString(mCode.c_str());
   }
 }
 
@@ -706,23 +698,16 @@ PyObject *WrapperRegistry::initModule()
 //******************************************************
 // Register members and exposed functions
 
-void setup(const bool python_lifecycle,
-           const std::string &filename,
-           const std::vector<std::string> &args,
-           PyObject *name_space)
+void setup(const std::string &filename, const std::vector<std::string> &args)
 {
   WrapperRegistry::instance().construct(filename, args);
-  if (python_lifecycle) {
-    Py_Initialize();
-  }
-  WrapperRegistry::instance().runPreInit(name_space);
+  Py_Initialize();
+  WrapperRegistry::instance().runPreInit();
 }
 
-void finalize(const bool python_lifecycle)
+void finalize()
 {
-  if (python_lifecycle) {
-    Py_Finalize();
-  }
+  Py_Finalize();
   WrapperRegistry::instance().cleanup();
 }
 

extern/mantaflow/helper/pwrapper/registry.h

@@ -48,11 +48,8 @@ template<class T> struct Namify {
 namespace Pb {
 
 // internal registry access
-void setup(bool python_lifecycle,
-           const std::string &filename,
-           const std::vector<std::string> &args,
-           PyObject *name_space);
-void finalize(bool python_lifecycle);
+void setup(const std::string &filename, const std::vector<std::string> &args);
+void finalize();
 bool canConvert(PyObject *obj, const std::string &to);
 Manta::PbClass *objFromPy(PyObject *obj);
 Manta::PbClass *createPy(const std::string &classname,

extern/mantaflow/patches/local_namespace.diff

@@ -1,86 +0,0 @@
-diff --git a/extern/mantaflow/helper/pwrapper/registry.cpp b/extern/mantaflow/helper/pwrapper/registry.cpp
-index 5196c0409f8..b4206a41dea 100644
---- a/extern/mantaflow/helper/pwrapper/registry.cpp
-+++ b/extern/mantaflow/helper/pwrapper/registry.cpp
-@@ -115,7 +115,7 @@ class WrapperRegistry {
-   void construct(const std::string &scriptname, const vector<string> &args);
-   void cleanup();
-   void renameObjects();
--  void runPreInit();
-+  void runPreInit(PyObject *name_space);
-   PyObject *initModule();
-   ClassData *lookup(const std::string &name);
-   bool canConvert(ClassData *from, ClassData *to);
-@@ -505,7 +505,7 @@ void WrapperRegistry::addConstants(PyObject *module)
-   }
- }
- 
--void WrapperRegistry::runPreInit()
-+void WrapperRegistry::runPreInit(PyObject *name_space)
- {
-   // add python directories to path
-   PyObject *sys_path = PySys_GetObject((char *)"path");
-@@ -518,7 +518,15 @@ void WrapperRegistry::runPreInit()
-   }
-   if (!mCode.empty()) {
-     mCode = "from manta import *\n" + mCode;
--    PyRun_SimpleString(mCode.c_str());
-+    PyObject *return_value = PyRun_String(mCode.c_str(), Py_file_input, name_space, name_space);
-+    if (return_value == nullptr) {
-+      if (PyErr_Occurred()) {
-+        PyErr_Print();
-+      }
-+    }
-+    else {
-+      Py_DECREF(return_value);
-+    }
-   }
- }
- 
-@@ -698,16 +706,23 @@ PyObject *WrapperRegistry::initModule()
- //******************************************************
- // Register members and exposed functions
- 
--void setup(const std::string &filename, const std::vector<std::string> &args)
-+void setup(const bool python_lifecycle,
-+           const std::string &filename,
-+           const std::vector<std::string> &args,
-+           PyObject *name_space)
- {
-   WrapperRegistry::instance().construct(filename, args);
--  Py_Initialize();
--  WrapperRegistry::instance().runPreInit();
-+  if (python_lifecycle) {
-+    Py_Initialize();
-+  }
-+  WrapperRegistry::instance().runPreInit(name_space);
- }
- 
--void finalize()
-+void finalize(const bool python_lifecycle)
- {
--  Py_Finalize();
-+  if (python_lifecycle) {
-+    Py_Finalize();
-+  }
-   WrapperRegistry::instance().cleanup();
- }
- 
-diff --git a/extern/mantaflow/helper/pwrapper/registry.h b/extern/mantaflow/helper/pwrapper/registry.h
-index d9d2bbb624b..2273d0b9bb1 100644
---- a/extern/mantaflow/helper/pwrapper/registry.h
-+++ b/extern/mantaflow/helper/pwrapper/registry.h
-@@ -48,8 +48,11 @@ template<class T> struct Namify {
- namespace Pb {
- 
- // internal registry access
--void setup(const std::string &filename, const std::vector<std::string> &args);
--void finalize();
-+void setup(bool python_lifecycle,
-+           const std::string &filename,
-+           const std::vector<std::string> &args,
-+           PyObject *name_space);
-+void finalize(bool python_lifecycle);
- bool canConvert(PyObject *obj, const std::string &to);
- Manta::PbClass *objFromPy(PyObject *obj);
- Manta::PbClass *createPy(const std::string &classname,

intern/CMakeLists.txt

@@ -11,6 +11,7 @@ add_subdirectory(memutil)
 add_subdirectory(opencolorio)
 add_subdirectory(opensubdiv)
 add_subdirectory(mikktspace)
+add_subdirectory(glew-mx)
 add_subdirectory(eigen)
 add_subdirectory(sky)
 
@@ -66,10 +67,3 @@ endif()
 if(UNIX AND NOT APPLE)
   add_subdirectory(libc_compat)
 endif()
-
-if(UNIX AND NOT APPLE)
-  # Important this comes after "ghost" as it uses includes defined by GHOST's CMake.
-  if(WITH_GHOST_WAYLAND AND WITH_GHOST_WAYLAND_DYNLOAD)
-    add_subdirectory(wayland_dynload)
-  endif()
-endif()

intern/cycles/CMakeLists.txt

@@ -36,13 +36,8 @@ if(WITH_CYCLES_NATIVE_ONLY)
   )
 
   if(NOT MSVC)
-    ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_march_native "-march=native")
-    if(_has_march_native)
-      set(CYCLES_KERNEL_FLAGS "-march=native")
-    else()
-      set(CYCLES_KERNEL_FLAGS "")
-    endif()
-    unset(_has_march_native)
+    string(APPEND CMAKE_CXX_FLAGS " -march=native")
+    set(CYCLES_KERNEL_FLAGS "-march=native")
   else()
     if(NOT MSVC_NATIVE_ARCH_FLAGS)
         TRY_RUN(
@@ -268,10 +263,6 @@ if(WITH_CYCLES_DEVICE_OPTIX)
   endif()
 endif()
 
-if (WITH_CYCLES_DEVICE_ONEAPI)
-  add_definitions(-DWITH_ONEAPI)
-endif()
-
 if(WITH_CYCLES_EMBREE)
   add_definitions(-DWITH_EMBREE)
   include_directories(

intern/cycles/app/CMakeLists.txt

@@ -43,8 +43,9 @@ else()
 endif()
 
 if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
-  list(APPEND INC_SYS ${Epoxy_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS})
-  list(APPEND LIB ${Epoxy_LIBRARIES} ${SDL2_LIBRARIES})
+  add_definitions(${GL_DEFINITIONS})
+  list(APPEND INC_SYS ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
+  list(APPEND LIB ${CYCLES_GL_LIBRARIES} ${CYCLES_GLEW_LIBRARIES} ${SDL2_LIBRARIES})
 endif()
 
 cycles_external_libraries_append(LIB)

intern/cycles/app/opengl/display_driver.cpp

@@ -7,8 +7,8 @@
 #include "util/log.h"
 #include "util/string.h"
 
+#include <GL/glew.h>
 #include <SDL.h>
-#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/app/opengl/shader.cpp

@@ -6,7 +6,7 @@
 #include "util/log.h"
 #include "util/string.h"
 
-#include <epoxy/gl.h>
+#include <GL/glew.h>
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/app/opengl/window.cpp

@@ -11,8 +11,8 @@
 #include "util/time.h"
 #include "util/version.h"
 
+#include <GL/glew.h>
 #include <SDL.h>
-#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
@@ -294,6 +294,7 @@ void window_main_loop(const char *title,
   SDL_RaiseWindow(V.window);
 
   V.gl_context = SDL_GL_CreateContext(V.window);
+  glewInit();
   SDL_GL_MakeCurrent(V.window, nullptr);
 
   window_reshape(width, height);