Skip to content

Commit d142103

Browse files
zliceahesford
andcommitted
blender: update to 4.3.0.
Closes: #52903 [via git-merge-pr] Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
1 parent 818ee2d commit d142103

File tree

6 files changed

+686
-208
lines changed

6 files changed

+686
-208
lines changed

srcpkgs/blender/patches/0001-musl-fixes.patch

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,65 @@ Subject: [PATCH 1/2] musl fixes
1414
+++ b/extern/glog/src/config_linux.h
1515
@@ -14,7 +14,9 @@
1616
#define HAVE_DLFCN_H
17-
17+
1818
/* Define to 1 if you have the <execinfo.h> header file. */
1919
+#ifdef __GLIBC__
2020
#define HAVE_EXECINFO_H
2121
+#endif
22-
22+
2323
/* Define if you have the `fcntl' function */
2424
#define HAVE_FCNTL
25+
--- a/source/blender/blenlib/BLI_index_range.hh
26+
+++ b/source/blender/blenlib/BLI_index_range.hh
27+
@@ -38,6 +38,7 @@
28+
*/
29+
30+
#include <algorithm>
31+
+#include <cstdint>
32+
#include <iosfwd>
33+
34+
#include "BLI_assert.h"
35+
36+
--- a/source/blender/blenkernel/BKE_volume_enums.hh
37+
+++ b/source/blender/blenkernel/BKE_volume_enums.hh
38+
@@ -8,7 +8,11 @@
39+
* \ingroup bli
40+
*/
41+
42+
-enum VolumeGridType : int8_t {
43+
+enum VolumeGridType
44+
+#ifdef __GLIBC__
45+
+: int8_t
46+
+#endif
47+
+{
48+
VOLUME_GRID_UNKNOWN = 0,
49+
VOLUME_GRID_BOOLEAN,
50+
VOLUME_GRID_FLOAT,
51+
52+
--- a/extern/lzma/Threads.h
53+
+++ b/extern/lzma/Threads.h
54+
@@ -82,7 +82,12 @@
55+
56+
#ifdef Z7_AFFINITY_SUPPORTED
57+
58+
+#ifndef __GLIBC__
59+
+typedef struct CCpuSet { unsigned long __bits[128/sizeof(long)]; } CCpuSet;
60+
+// because including sched.h doesn't work
61+
+#else
62+
typedef cpu_set_t CCpuSet;
63+
+#endif
64+
#define CpuSet_Zero(p) CPU_ZERO(p)
65+
#define CpuSet_Set(p, cpu) CPU_SET(cpu, p)
66+
#define CpuSet_IsSet(p, cpu) CPU_ISSET(cpu, p)
67+
68+
--- a/extern/lzma/Threads.c
69+
+++ b/extern/lzma/Threads.c
70+
@@ -265,7 +265,7 @@
71+
*/
72+
73+
// ret2 =
74+
- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
75+
+ pthread_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
76+
// if (ret2) ret = ret2;
77+
#endif
78+
}

srcpkgs/blender/patches/altivec-all.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

srcpkgs/blender/patches/python-3.12-regex.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)