From 01a57d87673f7b65047c305078d894a852479d79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 Dec 2024 13:39:38 -0500
Subject: [PATCH] blender: update to 4.3.1.

---
 srcpkgs/blender/patches/0001-musl-fixes.patch | 72 +++----------------
 .../blender/patches/0002-fix-includes.patch   | 38 ++++++++++
 srcpkgs/blender/template                      |  8 ++-
 3 files changed, 52 insertions(+), 66 deletions(-)
 create mode 100644 srcpkgs/blender/patches/0002-fix-includes.patch

diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 4e0af6c4619..847f369cb30 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,7 +1,4 @@
-Imported from https://gitlab.alpinelinux.org/alpine/aports/-/raw/47a715de12d0f9ea19dc8b27c417553f5b1b7a39/community/blender/0001-musl-fixes.patch
-adapted to not use __MUSL__ definition
-
-From aae3146f16bfeea88a83a2997196a69ff97a2e4c Mon Sep 17 00:00:00 2001
+From 8ad26a05598810b9d64722ac48507c145b010e30 Mon Sep 17 00:00:00 2001
 From: Leon Marz <main@lmarz.org>
 Date: Wed, 7 Dec 2022 21:18:58 +0100
 Subject: [PATCH 1/2] musl fixes
@@ -10,69 +7,18 @@ Subject: [PATCH 1/2] musl fixes
  extern/glog/src/config_linux.h | 1 -
  1 file changed, 1 deletion(-)
 
+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,9 @@
+@@ -14,7 +14,6 @@
  #define HAVE_DLFCN_H
-
+ 
  /* Define to 1 if you have the <execinfo.h> header file. */
-+#ifdef __GLIBC__
- #define HAVE_EXECINFO_H
-+#endif
-
+-#define HAVE_EXECINFO_H
+ 
  /* Define if you have the `fcntl' function */
  #define HAVE_FCNTL
---- a/source/blender/blenlib/BLI_index_range.hh
-+++ b/source/blender/blenlib/BLI_index_range.hh
-@@ -38,6 +38,7 @@
-  */
+-- 
+2.47.0
 
- #include <algorithm>
-+#include <cstdint>
- #include <iosfwd>
-
- #include "BLI_assert.h"
-
---- a/source/blender/blenkernel/BKE_volume_enums.hh
-+++ b/source/blender/blenkernel/BKE_volume_enums.hh
-@@ -8,7 +8,11 @@
-  * \ingroup bli
-  */
-
--enum VolumeGridType : int8_t {
-+enum VolumeGridType
-+#ifdef __GLIBC__
-+: int8_t
-+#endif
-+{
-   VOLUME_GRID_UNKNOWN = 0,
-   VOLUME_GRID_BOOLEAN,
-   VOLUME_GRID_FLOAT,
-
---- a/extern/lzma/Threads.h
-+++ b/extern/lzma/Threads.h
-@@ -82,7 +82,12 @@
-
- #ifdef Z7_AFFINITY_SUPPORTED
-
-+#ifndef __GLIBC__
-+typedef struct CCpuSet { unsigned long __bits[128/sizeof(long)]; } CCpuSet;
-+// because including sched.h doesn't work
-+#else
- typedef cpu_set_t CCpuSet;
-+#endif
- #define CpuSet_Zero(p)        CPU_ZERO(p)
- #define CpuSet_Set(p, cpu)    CPU_SET(cpu, p)
- #define CpuSet_IsSet(p, cpu)  CPU_ISSET(cpu, p)
-
---- a/extern/lzma/Threads.c
-+++ b/extern/lzma/Threads.c
-@@ -265,7 +265,7 @@
-       */
-
-       // ret2 =
--      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
-+      pthread_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
-       // if (ret2) ret = ret2;
-       #endif
-     }
diff --git a/srcpkgs/blender/patches/0002-fix-includes.patch b/srcpkgs/blender/patches/0002-fix-includes.patch
new file mode 100644
index 00000000000..44809f4f158
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-includes.patch
@@ -0,0 +1,38 @@
+From af7161dfb4324002e27abef7c4f7a6151f26c34a Mon Sep 17 00:00:00 2001
+From: Leon Marz <main@lmarz.org>
+Date: Wed, 27 Mar 2024 10:40:01 +0100
+Subject: [PATCH 2/2] fix includes
+
+---
+ source/blender/blenkernel/BKE_volume_enums.hh | 2 ++
+ source/blender/blenlib/BLI_index_range.hh     | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/source/blender/blenkernel/BKE_volume_enums.hh b/source/blender/blenkernel/BKE_volume_enums.hh
+index 3817b52..ebcfa44 100644
+--- a/source/blender/blenkernel/BKE_volume_enums.hh
++++ b/source/blender/blenkernel/BKE_volume_enums.hh
+@@ -8,6 +8,8 @@
+  * \ingroup bli
+  */
+ 
++#include <cstdint>
++
+ enum VolumeGridType : int8_t {
+   VOLUME_GRID_UNKNOWN = 0,
+   VOLUME_GRID_BOOLEAN,
+diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh
+index bd9e030..25e9eb7 100644
+--- a/source/blender/blenlib/BLI_index_range.hh
++++ b/source/blender/blenlib/BLI_index_range.hh
+@@ -38,6 +38,7 @@
+  */
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <iosfwd>
+ 
+ #include "BLI_assert.h"
+-- 
+2.47.0
+
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 668d68647ba..8aec56d4083 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=4.3.0
+version=4.3.1
 revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
@@ -31,14 +31,16 @@ 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=a2c73d338768509be210aeb66730efe6076ec1be36668a1acd0be35a9de12aea
+checksum=81bce671a7eb80d6880b728e042f4a4f65e1c4ccca86429a21615b45f7aef2e9
 python_version=3
 LDFLAGS="-Wl,-z,stack-size=2097152"
 # Blender tests are executed against a system installation of blender. This
 # is currently not supported by xbps-src.
 make_check=no
 
-if [ "$XBPS_TARGET_LIBC" != musl ]; then
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" -DWITH_LZMA=OFF"
+else
 	makedepends+=" jemalloc-devel"
 fi