From e3e8dc44ce800ebe854c5a60aa9bcc572c70ce64 Mon Sep 17 00:00:00 2001 From: triallax Date: Sun, 21 May 2023 14:21:11 +0100 Subject: [PATCH] blender: update to 3.5.1. --- srcpkgs/blender/patches/numpy-2.24.patch | 22 ---------------------- srcpkgs/blender/template | 13 +++++++------ 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/blender/patches/numpy-2.24.patch diff --git a/srcpkgs/blender/patches/numpy-2.24.patch b/srcpkgs/blender/patches/numpy-2.24.patch deleted file mode 100644 index 716315b74be7..000000000000 --- a/srcpkgs/blender/patches/numpy-2.24.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 d18bc88838ff..ec724bb0a6dc 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender -version=3.4.1 -revision=4 +version=3.5.1 +revision=1 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" @@ -12,8 +12,8 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -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}" + -DPYTHON_LIBRARY=python${py3_ver}${py3_abiver} -DPYTHON_INCLUDE_DIRS=/${py3_inc} + -DWITH_SYSTEM_LZO=ON -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON" hostmakedepends="pkg-config" makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel @@ -22,14 +22,15 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel opencolorio-devel opencollada-devel python3-numpy libXrender-devel OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel - wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel" + wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel + eigen lzo-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=247c4c1228270c9010f4721c985cb5b628ab50abcf9f2678630737142eeb91c3 +checksum=bd7428c7e6cba5a900216269c32111dffaabaf1bdb5472f231965e615174a809 python_version=3 LDFLAGS="-Wl,-z,stack-size=2097152" # Blender tests are executed against a system installation of blender. This