git: ec3d8176e487 - main - graphics/blender: Update to 5.2.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Oct 2026 22:13:31 UTC
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ec3d8176e487958b381db37790ee0b110e84f3c7
commit ec3d8176e487958b381db37790ee0b110e84f3c7
Author: Shane <FreeBSD@ShaneWare.Biz>
AuthorDate: 2026-10-30 22:10:37 +0000
Commit: Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-30 22:13:02 +0000
graphics/blender: Update to 5.2.2
Blender 5.2 is the new LTS release, supported until July 2028. It adds
experimental Geometry Nodes based cloth and hair dynamics and a texture
cache in Cycles that lowers memory use on scenes with many image
textures. Since 5.1 Blender no longer loads the Python user site
directory by default.
Blender 5.2 requires Python 3.13. Until that is the default version,
build it with DEFAULT_VERSIONS+=python=3.13.
Changelog: https://developer.blender.org/docs/release_notes/5.2/
PR: 294160
Sponsored by: Netzkommune GmbH
---
graphics/blender/Makefile | 84 +-
graphics/blender/Makefile.options | 7 +-
graphics/blender/Makefile.versions | 3 +-
graphics/blender/distinfo | 6 +-
graphics/blender/files/blender.in | 2 -
graphics/blender/files/extra-patch-simd-off | 45 +-
graphics/blender/files/patch-CMakeLists.txt | 11 -
.../files/patch-extern_audaspace_CMakeLists.txt | 11 +
graphics/blender/files/patch-fmtlib | 3256 --------------------
.../files/patch-intern_cycles_CMakeLists.txt | 12 +-
.../files/patch-intern_dualcon_intern_octree.cpp | 14 +
...n_libmv_libmv_multiview_euclidean__resection.cc | 42 +
...ch-intern_libmv_libmv_tracking_track__region.cc | 14 +
...ch-source_blender_blenfont_intern_blf__glyph.cc | 14 -
...tch-source_blender_blenlib_intern_math__half.cc | 11 -
graphics/blender/pkg-plist | 210 +-
16 files changed, 303 insertions(+), 3439 deletions(-)
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index a750a9a98fb4..d5272e7211be 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,6 +1,5 @@
PORTNAME= blender
-DISTVERSION= 5.0.1
-PORTREVISION= 3
+DISTVERSION= 5.2.2
PORTEPOCH= 1
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
@@ -17,18 +16,27 @@ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le riscv64
ONLY_FOR_ARCHS_REASON= static_assert(sizeof(unsigned long long) == sizeof(struct hipArray*))
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR}
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libepoxy.so:graphics/libepoxy \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>2.3:math/py-numpy@${PY_FLAVOR}
+LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
+ libexpat.so:textproc/expat2 \
+ libfreetype.so:print/freetype2 \
+ libImath.so:math/Imath \
+ libOpenColorIO.so:graphics/opencolorio \
+ libOpenEXR.so:graphics/openexr \
libOpenImageIO.so:graphics/openimageio \
- libpng.so:graphics/png \
+ libpng16.so:graphics/png \
+ libpystring.so:devel/pystring \
libsamplerate.so:audio/libsamplerate \
libtiff.so:graphics/tiff \
+ libyaml-cpp.so:devel/yaml-cpp \
libzstd.so:archivers/zstd
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>2.3:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cattrs>0:devel/py-cattrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
-USES= cmake:noninja compiler:c++17-lang cpe eigen:3 jpeg llvm:build,run \
- pkgconfig python shebangfix tar:xz xorg
+USES= cmake:noninja compiler:c++20-lang cpe eigen:3 jpeg llvm:build,run \
+ minizip pkgconfig python:3.13+ shebangfix tar:xz xorg
USE_XORG= x11 xext xfixes xmu xrender
SHEBANG_FILES= scripts/modules/blend_render_info.py
@@ -36,17 +44,19 @@ SHEBANG_FILES= scripts/modules/blend_render_info.py
CMAKE_ARGS= -DCMAKE_CXX_STANDARD:INTEGER=17 \
-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW \
- -DPYTHON_VERSION=${PYTHON_VER}
+ -DPYTHON_VERSION=${PYTHON_VER} \
+ -DPYTHON_NUMPY_PATH=${PYTHON_SITELIBDIR} \
+ -DPYTHON_NUMPY_INCLUDE_DIRS:STRING="${PYTHON_SITELIBDIR}/numpy/_core/include"
.if defined(WITH_DEBUG)
CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON
.endif
-CMAKE_ON= WITH_AUDASPACE WITH_BOOST WITH_CLANG WITH_GHOST_X11 WITH_GHOST_XDND \
+CMAKE_ON= WITH_AUDASPACE WITH_CLANG WITH_GHOST_X11 WITH_GHOST_XDND \
WITH_HYDRA WITH_IO_PLY WITH_IO_STL WITH_IO_WAVEFRONT_OBJ \
- WITH_LLVM WITH_OPENGL_BACKEND WITH_PYTHON WITH_SYSTEM_EIGEN3 \
+ WITH_LLVM WITH_OPENGL_BACKEND WITH_PYTHON \
WITH_SYSTEM_FREETYPE WITH_X11_XINPUT WITH_X11_XFIXES
CMAKE_OFF= WITH_GHOST_SDL WITH_INSTALL_PORTABLE WITH_LIBS_PRECOMPILED \
- LLVM_STATIC WITH_MEM_JEMALLOC WITH_MEM_VALGRIND \
- WITH_NANOVDB WITH_PYTHON_INSTALL WITH_PYTHON_INSTALL_NUMPY
+ LLVM_STATIC WITH_MEM_VALGRIND WITH_NANOVDB \
+ WITH_PYTHON_INSTALL WITH_PYTHON_INSTALL_NUMPY
CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
CFLAGS_gcc= -Wno-float-conversion
@@ -64,12 +74,14 @@ ALEMBIC_IMPLIES= OPENEXR
ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic
BULLET_CMAKE_BOOL= WITH_BULLET
CAMERATRACK_CMAKE_BOOL= WITH_LIBMV WITH_SYSTEM_GLOG
-CAMERATRACK_LIB_DEPENDS= libglog.so:devel/glog
+CAMERATRACK_LIB_DEPENDS= libceres.so:math/ceres-solver \
+ libglog.so:devel/glog
CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON
CYCLES_CMAKE_BOOL= WITH_CYCLES
CYCLES_IMPLIES= TBB
-CYCLES_LDFLAGS= -L${LOCALBASE}/lib -lgflags
-CYCLES_LIB_DEPENDS= libgflags.so:devel/gflags
+CYCLES_LDFLAGS= -L${LOCALBASE}/lib -lgflags -lglog
+CYCLES_LIB_DEPENDS= libgflags.so:devel/gflags \
+ libglog.so:devel/glog
CYCLES_EMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE
CYCLES_EMBR_IMPLIES= CYCLES
CYCLES_EMBR_LIB_DEPENDS= libembree4.so:graphics/embree
@@ -80,7 +92,7 @@ CYCLES_OSL_CMAKE_ON= -DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglan
CYCLES_OSL_IMPLIES= CYCLES OPENEXR PUGIXML
CYCLES_OSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage
DRACO_CMAKE_BOOL= WITH_DRACO
-DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR}
+DRACO_LIB_DEPENDS= libdraco.so:archivers/draco
EBOOL_CMAKE_BOOL= WITH_GMP
EBOOL_LIB_DEPENDS= libgmp.so:math/gmp
FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG
@@ -123,16 +135,6 @@ NLS_CMAKE_BOOL= WITH_INTERNATIONAL
NLS_USES= gettext-tools
OPENAL_CMAKE_BOOL= WITH_OPENAL
OPENAL_USES= openal:al,alut
-OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO
-OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \
- libyaml-cpp.so:devel/yaml-cpp \
- libexpat.so:textproc/expat2 \
- libpystring.so:devel/pystring
-OPENCOLORIO_USES= minizip
-OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath
-OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR
-OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \
- libOpenEXR.so:graphics/openexr
OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE
OPENIMAGEDN_IMPLIES= TBB
OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn
@@ -163,9 +165,8 @@ QUADRIFLOW_CMAKE_BOOL= WITH_QUADRIFLOW
RUBBERBAND_CMAKE_BOOL= WITH_RUBBERBAND
RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband
SDL_CMAKE_BOOL= WITH_SDL
-SDL_USE= SDL=sdl2
+SDL_USE= SDL=sdl3
SDL_USES= sdl
-SIMD_CMAKE_BOOL= WITH_CPU_SIMD
SIMD_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-simd-off
SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE
SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
@@ -189,14 +190,19 @@ WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols \
wayland>=1.12:graphics/wayland \
libdecor>0:x11-toolkits/libdecor
WAYLAND_CATEGORIES= wayland
-WAYLAND_CMAKE_BOOL= WITH_GHOST_WAYLAND WITH_GHOST_WAYLAND_LIBDECOR \
- WITH_GHOST_WAYLAND_DYNLOAD
+WAYLAND_CMAKE_BOOL= WITH_GHOST_WAYLAND WITH_GHOST_WAYLAND_DYNLOAD
WAYLAND_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
WEBP_CMAKE_BOOL= WITH_IMAGE_WEBP
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
XINPUT_CMAKE_BOOL= WITH_X11_XINPUT
XINPUT_USE= XORG=xi
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
+IGNORE= requires Python 3.13 or newer as default version, set DEFAULT_VERSIONS+=python=3.13
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VERSION}|g' \
${WRKSRC}/intern/cycles/kernel/osl/CMakeLists.txt
@@ -210,19 +216,15 @@ post-build:
post-install:
${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
${STAGEDIR}${PREFIX}/share/man/man1
- ${MV} ${STAGEDIR}/${PREFIX}/bin/blender ${STAGEDIR}/${PREFIX}/bin/blender-bin
+ ${MV} ${STAGEDIR}${PREFIX}/bin/blender ${STAGEDIR}${PREFIX}/bin/blender-bin
${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKDIR}/blender
- ${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender
+ ${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}${PREFIX}/bin/blender
post-install-DRACO-on:
- # move draco pylib into site-packages
- ${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
- ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
- ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
- @${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
- @${RM} ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/scripts/addons_core/io_scene_gltf2/libextern_draco.so
+ @(cd ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${DISTVERSION:R}/scripts/addons_core/io_scene_gltf2 && \
+ ${STRIP_CMD} libbf_intern_draco_bridge.so)
post-install-MENU-on:
@-update-desktop-database -q
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options
index 476e05338ea7..aef5461ca0cb 100644
--- a/graphics/blender/Makefile.options
+++ b/graphics/blender/Makefile.options
@@ -26,8 +26,6 @@ OPTIONS_DEFINE= \
MOD_REMESH \
NLS \
OPENAL \
- OPENCOLORIO \
- OPENEXR \
OPENIMAGEDN \
OPENJPEG \
OPENPGL \
@@ -74,8 +72,6 @@ OPTIONS_DEFAULT= \
MOD_OCEANSIM \
MOD_REMESH \
OPENAL \
- OPENCOLORIO \
- OPENEXR \
OPENJPEG \
OPENSUBDIV \
OPENVDB \
@@ -95,7 +91,7 @@ OPTIONS_DEFAULT= \
# CYCLES_EMBR: embree only supports amd64 and i386
# OPENIMAGEDN: oidn only supports amd64
# OPENPGL: requires supported SIMD ISA - i386/amd64/aarch64/armv6/armv7
-OPTIONS_DEFAULT_aarch64= CAMERATRACK OPENPGL SIMD
+OPTIONS_DEFAULT_aarch64= CAMERATRACK OPENPGL
OPTIONS_DEFAULT_amd64= CAMERATRACK CYCLES_EMBR OPENIMAGEDN OPENPGL
OPTIONS_DEFAULT_powerpc64= CAMERATRACK
OPTIONS_DEFAULT_powerpc64le= CAMERATRACK
@@ -124,7 +120,6 @@ MENU_DESC= Install desktop menu
MOD_FLUID_DESC= Fluid simulation support
MOD_OCEANSIM_DESC= Ocean simulation support
MOD_REMESH_DESC= Remesh modifier support
-OPENCOLORIO_DESC= OpenColorIO-based color management support
OPENIMAGEDN_DESC= OpenImageDenoise support (amd64 only)
OPENJPEG_DESC= Enhanced JPEG (JPEG 2000) graphics support
OPENPGL_DESC= Open Path Guiding in Cycles (aarch64 and amd64 only)
diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
index d7aab6db1b2a..ba6e6857b153 100644
--- a/graphics/blender/Makefile.versions
+++ b/graphics/blender/Makefile.versions
@@ -1,4 +1,3 @@
# Versions of Blender and its python dependency for use by depending ports, like add-ons
-BLENDER_BL_VERSION= 5.0.1
-BLENDER_PY_VERSION= 3.12
+BLENDER_BL_VERSION= 5.2.2
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 1d85359cbb39..19af4fdf277a 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1766460211
-SHA256 (blender-5.0.1.tar.xz) = 0077a41f59843433154fdf2d8aeb6c43f6bf6951cd46987305e67f89cb4f1fbf
-SIZE (blender-5.0.1.tar.xz) = 88926056
+TIMESTAMP = 1789695564
+SHA256 (blender-5.2.2.tar.xz) = 56a3b1ec97479ff24dce65d2f09f8a1895005cece279b701fe4fcf74bce3f77e
+SIZE (blender-5.2.2.tar.xz) = 93671672
diff --git a/graphics/blender/files/blender.in b/graphics/blender/files/blender.in
index 40f1280327b4..8520db5e6206 100644
--- a/graphics/blender/files/blender.in
+++ b/graphics/blender/files/blender.in
@@ -1,5 +1,3 @@
#!/bin/sh
-export BLENDER_EXTERN_DRACO_LIBRARY_PATH=%%PYTHON_SITELIBDIR%%/libextern_draco.so
-
exec %%PREFIX%%/bin/blender-bin "$@"
diff --git a/graphics/blender/files/extra-patch-simd-off b/graphics/blender/files/extra-patch-simd-off
index 1a1172360911..dd8b95ca9fcc 100644
--- a/graphics/blender/files/extra-patch-simd-off
+++ b/graphics/blender/files/extra-patch-simd-off
@@ -1,17 +1,19 @@
---- build_files/cmake/macros.cmake.orig 2024-06-05 11:47:55 UTC
+--- build_files/cmake/macros.cmake.orig 2026-02-09 15:45:57 UTC
+++ build_files/cmake/macros.cmake
-@@ -546,7 +546,7 @@ macro(TEST_SSE_SUPPORT
-
- # message(STATUS "Detecting SSE support")
- if(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
-- set(${_sse42_flags} "-march=x86-64-v2")
-+# set(${_sse42_flags} "-march=x86-64-v2")
- elseif(MSVC)
- # msvc has no specific build flags for SSE42, but when using intrinsics it will
- # generate the right instructions.
---- intern/cycles/kernel/device/cpu/kernel.cpp.orig 2024-06-05 11:47:56 UTC
+@@ -601,7 +601,7 @@ function(get_compiler_simd_flags
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64)" OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+ # message(STATUS "Detecting SIMD support")
+ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+- set(${_simd_flags} "-march=x86-64-v2" PARENT_SCOPE)
++ #set(${_simd_flags} "-march=x86-64-v2" PARENT_SCOPE)
+ elseif(MSVC)
+ # MSVC has no specific compile flags for SSE42 (only for AVX).
+ set(${_simd_flags} PARENT_SCOPE)
+--- intern/cycles/kernel/device/cpu/kernel.cpp.orig 2026-02-09 15:45:57 UTC
+++ intern/cycles/kernel/device/cpu/kernel.cpp
-@@ -10,9 +10,11 @@
+@@ -8,11 +8,13 @@
+ * one with SSE4.2 intrinsics.
+ */
#if defined(__x86_64__) || defined(_M_X64)
+/*
# define __KERNEL_SSE__
@@ -23,19 +25,22 @@
#endif
/* When building kernel for native machine detect kernel features from the flags
---- intern/cycles/util/optimization.h.orig 2024-06-05 11:47:56 UTC
+--- intern/cycles/util/optimization.h.orig 2026-02-10 11:52:40 UTC
+++ intern/cycles/util/optimization.h
-@@ -26,7 +26,9 @@
+@@ -19,10 +19,12 @@
# elif defined(__x86_64__) || defined(_M_X64)
/* SSE4.2 is our minimum requirement for x86-64 CPUs, so auto enable */
+/*
+ # define __KERNEL_SSE__
+ # define __KERNEL_SSE2__
+ # define __KERNEL_SSE3__
# define __KERNEL_SSE42__
+*/
/* no SSE4.2 kernel on x86-64, part of regular kernel */
# ifdef WITH_KERNEL_AVX2
# define WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
---- source/blender/blenlib/BLI_bit_span_to_index_ranges.hh.orig 2025-12-24 21:09:10 UTC
+--- source/blender/blenlib/BLI_bit_span_to_index_ranges.hh.orig 2026-02-09 15:45:58 UTC
+++ source/blender/blenlib/BLI_bit_span_to_index_ranges.hh
@@ -111,7 +111,12 @@ inline void bits_to_index_ranges(const BitSpan bits, I
/* Loads the next 128 bit. */
@@ -50,13 +55,13 @@
if (group_is_zero) {
continue;
}
---- source/blender/blenlib/intern/math_half.cc.orig 2025-12-24 21:19:17 UTC
+--- source/blender/blenlib/intern/math_half.cc.orig 2026-02-09 15:45:58 UTC
+++ source/blender/blenlib/intern/math_half.cc
-@@ -271,6 +271,32 @@ void blender::math::float_to_half_array(const float *s
+@@ -274,6 +274,32 @@ void math::float_to_half_array(const float *src, uint1
}
}
-+#ifndef __SSE4_1__
++#if !defined(__SSE4_1__) && (defined(__x86_64__) || defined(_M_X64))
+static inline __m128i srai_epi8_sse2(__m128i x, int imm)
+{
+ // Sign-extend bytes to 16-bit
@@ -82,10 +87,10 @@
+}
+#endif
+
- void blender::math::float_to_half_make_finite_array(const float *src, uint16_t *dst, size_t length)
+ void math::float_to_half_make_finite_array(const float *src, uint16_t *dst, size_t length)
{
size_t i = 0;
-@@ -320,8 +346,13 @@ void blender::math::float_to_half_make_finite_array(co
+@@ -323,8 +349,13 @@ void math::float_to_half_make_finite_array(const float
__m128i inf_res = _mm_or_si128(signbits, _mm_set1_epi16(0x7bffu)); /* +/- 65504 */
__m128i nan_res = signbits; /* +/- 0 */
/* Select final result. */
diff --git a/graphics/blender/files/patch-CMakeLists.txt b/graphics/blender/files/patch-CMakeLists.txt
deleted file mode 100644
index 024e7fd3fba4..000000000000
--- a/graphics/blender/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2025-10-09 16:52:29 UTC
-+++ CMakeLists.txt
-@@ -2593,7 +2593,7 @@ if(WITH_PYTHON)
- if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
- set(_numpy_include "_core/include")
- if(PYTHON_VERSION VERSION_LESS "3.13")
-- set(_numpy_include "core/include")
-+# set(_numpy_include "core/include")
- endif()
- find_python_package(numpy "${_numpy_include}")
- unset(_numpy_include)
diff --git a/graphics/blender/files/patch-extern_audaspace_CMakeLists.txt b/graphics/blender/files/patch-extern_audaspace_CMakeLists.txt
new file mode 100644
index 000000000000..8612637e98ef
--- /dev/null
+++ b/graphics/blender/files/patch-extern_audaspace_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- extern/audaspace/CMakeLists.txt.orig 2026-09-05 13:21:02 UTC
++++ extern/audaspace/CMakeLists.txt
+@@ -1222,7 +1222,7 @@ if(WITH_PYTHON)
+ if(DEFINED PYTHON_LIBRARIES)
+ target_link_libraries(audaspace-py audaspace ${PYTHON_LIBRARIES})
+ else()
+- target_link_libraries(audaspace-py audaspace)
++ target_link_libraries(audaspace-py audaspace ${PYTHON_LIBRARIES})
+ endif()
+ set_target_properties(audaspace-py PROPERTIES SOVERSION ${AUDASPACE_VERSION})
+
diff --git a/graphics/blender/files/patch-fmtlib b/graphics/blender/files/patch-fmtlib
deleted file mode 100644
index feea56e6e58a..000000000000
--- a/graphics/blender/files/patch-fmtlib
+++ /dev/null
@@ -1,3256 +0,0 @@
---- extern/binreloc/CMakeLists.txt.orig 2025-10-08 10:41:55 UTC
-+++ extern/binreloc/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(INC_SYS
- )
-
- set(INC_SYS
--
-+ PUBLIC include
- )
-
- set(SRC
-@@ -23,3 +23,4 @@ blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${I
-
-
- blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-+add_library(bf::extern::binreloc ALIAS extern_binreloc)
---- extern/CMakeLists.txt.orig 2025-10-08 10:41:55 UTC
-+++ extern/CMakeLists.txt
-@@ -4,7 +4,9 @@ add_subdirectory(curve_fit_nd)
-
- # Libs that adhere to strict flags
- add_subdirectory(curve_fit_nd)
-+add_subdirectory(fast_float)
- add_subdirectory(fmtlib)
-+add_subdirectory(json)
- if(WITH_IO_FBX)
- add_subdirectory(ufbx)
- endif()
---- extern/fast_float/CMakeLists.txt.orig 2025-12-23 01:40:52 UTC
-+++ extern/fast_float/CMakeLists.txt
-@@ -0,0 +1,7 @@
-+# SPDX-FileCopyrightText: 2023 Blender Foundation
-+#
-+# SPDX-License-Identifier: GPL-2.0-or-later
-+
-+add_library(extern_fast_float INTERFACE)
-+target_include_directories(extern_fast_float SYSTEM INTERFACE ".")
-+add_library(bf::extern::fast_float ALIAS extern_fast_float)
---- extern/json/CMakeLists.txt.orig 2025-12-23 01:40:52 UTC
-+++ extern/json/CMakeLists.txt
-@@ -0,0 +1,7 @@
-+# SPDX-FileCopyrightText: 2023 Blender Foundation
-+#
-+# SPDX-License-Identifier: GPL-2.0-or-later
-+
-+add_library(extern_json INTERFACE)
-+target_include_directories(extern_json SYSTEM INTERFACE "include")
-+add_library(bf::extern::json ALIAS extern_json)
---- extern/mantaflow/CMakeLists.txt.orig 2025-10-08 10:41:55 UTC
-+++ extern/mantaflow/CMakeLists.txt
-@@ -68,8 +68,6 @@ set(INC_SYS
- endif()
-
- set(INC_SYS
-- ${PYTHON_INCLUDE_DIRS}
-- ${ZLIB_INCLUDE_DIRS}
- )
-
- if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
-@@ -229,8 +227,8 @@ set(LIB
- set(LIB
- PRIVATE bf::dependencies::optional::openvdb
- PRIVATE bf::dependencies::optional::tbb
-- ${PYTHON_LINKFLAGS}
-- ${PYTHON_LIBRARIES}
-+ PRIVATE bf::dependencies::optional::python
-+ PRIVATE bf::dependencies::zlib
- )
-
- blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
---- extern/vulkan_memory_allocator/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ extern/vulkan_memory_allocator/CMakeLists.txt
-@@ -3,7 +3,7 @@ set(INC
- # SPDX-License-Identifier: GPL-2.0-or-later
-
- set(INC
-- .
-+ PUBLIC .
- )
-
- set(INC_SYS
-@@ -20,6 +20,7 @@ blender_add_lib(extern_vulkan_memory_allocator "${SRC}
- )
-
- blender_add_lib(extern_vulkan_memory_allocator "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-+add_library(bf::extern::vulkan_memory_allocator ALIAS extern_vulkan_memory_allocator)
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- target_compile_options(extern_vulkan_memory_allocator
---- extern/wcwidth/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ extern/wcwidth/CMakeLists.txt
-@@ -1,4 +1,4 @@
--# SPDX-FileCopyrightText: 2013 Blender Foundation
-+# SPDX-FileCopyrightText: 2023 Blender Foundation
- #
- # SPDX-License-Identifier: GPL-2.0-or-later
-
-@@ -7,7 +7,7 @@ set(INC_SYS
- )
-
- set(INC_SYS
--
-+ PUBLIC .
- )
-
- set(SRC
-@@ -20,3 +20,4 @@ blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${IN
- )
-
- blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-+add_library(bf::extern::wcwidth ALIAS extern_wcwidth)
---- intern/cycles/app/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/app/CMakeLists.txt
-@@ -35,10 +35,12 @@ if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_G
-
- 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})
-+ list(APPEND LIB
-+ bf::dependencies::optional::epoxy
-+ ${SDL2_LIBRARIES}
-+ )
- endif()
-
- if(WITH_USD)
-@@ -47,13 +49,9 @@ if(WITH_USD)
- -D__TBB_show_deprecation_message_atomic_H
- -D__TBB_show_deprecation_message_task_H
- )
--
-- list(APPEND INC_SYS
-- ${USD_INCLUDE_DIRS}
-- )
- list(APPEND LIB
- cycles_hydra
-- ${USD_LIBRARIES}
-+ bf::dependencies::optional::usd
- )
- endif()
-
---- intern/cycles/blender/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/blender/CMakeLists.txt
-@@ -9,8 +9,6 @@ set(INC_SYS
- )
-
- set(INC_SYS
-- ${Epoxy_INCLUDE_DIRS}
-- ${PYTHON_INCLUDE_DIRS}
- )
-
- set(SRC
-@@ -70,9 +68,10 @@ set(LIB
- cycles_subd
- cycles_util
-
-- ${Epoxy_LIBRARIES}
-- ${PYTHON_LINKFLAGS}
-- ${PYTHON_LIBRARIES}
-+ bf::dependencies::optional::epoxy
-+ bf::dependencies::optional::python
-+ bf::dependencies::optional::openimagedenoise
-+ bf::dependencies::optional::openvdb
- )
-
- set(ADDON_FILES
-@@ -101,22 +100,6 @@ if(WITH_TBB)
-
- if(WITH_TBB)
- add_definitions(-DWITH_TBB)
--endif()
--
--if(WITH_OPENVDB)
-- list(APPEND INC
-- ../../openvdb
-- )
-- list(APPEND LIB
-- ${OPENVDB_LIBRARIES}
-- )
--endif()
--
--if(WITH_OPENIMAGEDENOISE)
-- add_definitions(-DWITH_OPENIMAGEDENOISE)
-- list(APPEND INC_SYS
-- ${OPENIMAGEDENOISE_INCLUDE_DIRS}
-- )
- endif()
-
- if(WITH_CYCLES_OSL)
---- intern/cycles/device/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/device/CMakeLists.txt
-@@ -6,7 +6,8 @@ set(INC
- ..
- )
-
--set(INC_SYS )
-+set(INC_SYS
-+)
-
- if(WITH_CYCLES_DEVICE_OPTIX OR WITH_CYCLES_DEVICE_CUDA)
- if(NOT WITH_CUDA_DYNLOAD)
---- intern/cycles/hydra/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/hydra/CMakeLists.txt
-@@ -10,16 +10,13 @@ set(INC_SYS
- ..
- )
- set(INC_SYS
-- ${USD_INCLUDE_DIRS}
-- ${Epoxy_INCLUDE_DIRS}
-- ${PYTHON_INCLUDE_DIRS}
- )
-
- set(LIB
- cycles_scene
- cycles_session
- cycles_graph
-- ${Epoxy_LIBRARIES}
-+ bf::dependencies::optional::epoxy
- ${BOOST_PYTHON_LIBRARIES}
- )
- cycles_external_libraries_append(LIB)
-@@ -105,7 +102,8 @@ target_link_libraries(cycles_hydra
-
- target_link_libraries(cycles_hydra
- PUBLIC
-- ${USD_LIBRARIES}
-+ bf::dependencies::optional::usd
-+ bf::dependencies::optional::python
- PRIVATE
- ${LIB}
- )
---- intern/cycles/kernel/CMakeLists.txt.orig 2025-10-27 12:26:33 UTC
-+++ intern/cycles/kernel/CMakeLists.txt
-@@ -439,12 +439,9 @@ add_executable(zstd_compress ../cmake/zstd_compress.cp
-
- # `Zstd` compressor for kernels.
- add_executable(zstd_compress ../cmake/zstd_compress.cpp)
--target_include_directories(zstd_compress SYSTEM PRIVATE ${ZSTD_INCLUDE_DIRS})
-
--target_link_libraries(zstd_compress ${ZSTD_LIBRARIES})
--if(DEFINED PTHREADS_LIBRARIES)
-- target_link_libraries(zstd_compress ${PTHREADS_LIBRARIES})
--endif()
-+target_link_libraries(zstd_compress PRIVATE bf::dependencies::zstd)
-+target_link_libraries(zstd_compress PRIVATE bf::dependencies::pthreads)
-
- if(NOT WITH_BLENDER)
- # For the Cycles standalone put libraries next to the Cycles application.
---- intern/cycles/scene/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/scene/CMakeLists.txt
-@@ -112,11 +112,8 @@ if(WITH_OPENCOLORIO)
-
- if(WITH_OPENCOLORIO)
- add_definitions(-DWITH_OCIO)
-- list(APPEND INC_SYS
-- ${OPENCOLORIO_INCLUDE_DIRS}
-- )
- list(APPEND LIB
-- ${OPENCOLORIO_LIBRARIES}
-+ bf::dependencies::optional::opencolorio
- )
- if(WIN32 AND NOT USD_OVERRIDE_OPENCOLORIO)
- add_definitions(-DOpenColorIO_SKIP_IMPORTS)
-@@ -125,7 +122,7 @@ if(WITH_OPENVDB)
-
- if(WITH_OPENVDB)
- list(APPEND LIB
-- ${OPENVDB_LIBRARIES}
-+ bf::dependencies::optional::openvdb
- )
- endif()
-
---- intern/cycles/test/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/cycles/test/CMakeLists.txt
-@@ -60,6 +60,6 @@ if(WITH_GTESTS)
- endif()
-
- if(WITH_GTESTS)
-- set(INC_SYS )
-+ set(INC_SYS)
- blender_add_test_suite_executable(cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
- endif()
---- intern/ghost/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/ghost/CMakeLists.txt
-@@ -80,11 +80,8 @@ if(WITH_OPENGL_BACKEND)
- endif()
-
- if(WITH_OPENGL_BACKEND)
-- list(APPEND INC_SYS
-- ${Epoxy_INCLUDE_DIRS}
-- )
- list(APPEND LIB
-- ${Epoxy_LIBRARIES}
-+ bf::dependencies::optional::epoxy
- )
- add_definitions(-DWITH_OPENGL_BACKEND)
- endif()
-@@ -95,15 +92,9 @@ if(WITH_VULKAN_BACKEND)
-
- intern/GHOST_ContextVK.hh
- )
-- list(APPEND INC
-- ../../extern/vulkan_memory_allocator/
-- )
-- list(APPEND INC_SYS
-- PUBLIC ${VULKAN_INCLUDE_DIRS}
-- )
--
- list(APPEND LIB
-- ${VULKAN_LIBRARIES}
-+ PUBLIC bf::dependencies::optional::vulkan
-+ bf::extern::vulkan_memory_allocator
- )
-
- add_definitions(-DWITH_VULKAN_BACKEND)
-@@ -160,11 +151,8 @@ elseif(WITH_GHOST_SDL)
- )
- add_definitions(-DWITH_GHOST_SDL)
-
-- list(APPEND INC_SYS
-- ${SDL_INCLUDE_DIR}
-- )
- list(APPEND LIB
-- ${SDL_LIBRARY}
-+ bf::dependencies::optional::sdl
- )
- elseif(APPLE AND NOT WITH_GHOST_X11)
- list(APPEND SRC
---- intern/guardedalloc/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/guardedalloc/CMakeLists.txt
-@@ -40,18 +40,8 @@ set(LIB
-
- set(LIB
- PRIVATE bf::intern::atomic
-+ PRIVATE bf::dependencies::pthreads
- )
--
--if(WIN32 AND NOT UNIX)
-- list(APPEND INC_SYS
-- ${PTHREADS_INC}
-- )
-- if(DEFINED PTHREADS_LIBRARIES)
-- list(APPEND LIB
-- ${PTHREADS_LIBRARIES}
-- )
-- endif()
--endif()
-
- if(WITH_MEM_JEMALLOC)
- add_definitions(-DWITH_MEM_JEMALLOC)
---- intern/libmv/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/libmv/CMakeLists.txt
-@@ -31,8 +31,6 @@ if(WITH_LIBMV)
- if(WIN32)
- add_definitions(-D_USE_MATH_DEFINES)
- endif()
-- add_definitions(${GFLAGS_DEFINES})
-- add_definitions(${GLOG_DEFINES})
- add_definitions(-DLIBMV_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
-
- if(WITH_TBB)
-@@ -46,8 +44,6 @@ if(WITH_LIBMV)
- list(APPEND INC_SYS
- ${GFLAGS_INCLUDE_DIRS}
- ${GLOG_INCLUDE_DIRS}
-- ${PNG_INCLUDE_DIRS}
-- ${ZLIB_INCLUDE_DIRS}
- ../../extern/ceres/include
- ../../extern/ceres/config
- )
-@@ -55,12 +51,12 @@ if(WITH_LIBMV)
- list(APPEND LIB
- extern_ceres
- PUBLIC bf::dependencies::optional::tbb
-+ PRIVATE bf::dependencies::zlib
-
-- ${GLOG_LIBRARIES}
-- ${GFLAGS_LIBRARIES}
-- ${PNG_LIBRARIES}
--
- PRIVATE bf::dependencies::eigen
-+ PRIVATE bf::dependencies::gflags
-+ PRIVATE bf::dependencies::glog
-+ PRIVATE bf::dependencies::png
- )
-
- add_definitions(
---- intern/mantaflow/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/mantaflow/CMakeLists.txt
-@@ -34,8 +34,6 @@ set(INC_SYS
- ../../extern/mantaflow/helper/util
- ../../extern/mantaflow/helper/pwrapper
- ../../extern/mantaflow/preprocessed
-- ${PYTHON_INCLUDE_DIRS}
-- ${ZLIB_INCLUDE_DIRS}
- )
-
- set(SRC
-@@ -58,10 +56,8 @@ set(LIB
- PRIVATE bf::dependencies::optional::openvdb
- PRIVATE bf::dependencies::optional::tbb
- extern_mantaflow
--
-- ${PYTHON_LINKFLAGS}
-- ${PYTHON_LIBRARIES}
-- ${ZLIB_LIBRARIES}
-+ PRIVATE bf::dependencies::optional::python
-+ PRIVATE bf::dependencies::zlib
- )
-
- blender_add_lib(bf_intern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
---- intern/opensubdiv/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ intern/opensubdiv/CMakeLists.txt
-@@ -32,11 +32,6 @@ if(WITH_OPENSUBDIV)
- endif()
- endmacro()
-
-- list(APPEND INC_SYS
-- ${OPENSUBDIV_INCLUDE_DIRS}
-- ${Epoxy_INCLUDE_DIRS}
-- )
--
- list(APPEND SRC
- # Base.
- internal/base/memory.h
-@@ -76,8 +71,8 @@ if(WITH_OPENSUBDIV)
- )
-
- list(APPEND LIB
-- ${OPENSUBDIV_LIBRARIES}
-- ${Epoxy_LIBRARIES}
-+ bf::dependencies::optional::opensubdiv
-+ bf::dependencies::optional::epoxy
- )
-
- if(WIN32)
-@@ -137,9 +132,6 @@ if(WITH_GTESTS AND WITH_OPENSUBDIV)
- # Tests.
-
- if(WITH_GTESTS AND WITH_OPENSUBDIV)
-- add_definitions(${GFLAGS_DEFINES})
-- add_definitions(${GLOG_DEFINES})
--
- set(TEST_SRC
- internal/topology/mesh_topology_test.cc
- )
---- source/blender/animrig/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ source/blender/animrig/CMakeLists.txt
-@@ -13,7 +13,6 @@ set(INC_SYS
- )
-
- set(INC_SYS
-- ../../../extern/fmtlib/include
- )
-
- set(SRC
-@@ -62,6 +61,7 @@ set(LIB
- )
-
- set(LIB
-+ PRIVATE bf::extern::fmtlib
- PRIVATE bf::blenkernel
- bf::blenlib
- PRIVATE bf::blenloader
---- source/blender/blendthumb/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ source/blender/blendthumb/CMakeLists.txt
-@@ -103,7 +103,5 @@ elseif(UNIX)
- setup_platform_linker_flags(blender-thumbnailer)
- setup_platform_linker_libs(blender-thumbnailer)
- target_link_libraries(blender-thumbnailer PRIVATE bf_blenlib bf_blenloader_core)
-- if(DEFINED PTHREADS_LIBRARIES)
-- target_link_libraries(blender-thumbnailer PRIVATE ${PTHREADS_LIBRARIES})
-- endif()
-+ target_link_libraries(blender-thumbnailer PRIVATE bf::dependencies::pthreads)
- endif()
---- source/blender/blenfont/CMakeLists.txt.orig 2025-10-08 10:41:56 UTC
-+++ source/blender/blenfont/CMakeLists.txt
-@@ -8,7 +8,6 @@ set(INC_SYS
- )
-
- set(INC_SYS
-- ${FREETYPE_INCLUDE_DIRS}
- )
-
- set(SRC
-@@ -33,7 +32,7 @@ set(LIB
- PRIVATE bf::gpu
- PRIVATE bf::imbuf
- PRIVATE bf::intern::guardedalloc
-- ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
-+ PRIVATE bf::dependencies::freetype
- )
-
- if(WIN32)
---- source/blender/blenkernel/CMakeLists.txt.orig 2025-10-15 13:26:30 UTC
-+++ source/blender/blenkernel/CMakeLists.txt
-@@ -25,11 +25,6 @@ set(INC_SYS
- )
-
- set(INC_SYS
-- ${ZLIB_INCLUDE_DIRS}
-- ${ZSTD_INCLUDE_DIRS}
--
-- # For `vfontdata_freetype.cc`.
-- ${FREETYPE_INCLUDE_DIRS}
- )
-
- set(SRC
-@@ -563,6 +558,7 @@ set(LIB
- )
-
- set(LIB
-+ PRIVATE bf::extern::fmtlib
- PRIVATE bf::animrig
- PRIVATE bf::asset_system
- PRIVATE bf::blenfont
-@@ -593,19 +589,19 @@ set(LIB
- PRIVATE bf::sequencer
- bf_shader_fx
- bf_simulation
-- PRIVATE bf::extern::fmtlib
- PRIVATE bf::extern::xxhash
- PRIVATE bf::intern::atomic
-- # For `vfontdata_freetype.c`.
-- ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
-+ PRIVATE bf::dependencies::zlib
-+ PRIVATE bf::dependencies::zstd
-+ PRIVATE bf::dependencies::freetype # For `vfontdata_freetype.c`.
-+ PRIVATE bf::dependencies::optional::fftw3
-+ PRIVATE bf::dependencies::optional::opensubdiv
-+ PRIVATE bf::dependencies::optional::audaspace
- )
-
- if(WITH_BINRELOC)
-- list(APPEND INC_SYS
-- ${BINRELOC_INCLUDE_DIRS}
-- )
- list(APPEND LIB
-- extern_binreloc
-+ bf::extern::binreloc
- )
- add_definitions(-DWITH_BINRELOC)
- endif()
-@@ -618,35 +614,19 @@ if(WITH_AUDASPACE)
- endif()
-
- if(WITH_AUDASPACE)
-- list(APPEND INC_SYS
-- ${AUDASPACE_C_INCLUDE_DIRS}
-- )
-- if(WITH_SYSTEM_AUDASPACE)
-- list(APPEND LIB
-- ${AUDASPACE_C_LIBRARIES}
-- ${AUDASPACE_PY_LIBRARIES}
-- )
-- endif()
-- add_definitions(-DWITH_AUDASPACE)
--
- if(WITH_RUBBERBAND)
- add_definitions(-DWITH_RUBBERBAND)
- endif()
- endif()
-
- if(WITH_BULLET)
*** 3327 LINES SKIPPED ***