From 154e90188701f4a139e7c5a1a6acf80b6e6d687c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 17 Jan 2023 18:22:21 -0800 Subject: [PATCH] blender: update to 3.4.1. --- srcpkgs/blender/patches/0001-musl-fixes.patch | 110 +++--------------- .../patches/0002-fix-linking-issue.patch | 22 ---- .../patches/no-Werror-double-promotion.patch | 14 --- srcpkgs/blender/patches/numpy-2.24.patch | 22 ++++ srcpkgs/blender/template | 11 +- 5 files changed, 48 insertions(+), 131 deletions(-) delete mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch delete mode 100644 srcpkgs/blender/patches/no-Werror-double-promotion.patch create mode 100644 srcpkgs/blender/patches/numpy-2.24.patch diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch index 330c9139734..b48056d0132 100644 --- a/srcpkgs/blender/patches/0001-musl-fixes.patch +++ b/srcpkgs/blender/patches/0001-musl-fixes.patch @@ -1,98 +1,26 @@ -Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160 +Imported from https://gitlab.alpinelinux.org/alpine/aports/-/raw/47a715de12d0f9ea19dc8b27c417553f5b1b7a39/community/blender/0001-musl-fixes.patch adapted to not use __MUSL__ definition -From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001 -From: Leon Marz -Date: Wed, 25 Nov 2020 10:10:41 +0100 -Subject: [PATCH 1/3] musl fixes +From aae3146f16bfeea88a83a2997196a69ff97a2e4c Mon Sep 17 00:00:00 2001 +From: Leon Marz +Date: Wed, 7 Dec 2022 21:18:58 +0100 +Subject: [PATCH 1/2] musl fixes -Original patch by Nathanael Copa --- - intern/guardedalloc/intern/mallocn_intern.h | 2 +- - intern/libc_compat/libc_compat.c | 2 -- - source/blender/blenlib/intern/system.c | 4 +++- - source/blender/gpu/GPU_vertex_buffer.h | 1 - - source/creator/creator_signals.c | 2 +- - 5 files changed, 5 insertions(+), 6 deletions(-) + extern/glog/src/config_linux.h | 1 - + 1 file changed, 1 deletion(-) -Index: blender-3.3.0/intern/guardedalloc/intern/mallocn_intern.h -=================================================================== ---- blender-3.3.0.orig/intern/guardedalloc/intern/mallocn_intern.h -+++ blender-3.3.0/intern/guardedalloc/intern/mallocn_intern.h -@@ -17,7 +17,7 @@ - #undef HAVE_MALLOC_STATS - #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ +diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h +index b3a3325..946095a 100644 +--- a/extern/glog/src/config_linux.h ++++ b/extern/glog/src/config_linux.h +@@ -14,7 +14,6 @@ + #define HAVE_DLFCN_H --#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ -+#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ - defined(__GLIBC__) - # include - # define HAVE_MALLOC_STATS -Index: blender-3.3.0/intern/libc_compat/libc_compat.c -=================================================================== ---- blender-3.3.0.orig/intern/libc_compat/libc_compat.c -+++ blender-3.3.0/intern/libc_compat/libc_compat.c -@@ -13,8 +13,6 @@ - # include - # include + /* Define to 1 if you have the header file. */ +-#define HAVE_EXECINFO_H --# if defined(__GLIBC_PREREQ) --# if __GLIBC_PREREQ(2, 31) - - double __exp_finite(double x); - double __exp2_finite(double x); -@@ -113,6 +111,4 @@ float __powf_finite(float x, float y) - return powf(x, y); - } - --# endif /* __GLIBC_PREREQ(2, 31) */ --# endif /* __GLIBC_PREREQ */ - #endif /* __linux__ */ -Index: blender-3.3.0/source/blender/blenlib/intern/system.c -=================================================================== ---- blender-3.3.0.orig/source/blender/blenlib/intern/system.c -+++ blender-3.3.0/source/blender/blenlib/intern/system.c -@@ -21,7 +21,9 @@ - - # include "BLI_winstuff.h" - #else -+#if defined(__GLIBC__) - # include -+#endif - # include - #endif - -@@ -63,7 +65,7 @@ void BLI_system_backtrace(FILE *fp) - { - /* ------------- */ - /* Linux / Apple */ --# if defined(__linux__) || defined(__APPLE__) -+# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__) - - # define SIZE 100 - void *buffer[SIZE]; -Index: blender-3.3.0/source/blender/gpu/GPU_vertex_buffer.h -=================================================================== ---- blender-3.3.0.orig/source/blender/gpu/GPU_vertex_buffer.h -+++ blender-3.3.0/source/blender/gpu/GPU_vertex_buffer.h -@@ -133,7 +133,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GP - { - unsigned char *data = a->data; - a->data += a->stride; -- BLI_assert(data < a->_data_end); - return (void *)data; - } - -Index: blender-3.3.0/source/creator/creator_signals.c -=================================================================== ---- blender-3.3.0.orig/source/creator/creator_signals.c -+++ blender-3.3.0/source/creator/creator_signals.c -@@ -258,7 +258,7 @@ void main_signal_setup_fpe(void) - * set breakpoints on sig_handle_fpe */ - signal(SIGFPE, sig_handle_fpe); - --# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__) - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); - # endif /* defined(__linux__) && defined(__GNUC__) */ - # if defined(OSX_SSE_FPE) + /* Define if you have the `fcntl' function */ + #define HAVE_FCNTL +-- +2.38.1 diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch deleted file mode 100644 index 139bc7fd1db..00000000000 --- a/srcpkgs/blender/patches/0002-fix-linking-issue.patch +++ /dev/null @@ -1,22 +0,0 @@ -Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160 - -From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001 -From: Leon Marz -Date: Tue, 1 Sep 2020 09:11:18 +0200 -Subject: [PATCH 2/3] fix linking issue - ---- - intern/ghost/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: blender-3.3.0/intern/ghost/CMakeLists.txt -=================================================================== ---- blender-3.3.0.orig/intern/ghost/CMakeLists.txt -+++ blender-3.3.0/intern/ghost/CMakeLists.txt -@@ -562,5 +562,5 @@ if(WITH_XR_OPENXR) - endif() - - add_definitions(${GL_DEFINITIONS}) -- -+list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender") - blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/srcpkgs/blender/patches/no-Werror-double-promotion.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch deleted file mode 100644 index 0710abe513f..00000000000 --- a/srcpkgs/blender/patches/no-Werror-double-promotion.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: blender-3.3.0/intern/cycles/kernel/CMakeLists.txt -=================================================================== ---- blender-3.3.0.orig/intern/cycles/kernel/CMakeLists.txt -+++ blender-3.3.0/intern/cycles/kernel/CMakeLists.txt -@@ -947,9 +947,7 @@ endif() - # Warnings to avoid using doubles in the kernel. - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") -- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") - unset(_has_cxxflag_float_conversion) -- unset(_has_cxxflag_double_promotion) - endif() - - cycles_add_library(cycles_kernel "${LIB}" diff --git a/srcpkgs/blender/patches/numpy-2.24.patch b/srcpkgs/blender/patches/numpy-2.24.patch new file mode 100644 index 00000000000..716315b74be --- /dev/null +++ b/srcpkgs/blender/patches/numpy-2.24.patch @@ -0,0 +1,22 @@ +From 74e6e07cf7c67b55d384db72f5aa3892db8a3da6 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Tue, 17 Jan 2023 14:36:54 -0800 +Subject: [PATCH] Remove usage of deprecated np.bool alias + +--- + addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py +index 6366434a6..8160c9e99 100644 +--- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py ++++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py +@@ -620,7 +620,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs): + # Try to guess which polys should be flat based on the fact that all the + # loop normals for a flat poly are = the poly's normal. + +- poly_smooths = np.empty(num_polys, dtype=np.bool) ++ poly_smooths = np.empty(num_polys, dtype=bool) + + poly_normals = np.empty(num_polys * 3, dtype=np.float32) + mesh.polygons.foreach_get('normal', poly_normals) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index e8044696736..a3255cddbc9 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender -version=3.3.0 -revision=4 +version=3.4.1 +revision=1 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" @@ -10,23 +10,26 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DWITH_CYCLES_EMBREE=OFF -DWITH_OPENCOLORIO=ON -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON -DWITH_OPENSUBDIV=ON -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON + -DWITH_GHOST_X11=ON -DWITH_GHOST_WAYLAND=ON -DWITH_GHOST_LIBDECOR=ON -DWITH_BUILDINFO=OFF -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}' -DPYTHON_INCLUDE_DIRS=/$py3_inc" +hostmakedepends="pkg-config" makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel opencolorio-devel opencollada-devel python3-numpy libXrender-devel OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel - pugixml-devel libXxf86vm-devel gmp-devel gmpxx-devel" + pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel + wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="3D graphics creation suite" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.blender.org" distfiles="https://download.blender.org/source/blender-${version}.tar.xz" -checksum=22c51a4e66385cb14818aa4d76dcf7fa6d6e103afb0d36916e12ea15988d21f0 +checksum=247c4c1228270c9010f4721c985cb5b628ab50abcf9f2678630737142eeb91c3 python_version=3 LDFLAGS="-Wl,-z,stack-size=2097152" # Blender tests are executed against a system installation of blender. This