Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] blender: update to 3.5.1.
@ 2023-05-21 13:32 mhmdanas
  2023-05-25 18:33 ` [PR PATCH] [Merged]: " ahesford
  0 siblings, 1 reply; 2+ messages in thread
From: mhmdanas @ 2023-05-21 13:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages blender-3.5.1
https://github.com/void-linux/void-packages/pull/43992

blender: update to 3.5.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@Gottox

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43992.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-3.5.1-43992.patch --]
[-- Type: text/x-diff, Size: 3939 bytes --]

From e3e8dc44ce800ebe854c5a60aa9bcc572c70ce64 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
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 <oreo6391@gmail.com>
-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 <gottox@voidlinux.org>"
 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: blender: update to 3.5.1.
  2023-05-21 13:32 [PR PATCH] blender: update to 3.5.1 mhmdanas
@ 2023-05-25 18:33 ` ahesford
  0 siblings, 0 replies; 2+ messages in thread
From: ahesford @ 2023-05-25 18:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]

There's a merged pull request on the void-packages repository

blender: update to 3.5.1.
https://github.com/void-linux/void-packages/pull/43992

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@Gottox

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-05-25 18:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-21 13:32 [PR PATCH] blender: update to 3.5.1 mhmdanas
2023-05-25 18:33 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).