From 8e09ff09cf93bc1d1fc04c469f3aa22d951de870 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Thu, 18 Sep 2025 13:52:59 +0000 Subject: [PATCH] Update blender to 4.5.3 This update includes a missing dependency found in the last aarch64 bulk build --- graphics/blender/Makefile | 22 +++++++++---------- graphics/blender/distinfo | 4 ++-- ...d_files_cmake_platform_platform_unix_cmake | 2 +- .../patches/patch-extern_cuew_include_cuew_h | 15 ------------- .../patch-source_blender_gpu_CMakeLists_txt | 14 ------------ 5 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 graphics/blender/patches/patch-extern_cuew_include_cuew_h delete mode 100644 graphics/blender/patches/patch-source_blender_gpu_CMakeLists_txt diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 1212cced4a6..95ad949630f 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,8 +6,7 @@ DPB_PROPERTIES = parallel COMMENT = 3D creation software -VERSION = 4.5.0 -REVISION = 3 +VERSION = 4.5.3 V = ${VERSION:R} DISTNAME = blender-${VERSION} @@ -22,11 +21,11 @@ WANTLIB += ${COMPILER_LIBCXX} Alembic Iex-3_4 IlmThread-3_4 Imath-3_2 WANTLIB += OpenColorIO OpenEXR-3_4 OpenEXRCore-3_4 OpenImageIO WANTLIB += OpenImageIO_Util X11 Xfixes Xi Xrender atomic avcodec WANTLIB += avdevice avfilter avformat avutil c epoxy execinfo -WANTLIB += fftw3 fftw3f fftw3f_threads freetype gmp gmpxx jpeg -WANTLIB += m openal openjp2 openvdb osdCPU osdGPU pipewire-0.3 -WANTLIB += png potrace pugixml ${MODPY_WANTLIB} shaderc_shared sharpyuv -WANTLIB += sndfile swresample swscale tbb util vulkan webp webpdemux -WANTLIB += webpmux xkbcommon z zstd +WANTLIB += fftw3 fftw3f fftw3f_threads freetype gmp gmpxx hpdf +WANTLIB += jpeg m openal openjp2 openvdb osdCPU osdGPU pipewire-0.3 +WANTLIB += png potrace pugixml python3.12 shaderc_shared sharpyuv +WANTLIB += sndfile swresample swscale tbb tiff util vulkan webp +WANTLIB += webpdemux webpmux z zstd SITES = https://download.blender.org/source/ \ @@ -57,12 +56,12 @@ CONFIGURE_ARGS += -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON CONFIGURE_ARGS+= -DWITH_CPU_SIMD=OFF .endif -BUILD_DEPENDS = math/py-numpy \ - devel/boost \ +BUILD_DEPENDS = devel/boost \ devel/py-six \ - lang/cython \ devel/sdl2 \ graphics/tiff \ + lang/cython \ + math/py-numpy \ www/py-requests # woff2_decompress in do-install @@ -91,8 +90,9 @@ LIB_DEPENDS = archivers/zstd \ math/fftw3,float \ math/imath \ multimedia/pipewire/pipewire,-libs \ + print/libharu \ textproc/pugixml \ - x11/xkbcommon \ + \ ${MODPY_LIB_DEPENDS} RUN_DEPENDS = devel/desktop-file-utils \ diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 4b60f5dc9e5..cb5ef928396 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,2 +1,2 @@ -SHA256 (blender-4.5.0.tar.xz) = ypFg7j2HQejiVcsK7lBqknDvOSUSqpxYTxMKkd+fs5Q= -SIZE (blender-4.5.0.tar.xz) = 85059376 +SHA256 (blender-4.5.3.tar.xz) = +Sr0fzdh62i8cLdNfd3LcvyzA4t22EfGRB5bkLbxknU= +SIZE (blender-4.5.3.tar.xz) = 85087292 diff --git a/graphics/blender/patches/patch-build_files_cmake_platform_platform_unix_cmake b/graphics/blender/patches/patch-build_files_cmake_platform_platform_unix_cmake index bcaf7872441..72540eb471e 100644 --- a/graphics/blender/patches/patch-build_files_cmake_platform_platform_unix_cmake +++ b/graphics/blender/patches/patch-build_files_cmake_platform_platform_unix_cmake @@ -1,7 +1,7 @@ Index: build_files/cmake/platform/platform_unix.cmake --- build_files/cmake/platform/platform_unix.cmake.orig +++ build_files/cmake/platform/platform_unix.cmake -@@ -675,7 +675,7 @@ if(WITH_SYSTEM_FREETYPE) +@@ -678,7 +678,7 @@ if(WITH_SYSTEM_FREETYPE) if(NOT FREETYPE_FOUND) message(FATAL_ERROR "Failed finding system FreeType version!") endif() diff --git a/graphics/blender/patches/patch-extern_cuew_include_cuew_h b/graphics/blender/patches/patch-extern_cuew_include_cuew_h deleted file mode 100644 index 42aed3c63dc..00000000000 --- a/graphics/blender/patches/patch-extern_cuew_include_cuew_h +++ /dev/null @@ -1,15 +0,0 @@ -Check _LP64 instead of hardcoding a list of 64 bits archs, fixes build -on riscv64. - -Index: extern/cuew/include/cuew.h ---- extern/cuew/include/cuew.h.orig -+++ extern/cuew/include/cuew.h -@@ -127,7 +127,7 @@ typedef uint32_t cuuint32_t; - typedef uint64_t cuuint64_t; - #endif - --#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(_M_ARM64) || defined(__ppc64__) || defined(__PPC64__) -+#if defined(_LP64) - typedef unsigned long long CUdeviceptr; - #else - typedef unsigned int CUdeviceptr; diff --git a/graphics/blender/patches/patch-source_blender_gpu_CMakeLists_txt b/graphics/blender/patches/patch-source_blender_gpu_CMakeLists_txt deleted file mode 100644 index 2f68e8060a8..00000000000 --- a/graphics/blender/patches/patch-source_blender_gpu_CMakeLists_txt +++ /dev/null @@ -1,14 +0,0 @@ -Index: source/blender/gpu/CMakeLists.txt ---- source/blender/gpu/CMakeLists.txt.orig -+++ source/blender/gpu/CMakeLists.txt -@@ -763,8 +763,9 @@ target_link_libraries(bf_gpu PUBLIC - bf_imbuf_opencolorio_shaders - ) - -+#if(WITH_OPENGL_BACKEND AND UNIX AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") - if(WITH_OPENGL_BACKEND AND UNIX) -- target_link_libraries(bf_gpu PUBLIC rt) -+ target_link_libraries(bf_gpu PUBLIC execinfo) - endif() - - if(WITH_OPENSUBDIV)