Skip to content

Commit

Permalink
blender: update to 4.3.0.
Browse files Browse the repository at this point in the history
Closes: void-linux#52903 [via git-merge-pr]

Co-authored-by: Andrew J. Hesford <[email protected]>
  • Loading branch information
zlice and ahesford committed Dec 4, 2024
1 parent 4659a05 commit 3d8b111
Show file tree
Hide file tree
Showing 6 changed files with 686 additions and 208 deletions.
58 changes: 56 additions & 2 deletions srcpkgs/blender/patches/0001-musl-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,65 @@ Subject: [PATCH 1/2] musl fixes
+++ b/extern/glog/src/config_linux.h
@@ -14,7 +14,9 @@
#define HAVE_DLFCN_H

/* Define to 1 if you have the <execinfo.h> header file. */
+#ifdef __GLIBC__
#define HAVE_EXECINFO_H
+#endif

/* 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 @@
*/

#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
}
32 changes: 0 additions & 32 deletions srcpkgs/blender/patches/altivec-all.patch

This file was deleted.

36 changes: 0 additions & 36 deletions srcpkgs/blender/patches/python-3.12-regex.patch

This file was deleted.

Loading

0 comments on commit 3d8b111

Please sign in to comment.