* [PR PATCH] blender: update to 4.2.3
@ 2024-11-04 1:50 zlice
2024-11-04 3:38 ` zlice
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: zlice @ 2024-11-04 1:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 771 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender423
https://github.com/void-linux/void-packages/pull/52903
blender: update to 4.2.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
updates:
- openimageio
- openimagedenoise
- OpenSubdiv
- blender
opencolorio has an update but requires `minizip-ng`. `minizip` is used by qt and a handful of other packages so i didn't want to touch it, but it should probably be updated. looks like most distros use ng
A patch file from https://github.com/void-linux/void-packages/pull/52903.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender423-52903.patch --]
[-- Type: text/x-diff, Size: 18896 bytes --]
From 4c770a93ab9d2d677914f9a3a5e40e7ef94cb7f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:46:50 -0500
Subject: [PATCH 1/4] openimageio: update to 2.5.17
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e4f09f58695930..c5bc5ec64890ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2325,8 +2325,8 @@ libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF6ThreadWeaver.so.6 kf6-threadweaver-6.0.0_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1
-libOpenImageIO.so.2.4 openimageio-2.4.9.0_1
+libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1
+libOpenImageIO.so.2.5 openimageio-2.5.17.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.2_1
libpystring.so.1 pystring-1.1.3_1
libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 27a3ecd3aa92de..d0409296f1c7f1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.4.9.0
-revision=9
+version=2.5.17.0
+revision=1
build_style=cmake
build_helper=qemu
configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
-checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
+checksum=9cf1b98762ce5aa5f3f7cd34672549034f5716da1eba26eb5173c18aa21e6583
# Runs checks even for features we disabled.
make_check=no
From f90a7df1ec40201bf50439a470827ad87d70d8f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:11 -0500
Subject: [PATCH 2/4] OpenSubdiv: update to 2.3.0
---
common/shlibs | 4 ++--
srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 -----------------------
srcpkgs/OpenSubdiv/template | 6 ++---
3 files changed, 5 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch
diff --git a/common/shlibs b/common/shlibs
index c5bc5ec64890ff..e93220c363fc5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,8 +3977,8 @@ librdkafka.so.1 librdkafka-1.4.4_3
librdkafka++.so.1 librdkafka-1.4.4_3
libraft.so.0 raft-0.18.2_1
libmdnsd.so.1 libmdnsd-0.9_1
-libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
-libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
+libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
+libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
deleted file mode 100644
index 5a812c84b21102..00000000000000
--- a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
-index c98db9f..8dec0e1 100644
---- a/opensubdiv/osd/tbbEvaluator.cpp
-+++ b/opensubdiv/osd/tbbEvaluator.cpp
-@@ -25,7 +25,7 @@
- #include "../osd/tbbEvaluator.h"
- #include "../osd/tbbKernel.h"
-
--#include <tbb/task_scheduler_init.h>
-+#include <tbb/global_control.h>
-
- namespace OpenSubdiv {
- namespace OPENSUBDIV_VERSION {
-@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
- /* static */
- void
- TbbEvaluator::SetNumThreads(int numThreads) {
-- if (numThreads == -1) {
-- tbb::task_scheduler_init init;
-- } else {
-- tbb::task_scheduler_init init(numThreads);
-+ if (numThreads != -1) {
-+ tbb::global_control tbb_global_control(
-+ tbb::global_control::max_allowed_parallelism,
-+ numThreads
-+ );
- }
- }
-
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 76d950301cd01d..7db0f87a638bd5 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
# Template file for 'OpenSubdiv'
pkgname=OpenSubdiv
-version=3.4.3
-revision=4
+version=3.6.0
+revision=1
build_style=cmake
# TODO: CUDA/OpenCL support
# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0"
homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html"
distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz"
-checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745
+checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" OpenSubdiv"
From c54c51c17fb209b3de953c7abe9c1219d1bdf577 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:32 -0500
Subject: [PATCH 3/4] openimagedenoise: update to 2.3.0
---
common/shlibs | 2 +-
srcpkgs/openimagedenoise/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e93220c363fc5a..6d5ff842195c50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,7 +3983,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
libfido2.so.1 libfido2-1.6.0_2
-libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
+libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 109deb171c3f75..812355b21e4caf 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
# Template file for 'openimagedenoise'
pkgname=openimagedenoise
-version=1.4.3
-revision=2
+version=2.3.0
+revision=1
archs="x86_64*"
build_style=cmake
hostmakedepends="ispc python3"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://openimagedenoise.github.io"
changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
+checksum=cce3010962ec84e0ba1acd8c9055a3d8de402fedb1b463517cfeb920a276e427
do_check() {
build/oidnTest
From 892438965bf8205c937376f58c3e82d9188d0e89 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:51 -0500
Subject: [PATCH 4/4] blender: update to 4.2.3
---
srcpkgs/blender/patches/altivec-all.patch | 32 -----
.../blender/patches/python-3.12-regex.patch | 36 -----
.../patches/python3.12-pylongobject.patch | 134 ------------------
srcpkgs/blender/template | 6 +-
4 files changed, 3 insertions(+), 205 deletions(-)
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
delete mode 100644 srcpkgs/blender/patches/python-3.12-regex.patch
delete mode 100644 srcpkgs/blender/patches/python3.12-pylongobject.patch
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd033d..00000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/python-3.12-regex.patch b/srcpkgs/blender/patches/python-3.12-regex.patch
deleted file mode 100644
index daba4a859fd157..00000000000000
--- a/srcpkgs/blender/patches/python-3.12-regex.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-+++ b/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-@@ -852,7 +852,7 @@ class MText(DXFEntity):
- self.set_default_extrusion()
-
- def lines(self):
-- return self.raw_text.split('\P')
-+ return self.raw_text.split(r'\P')
-
- def plain_text(self, split=False):
- chars = []
---- a/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-+++ b/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-@@ -22,9 +22,9 @@ class ImageData:
- return hash(self._data)
-
- def adjusted_name(self):
-- regex_dot = re.compile("\.")
-+ regex_dot = re.compile(r"\.")
- adjusted_name = re.sub(regex_dot, "_", self.name)
-- new_name = "".join([char for char in adjusted_name if char not in "!#$&'()*+,/:;<>?@[\]^`{|}~"])
-+ new_name = "".join([char for char in adjusted_name if char not in r"!#$&'()*+,/:;<>?@[\]^`{|}~"])
- return new_name
-
- @property
---- a/scripts/modules/bl_i18n_utils/settings.py
-+++ b/scripts/modules/bl_i18n_utils/settings.py
-@@ -302,7 +302,7 @@ PYGETTEXT_KEYWORDS = (() +
- # becomes extremely slow to process some (unrelated) source files.
- ((r"\{(?:(?:\s*\"[^\",]+\"\s*,)|(?:\s*\"\\\"\",)|(?:\s*nullptr\s*,)){4}\s*" +
- _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*nullptr\s*,))(?:[^,]+,){2}"
-- + "(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-+ + r"(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-
- tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
- r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
diff --git a/srcpkgs/blender/patches/python3.12-pylongobject.patch b/srcpkgs/blender/patches/python3.12-pylongobject.patch
deleted file mode 100644
index 80b326809cc95f..00000000000000
--- a/srcpkgs/blender/patches/python3.12-pylongobject.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://src.fedoraproject.org/rpms/blender/raw/7045717eb5477c40905f6d29dfd3dbf5ed674e4d/f/blender-3.6.1-py312-pylongobject.patch
-
---- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-@@ -188,6 +188,7 @@ PyTypeObject IntegrationType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _IntegrationType_MEAN = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MEAN}};
- static PyLongObject _IntegrationType_MIN = {PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MIN}};
-@@ -196,6 +197,26 @@ static PyLongObject _IntegrationType_FIR
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){FIRST}};
- static PyLongObject _IntegrationType_LAST = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){LAST}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_IntegrationTypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&IntegrationType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _IntegrationType_MEAN = _Py_IntegrationTypeType_DIGIT_INIT(MEAN);
-+static PyLongObject _IntegrationType_MIN = _Py_IntegrationTypeType_DIGIT_INIT(MIN);
-+static PyLongObject _IntegrationType_MAX = _Py_IntegrationTypeType_DIGIT_INIT(MAX);
-+static PyLongObject _IntegrationType_FIRST = _Py_IntegrationTypeType_DIGIT_INIT(FIRST);
-+static PyLongObject _IntegrationType_LAST = _Py_IntegrationTypeType_DIGIT_INIT(LAST);
-+#endif
-
- #define BPy_IntegrationType_MEAN ((PyObject *)&_IntegrationType_MEAN)
- #define BPy_IntegrationType_MIN ((PyObject *)&_IntegrationType_MIN)
---- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-@@ -73,6 +73,7 @@ PyTypeObject MediumType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- PyLongObject _BPy_MediumType_DRY_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::DRY_MEDIUM},
- };
-@@ -82,6 +83,24 @@ PyLongObject _BPy_MediumType_HUMID_MEDIU
- PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::OPAQUE_MEDIUM},
- };
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_MediumType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&MediumType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+PyLongObject _BPy_MediumType_DRY_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::DRY_MEDIUM);
-+PyLongObject _BPy_MediumType_HUMID_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::HUMID_MEDIUM);
-+PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::OPAQUE_MEDIUM);
-+#endif
-
- //-------------------MODULE INITIALIZATION--------------------------------
-
---- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
-@@ -137,6 +137,7 @@ PyTypeObject Nature_Type = {
-
- /*-----------------------BPy_Nature instance definitions ----------------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _Nature_POINT = {PyVarObject_HEAD_INIT(&Nature_Type, 0){Nature::POINT}};
- static PyLongObject _Nature_S_VERTEX = {PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::S_VERTEX}};
- static PyLongObject _Nature_VIEW_VERTEX = {
-@@ -159,6 +160,36 @@ static PyLongObject _Nature_MATERIAL_BOU
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::MATERIAL_BOUNDARY}};
- static PyLongObject _Nature_EDGE_MARK = {
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::EDGE_MARK}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_Nature_TypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&Nature_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _Nature_POINT = _Py_Nature_TypeType_DIGIT_INIT(Nature::POINT);
-+static PyLongObject _Nature_S_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::S_VERTEX);
-+static PyLongObject _Nature_VIEW_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::VIEW_VERTEX);
-+static PyLongObject _Nature_NON_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::NON_T_VERTEX);
-+static PyLongObject _Nature_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::T_VERTEX);
-+static PyLongObject _Nature_CUSP = _Py_Nature_TypeType_DIGIT_INIT(Nature::CUSP);
-+static PyLongObject _Nature_NO_FEATURE = _Py_Nature_TypeType_DIGIT_INIT(Nature::NO_FEATURE);
-+static PyLongObject _Nature_SILHOUETTE = _Py_Nature_TypeType_DIGIT_INIT(Nature::SILHOUETTE);
-+static PyLongObject _Nature_BORDER = _Py_Nature_TypeType_DIGIT_INIT(Nature::BORDER);
-+static PyLongObject _Nature_CREASE = _Py_Nature_TypeType_DIGIT_INIT(Nature::CREASE);
-+static PyLongObject _Nature_RIDGE = _Py_Nature_TypeType_DIGIT_INIT(Nature::RIDGE);
-+static PyLongObject _Nature_VALLEY = _Py_Nature_TypeType_DIGIT_INIT(Nature::VALLEY);
-+static PyLongObject _Nature_SUGGESTIVE_CONTOUR = _Py_Nature_TypeType_DIGIT_INIT(Nature::SUGGESTIVE_CONTOUR);
-+static PyLongObject _Nature_MATERIAL_BOUNDARY = _Py_Nature_TypeType_DIGIT_INIT(Nature::MATERIAL_BOUNDARY);
-+static PyLongObject _Nature_EDGE_MARK = _Py_Nature_TypeType_DIGIT_INIT(Nature::EDGE_MARK);
-+#endif
-
- #define BPy_Nature_POINT ((PyObject *)&_Nature_POINT)
- #define BPy_Nature_S_VERTEX ((PyObject *)&_Nature_S_VERTEX)
-@@ -249,7 +280,12 @@ static PyObject *BPy_Nature_bitwise(PyOb
- else {
- result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1);
- if (result) {
-+#if PY_VERSION_HEX >= 0x030c0000 /* Python 3.12 and newer */
-+ result->i.long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE((v > 0 ? 1 : -1), 1);
-+ result->i.long_value.ob_digit[0] = v;
-+#else
- result->i.ob_digit[0] = v;
-+#endif
- }
- }
- return (PyObject *)result;
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 7e321a9ad525cd..1c0167a3cb32a2 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=4.0.2
-revision=3
+version=4.2.3
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -31,7 +31,7 @@ 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=aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3
+checksum=be009fcf5ff68d87004fb985a81d2db16ea44c88a5b89e10febb02b6802eee76
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] 5+ messages in thread
* Re: blender: update to 4.2.3
2024-11-04 1:50 [PR PATCH] blender: update to 4.2.3 zlice
@ 2024-11-04 3:38 ` zlice
2024-11-04 16:44 ` [PR PATCH] [Updated] " zlice
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2024-11-04 3:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/52903#issuecomment-2453770493
Comment:
since blender is only for x86* should the other packages also be? don't think they are used for anything else. will update musl cstdint tomorrow
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] blender: update to 4.2.3
2024-11-04 1:50 [PR PATCH] blender: update to 4.2.3 zlice
2024-11-04 3:38 ` zlice
@ 2024-11-04 16:44 ` zlice
2024-11-04 16:49 ` zlice
2024-11-05 13:33 ` [PR PATCH] [Updated] " zlice
3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2024-11-04 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender423
https://github.com/void-linux/void-packages/pull/52903
blender: update to 4.2.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
updates:
- openimageio
- openimagedenoise
- OpenSubdiv
- blender
opencolorio has an update but requires `minizip-ng`. `minizip` is used by qt and a handful of other packages so i didn't want to touch it, but it should probably be updated. looks like most distros use ng
A patch file from https://github.com/void-linux/void-packages/pull/52903.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender423-52903.patch --]
[-- Type: text/x-diff, Size: 20831 bytes --]
From 4c770a93ab9d2d677914f9a3a5e40e7ef94cb7f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:46:50 -0500
Subject: [PATCH 1/4] openimageio: update to 2.5.17
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e4f09f58695930..c5bc5ec64890ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2325,8 +2325,8 @@ libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF6ThreadWeaver.so.6 kf6-threadweaver-6.0.0_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1
-libOpenImageIO.so.2.4 openimageio-2.4.9.0_1
+libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1
+libOpenImageIO.so.2.5 openimageio-2.5.17.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.2_1
libpystring.so.1 pystring-1.1.3_1
libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 27a3ecd3aa92de..d0409296f1c7f1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.4.9.0
-revision=9
+version=2.5.17.0
+revision=1
build_style=cmake
build_helper=qemu
configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
-checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
+checksum=9cf1b98762ce5aa5f3f7cd34672549034f5716da1eba26eb5173c18aa21e6583
# Runs checks even for features we disabled.
make_check=no
From f90a7df1ec40201bf50439a470827ad87d70d8f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:11 -0500
Subject: [PATCH 2/4] OpenSubdiv: update to 2.3.0
---
common/shlibs | 4 ++--
srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 -----------------------
srcpkgs/OpenSubdiv/template | 6 ++---
3 files changed, 5 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch
diff --git a/common/shlibs b/common/shlibs
index c5bc5ec64890ff..e93220c363fc5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,8 +3977,8 @@ librdkafka.so.1 librdkafka-1.4.4_3
librdkafka++.so.1 librdkafka-1.4.4_3
libraft.so.0 raft-0.18.2_1
libmdnsd.so.1 libmdnsd-0.9_1
-libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
-libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
+libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
+libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
deleted file mode 100644
index 5a812c84b21102..00000000000000
--- a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
-index c98db9f..8dec0e1 100644
---- a/opensubdiv/osd/tbbEvaluator.cpp
-+++ b/opensubdiv/osd/tbbEvaluator.cpp
-@@ -25,7 +25,7 @@
- #include "../osd/tbbEvaluator.h"
- #include "../osd/tbbKernel.h"
-
--#include <tbb/task_scheduler_init.h>
-+#include <tbb/global_control.h>
-
- namespace OpenSubdiv {
- namespace OPENSUBDIV_VERSION {
-@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
- /* static */
- void
- TbbEvaluator::SetNumThreads(int numThreads) {
-- if (numThreads == -1) {
-- tbb::task_scheduler_init init;
-- } else {
-- tbb::task_scheduler_init init(numThreads);
-+ if (numThreads != -1) {
-+ tbb::global_control tbb_global_control(
-+ tbb::global_control::max_allowed_parallelism,
-+ numThreads
-+ );
- }
- }
-
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 76d950301cd01d..7db0f87a638bd5 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
# Template file for 'OpenSubdiv'
pkgname=OpenSubdiv
-version=3.4.3
-revision=4
+version=3.6.0
+revision=1
build_style=cmake
# TODO: CUDA/OpenCL support
# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0"
homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html"
distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz"
-checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745
+checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" OpenSubdiv"
From c54c51c17fb209b3de953c7abe9c1219d1bdf577 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:32 -0500
Subject: [PATCH 3/4] openimagedenoise: update to 2.3.0
---
common/shlibs | 2 +-
srcpkgs/openimagedenoise/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e93220c363fc5a..6d5ff842195c50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,7 +3983,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
libfido2.so.1 libfido2-1.6.0_2
-libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
+libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 109deb171c3f75..812355b21e4caf 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
# Template file for 'openimagedenoise'
pkgname=openimagedenoise
-version=1.4.3
-revision=2
+version=2.3.0
+revision=1
archs="x86_64*"
build_style=cmake
hostmakedepends="ispc python3"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://openimagedenoise.github.io"
changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
+checksum=cce3010962ec84e0ba1acd8c9055a3d8de402fedb1b463517cfeb920a276e427
do_check() {
build/oidnTest
From aaff97e26cba790bb87ee676122fd8d85eda2c9d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:51 -0500
Subject: [PATCH 4/4] blender: update to 4.2.3
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 58 +++++++-
srcpkgs/blender/patches/altivec-all.patch | 32 -----
.../blender/patches/python-3.12-regex.patch | 36 -----
.../patches/python3.12-pylongobject.patch | 134 ------------------
srcpkgs/blender/template | 6 +-
5 files changed, 59 insertions(+), 207 deletions(-)
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
delete mode 100644 srcpkgs/blender/patches/python-3.12-regex.patch
delete mode 100644 srcpkgs/blender/patches/python3.12-pylongobject.patch
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index a32821172cba34..4e0af6c4619da2 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -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
+ }
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd033d..00000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/python-3.12-regex.patch b/srcpkgs/blender/patches/python-3.12-regex.patch
deleted file mode 100644
index daba4a859fd157..00000000000000
--- a/srcpkgs/blender/patches/python-3.12-regex.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-+++ b/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-@@ -852,7 +852,7 @@ class MText(DXFEntity):
- self.set_default_extrusion()
-
- def lines(self):
-- return self.raw_text.split('\P')
-+ return self.raw_text.split(r'\P')
-
- def plain_text(self, split=False):
- chars = []
---- a/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-+++ b/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-@@ -22,9 +22,9 @@ class ImageData:
- return hash(self._data)
-
- def adjusted_name(self):
-- regex_dot = re.compile("\.")
-+ regex_dot = re.compile(r"\.")
- adjusted_name = re.sub(regex_dot, "_", self.name)
-- new_name = "".join([char for char in adjusted_name if char not in "!#$&'()*+,/:;<>?@[\]^`{|}~"])
-+ new_name = "".join([char for char in adjusted_name if char not in r"!#$&'()*+,/:;<>?@[\]^`{|}~"])
- return new_name
-
- @property
---- a/scripts/modules/bl_i18n_utils/settings.py
-+++ b/scripts/modules/bl_i18n_utils/settings.py
-@@ -302,7 +302,7 @@ PYGETTEXT_KEYWORDS = (() +
- # becomes extremely slow to process some (unrelated) source files.
- ((r"\{(?:(?:\s*\"[^\",]+\"\s*,)|(?:\s*\"\\\"\",)|(?:\s*nullptr\s*,)){4}\s*" +
- _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*nullptr\s*,))(?:[^,]+,){2}"
-- + "(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-+ + r"(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-
- tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
- r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
diff --git a/srcpkgs/blender/patches/python3.12-pylongobject.patch b/srcpkgs/blender/patches/python3.12-pylongobject.patch
deleted file mode 100644
index 80b326809cc95f..00000000000000
--- a/srcpkgs/blender/patches/python3.12-pylongobject.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://src.fedoraproject.org/rpms/blender/raw/7045717eb5477c40905f6d29dfd3dbf5ed674e4d/f/blender-3.6.1-py312-pylongobject.patch
-
---- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-@@ -188,6 +188,7 @@ PyTypeObject IntegrationType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _IntegrationType_MEAN = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MEAN}};
- static PyLongObject _IntegrationType_MIN = {PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MIN}};
-@@ -196,6 +197,26 @@ static PyLongObject _IntegrationType_FIR
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){FIRST}};
- static PyLongObject _IntegrationType_LAST = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){LAST}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_IntegrationTypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&IntegrationType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _IntegrationType_MEAN = _Py_IntegrationTypeType_DIGIT_INIT(MEAN);
-+static PyLongObject _IntegrationType_MIN = _Py_IntegrationTypeType_DIGIT_INIT(MIN);
-+static PyLongObject _IntegrationType_MAX = _Py_IntegrationTypeType_DIGIT_INIT(MAX);
-+static PyLongObject _IntegrationType_FIRST = _Py_IntegrationTypeType_DIGIT_INIT(FIRST);
-+static PyLongObject _IntegrationType_LAST = _Py_IntegrationTypeType_DIGIT_INIT(LAST);
-+#endif
-
- #define BPy_IntegrationType_MEAN ((PyObject *)&_IntegrationType_MEAN)
- #define BPy_IntegrationType_MIN ((PyObject *)&_IntegrationType_MIN)
---- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-@@ -73,6 +73,7 @@ PyTypeObject MediumType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- PyLongObject _BPy_MediumType_DRY_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::DRY_MEDIUM},
- };
-@@ -82,6 +83,24 @@ PyLongObject _BPy_MediumType_HUMID_MEDIU
- PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::OPAQUE_MEDIUM},
- };
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_MediumType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&MediumType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+PyLongObject _BPy_MediumType_DRY_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::DRY_MEDIUM);
-+PyLongObject _BPy_MediumType_HUMID_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::HUMID_MEDIUM);
-+PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::OPAQUE_MEDIUM);
-+#endif
-
- //-------------------MODULE INITIALIZATION--------------------------------
-
---- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
-@@ -137,6 +137,7 @@ PyTypeObject Nature_Type = {
-
- /*-----------------------BPy_Nature instance definitions ----------------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _Nature_POINT = {PyVarObject_HEAD_INIT(&Nature_Type, 0){Nature::POINT}};
- static PyLongObject _Nature_S_VERTEX = {PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::S_VERTEX}};
- static PyLongObject _Nature_VIEW_VERTEX = {
-@@ -159,6 +160,36 @@ static PyLongObject _Nature_MATERIAL_BOU
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::MATERIAL_BOUNDARY}};
- static PyLongObject _Nature_EDGE_MARK = {
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::EDGE_MARK}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_Nature_TypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&Nature_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _Nature_POINT = _Py_Nature_TypeType_DIGIT_INIT(Nature::POINT);
-+static PyLongObject _Nature_S_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::S_VERTEX);
-+static PyLongObject _Nature_VIEW_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::VIEW_VERTEX);
-+static PyLongObject _Nature_NON_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::NON_T_VERTEX);
-+static PyLongObject _Nature_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::T_VERTEX);
-+static PyLongObject _Nature_CUSP = _Py_Nature_TypeType_DIGIT_INIT(Nature::CUSP);
-+static PyLongObject _Nature_NO_FEATURE = _Py_Nature_TypeType_DIGIT_INIT(Nature::NO_FEATURE);
-+static PyLongObject _Nature_SILHOUETTE = _Py_Nature_TypeType_DIGIT_INIT(Nature::SILHOUETTE);
-+static PyLongObject _Nature_BORDER = _Py_Nature_TypeType_DIGIT_INIT(Nature::BORDER);
-+static PyLongObject _Nature_CREASE = _Py_Nature_TypeType_DIGIT_INIT(Nature::CREASE);
-+static PyLongObject _Nature_RIDGE = _Py_Nature_TypeType_DIGIT_INIT(Nature::RIDGE);
-+static PyLongObject _Nature_VALLEY = _Py_Nature_TypeType_DIGIT_INIT(Nature::VALLEY);
-+static PyLongObject _Nature_SUGGESTIVE_CONTOUR = _Py_Nature_TypeType_DIGIT_INIT(Nature::SUGGESTIVE_CONTOUR);
-+static PyLongObject _Nature_MATERIAL_BOUNDARY = _Py_Nature_TypeType_DIGIT_INIT(Nature::MATERIAL_BOUNDARY);
-+static PyLongObject _Nature_EDGE_MARK = _Py_Nature_TypeType_DIGIT_INIT(Nature::EDGE_MARK);
-+#endif
-
- #define BPy_Nature_POINT ((PyObject *)&_Nature_POINT)
- #define BPy_Nature_S_VERTEX ((PyObject *)&_Nature_S_VERTEX)
-@@ -249,7 +280,12 @@ static PyObject *BPy_Nature_bitwise(PyOb
- else {
- result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1);
- if (result) {
-+#if PY_VERSION_HEX >= 0x030c0000 /* Python 3.12 and newer */
-+ result->i.long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE((v > 0 ? 1 : -1), 1);
-+ result->i.long_value.ob_digit[0] = v;
-+#else
- result->i.ob_digit[0] = v;
-+#endif
- }
- }
- return (PyObject *)result;
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 7e321a9ad525cd..1c0167a3cb32a2 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=4.0.2
-revision=3
+version=4.2.3
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -31,7 +31,7 @@ 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=aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3
+checksum=be009fcf5ff68d87004fb985a81d2db16ea44c88a5b89e10febb02b6802eee76
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] 5+ messages in thread
* Re: blender: update to 4.2.3
2024-11-04 1:50 [PR PATCH] blender: update to 4.2.3 zlice
2024-11-04 3:38 ` zlice
2024-11-04 16:44 ` [PR PATCH] [Updated] " zlice
@ 2024-11-04 16:49 ` zlice
2024-11-05 13:33 ` [PR PATCH] [Updated] " zlice
3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2024-11-04 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/52903#issuecomment-2455212570
Comment:
not really sure of the musl patches
not sure if this should be a enum 'class' or something? (like `+enum class VolumeGridType : int8_t {`) musl complains that `:` should be `::` then doesn't know what `VolumeGridType` is. worst case is wasting space?
```diff
--- 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,
```
sched.h doesn't work on it's own unless i did something wrong 10 times over. compiles. typedef is what's in musl's sched.h
```diff
--- 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)
```
pulled from gzdoom(?) which did the same thing for lzma. compiler complains about pointers and types but i have to assume it works as i don't use musl
```diff
--- a/extern/lzma/Threads.c
+++ b/extern/lzma/Threads.c.new
@@ -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
}
```
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] blender: update to 4.2.3
2024-11-04 1:50 [PR PATCH] blender: update to 4.2.3 zlice
` (2 preceding siblings ...)
2024-11-04 16:49 ` zlice
@ 2024-11-05 13:33 ` zlice
3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2024-11-05 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender423
https://github.com/void-linux/void-packages/pull/52903
blender: update to 4.2.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
updates:
- openimageio
- openimagedenoise
- OpenSubdiv
- blender
opencolorio has an update but requires `minizip-ng`. `minizip` is used by qt and a handful of other packages so i didn't want to touch it, but it should probably be updated. looks like most distros use ng
A patch file from https://github.com/void-linux/void-packages/pull/52903.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender423-52903.patch --]
[-- Type: text/x-diff, Size: 20849 bytes --]
From 4c770a93ab9d2d677914f9a3a5e40e7ef94cb7f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:46:50 -0500
Subject: [PATCH 1/4] openimageio: update to 2.5.17
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e4f09f58695930..c5bc5ec64890ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2325,8 +2325,8 @@ libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF6ThreadWeaver.so.6 kf6-threadweaver-6.0.0_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1
-libOpenImageIO.so.2.4 openimageio-2.4.9.0_1
+libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1
+libOpenImageIO.so.2.5 openimageio-2.5.17.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.2_1
libpystring.so.1 pystring-1.1.3_1
libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 27a3ecd3aa92de..d0409296f1c7f1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.4.9.0
-revision=9
+version=2.5.17.0
+revision=1
build_style=cmake
build_helper=qemu
configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
-checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
+checksum=9cf1b98762ce5aa5f3f7cd34672549034f5716da1eba26eb5173c18aa21e6583
# Runs checks even for features we disabled.
make_check=no
From 6fbc3737c60386a93259e79ed36af64222e00745 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:11 -0500
Subject: [PATCH 2/4] OpenSubdiv: update to 2.3.0
---
common/shlibs | 4 ++--
srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 -----------------------
srcpkgs/OpenSubdiv/template | 7 +++---
3 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch
diff --git a/common/shlibs b/common/shlibs
index c5bc5ec64890ff..e93220c363fc5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,8 +3977,8 @@ librdkafka.so.1 librdkafka-1.4.4_3
librdkafka++.so.1 librdkafka-1.4.4_3
libraft.so.0 raft-0.18.2_1
libmdnsd.so.1 libmdnsd-0.9_1
-libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
-libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
+libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
+libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
deleted file mode 100644
index 5a812c84b21102..00000000000000
--- a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
-index c98db9f..8dec0e1 100644
---- a/opensubdiv/osd/tbbEvaluator.cpp
-+++ b/opensubdiv/osd/tbbEvaluator.cpp
-@@ -25,7 +25,7 @@
- #include "../osd/tbbEvaluator.h"
- #include "../osd/tbbKernel.h"
-
--#include <tbb/task_scheduler_init.h>
-+#include <tbb/global_control.h>
-
- namespace OpenSubdiv {
- namespace OPENSUBDIV_VERSION {
-@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
- /* static */
- void
- TbbEvaluator::SetNumThreads(int numThreads) {
-- if (numThreads == -1) {
-- tbb::task_scheduler_init init;
-- } else {
-- tbb::task_scheduler_init init(numThreads);
-+ if (numThreads != -1) {
-+ tbb::global_control tbb_global_control(
-+ tbb::global_control::max_allowed_parallelism,
-+ numThreads
-+ );
- }
- }
-
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 76d950301cd01d..7cef3290b24a7a 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,8 @@
# Template file for 'OpenSubdiv'
pkgname=OpenSubdiv
-version=3.4.3
-revision=4
+version=3.6.0
+revision=1
+archs="x86_64*"
build_style=cmake
# TODO: CUDA/OpenCL support
# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
@@ -13,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0"
homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html"
distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz"
-checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745
+checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" OpenSubdiv"
From fac486259c29d99fe59de3b965b1014f4aa3639b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:32 -0500
Subject: [PATCH 3/4] openimagedenoise: update to 2.3.0
---
common/shlibs | 2 +-
srcpkgs/openimagedenoise/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e93220c363fc5a..6d5ff842195c50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,7 +3983,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.11 libcbor-0.11.0_1
libfido2.so.1 libfido2-1.6.0_2
-libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
+libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 109deb171c3f75..812355b21e4caf 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
# Template file for 'openimagedenoise'
pkgname=openimagedenoise
-version=1.4.3
-revision=2
+version=2.3.0
+revision=1
archs="x86_64*"
build_style=cmake
hostmakedepends="ispc python3"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://openimagedenoise.github.io"
changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
+checksum=cce3010962ec84e0ba1acd8c9055a3d8de402fedb1b463517cfeb920a276e427
do_check() {
build/oidnTest
From a35d0e339ee5941c37e537df777a20dcc4065e18 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:51 -0500
Subject: [PATCH 4/4] blender: update to 4.2.3
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 58 +++++++-
srcpkgs/blender/patches/altivec-all.patch | 32 -----
.../blender/patches/python-3.12-regex.patch | 36 -----
.../patches/python3.12-pylongobject.patch | 134 ------------------
srcpkgs/blender/template | 6 +-
5 files changed, 59 insertions(+), 207 deletions(-)
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
delete mode 100644 srcpkgs/blender/patches/python-3.12-regex.patch
delete mode 100644 srcpkgs/blender/patches/python3.12-pylongobject.patch
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index a32821172cba34..4e0af6c4619da2 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -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
+ }
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd033d..00000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/python-3.12-regex.patch b/srcpkgs/blender/patches/python-3.12-regex.patch
deleted file mode 100644
index daba4a859fd157..00000000000000
--- a/srcpkgs/blender/patches/python-3.12-regex.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-+++ b/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
-@@ -852,7 +852,7 @@ class MText(DXFEntity):
- self.set_default_extrusion()
-
- def lines(self):
-- return self.raw_text.split('\P')
-+ return self.raw_text.split(r'\P')
-
- def plain_text(self, split=False):
- chars = []
---- a/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-+++ b/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
-@@ -22,9 +22,9 @@ class ImageData:
- return hash(self._data)
-
- def adjusted_name(self):
-- regex_dot = re.compile("\.")
-+ regex_dot = re.compile(r"\.")
- adjusted_name = re.sub(regex_dot, "_", self.name)
-- new_name = "".join([char for char in adjusted_name if char not in "!#$&'()*+,/:;<>?@[\]^`{|}~"])
-+ new_name = "".join([char for char in adjusted_name if char not in r"!#$&'()*+,/:;<>?@[\]^`{|}~"])
- return new_name
-
- @property
---- a/scripts/modules/bl_i18n_utils/settings.py
-+++ b/scripts/modules/bl_i18n_utils/settings.py
-@@ -302,7 +302,7 @@ PYGETTEXT_KEYWORDS = (() +
- # becomes extremely slow to process some (unrelated) source files.
- ((r"\{(?:(?:\s*\"[^\",]+\"\s*,)|(?:\s*\"\\\"\",)|(?:\s*nullptr\s*,)){4}\s*" +
- _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*nullptr\s*,))(?:[^,]+,){2}"
-- + "(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-+ + r"(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
-
- tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
- r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
diff --git a/srcpkgs/blender/patches/python3.12-pylongobject.patch b/srcpkgs/blender/patches/python3.12-pylongobject.patch
deleted file mode 100644
index 80b326809cc95f..00000000000000
--- a/srcpkgs/blender/patches/python3.12-pylongobject.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://src.fedoraproject.org/rpms/blender/raw/7045717eb5477c40905f6d29dfd3dbf5ed674e4d/f/blender-3.6.1-py312-pylongobject.patch
-
---- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
-@@ -188,6 +188,7 @@ PyTypeObject IntegrationType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _IntegrationType_MEAN = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MEAN}};
- static PyLongObject _IntegrationType_MIN = {PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MIN}};
-@@ -196,6 +197,26 @@ static PyLongObject _IntegrationType_FIR
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){FIRST}};
- static PyLongObject _IntegrationType_LAST = {
- PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){LAST}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_IntegrationTypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&IntegrationType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _IntegrationType_MEAN = _Py_IntegrationTypeType_DIGIT_INIT(MEAN);
-+static PyLongObject _IntegrationType_MIN = _Py_IntegrationTypeType_DIGIT_INIT(MIN);
-+static PyLongObject _IntegrationType_MAX = _Py_IntegrationTypeType_DIGIT_INIT(MAX);
-+static PyLongObject _IntegrationType_FIRST = _Py_IntegrationTypeType_DIGIT_INIT(FIRST);
-+static PyLongObject _IntegrationType_LAST = _Py_IntegrationTypeType_DIGIT_INIT(LAST);
-+#endif
-
- #define BPy_IntegrationType_MEAN ((PyObject *)&_IntegrationType_MEAN)
- #define BPy_IntegrationType_MIN ((PyObject *)&_IntegrationType_MIN)
---- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
-@@ -73,6 +73,7 @@ PyTypeObject MediumType_Type = {
-
- /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- PyLongObject _BPy_MediumType_DRY_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::DRY_MEDIUM},
- };
-@@ -82,6 +83,24 @@ PyLongObject _BPy_MediumType_HUMID_MEDIU
- PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
- PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::OPAQUE_MEDIUM},
- };
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_MediumType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&MediumType_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+PyLongObject _BPy_MediumType_DRY_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::DRY_MEDIUM);
-+PyLongObject _BPy_MediumType_HUMID_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::HUMID_MEDIUM);
-+PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::OPAQUE_MEDIUM);
-+#endif
-
- //-------------------MODULE INITIALIZATION--------------------------------
-
---- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
-+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
-@@ -137,6 +137,7 @@ PyTypeObject Nature_Type = {
-
- /*-----------------------BPy_Nature instance definitions ----------------------------------*/
-
-+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
- static PyLongObject _Nature_POINT = {PyVarObject_HEAD_INIT(&Nature_Type, 0){Nature::POINT}};
- static PyLongObject _Nature_S_VERTEX = {PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::S_VERTEX}};
- static PyLongObject _Nature_VIEW_VERTEX = {
-@@ -159,6 +160,36 @@ static PyLongObject _Nature_MATERIAL_BOU
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::MATERIAL_BOUNDARY}};
- static PyLongObject _Nature_EDGE_MARK = {
- PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::EDGE_MARK}};
-+#else
-+#define NON_SIZE_BITS 3
-+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
-+#define _Py_Nature_TypeType_DIGIT_INIT(val) \
-+ { \
-+ .ob_base = PyObject_HEAD_INIT(&Nature_Type) \
-+ .long_value = { \
-+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
-+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
-+ (val) == 0 ? 0 : 1), \
-+ { ((val) >= 0 ? (val) : -(val)) }, \
-+ } \
-+ }
-+
-+static PyLongObject _Nature_POINT = _Py_Nature_TypeType_DIGIT_INIT(Nature::POINT);
-+static PyLongObject _Nature_S_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::S_VERTEX);
-+static PyLongObject _Nature_VIEW_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::VIEW_VERTEX);
-+static PyLongObject _Nature_NON_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::NON_T_VERTEX);
-+static PyLongObject _Nature_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::T_VERTEX);
-+static PyLongObject _Nature_CUSP = _Py_Nature_TypeType_DIGIT_INIT(Nature::CUSP);
-+static PyLongObject _Nature_NO_FEATURE = _Py_Nature_TypeType_DIGIT_INIT(Nature::NO_FEATURE);
-+static PyLongObject _Nature_SILHOUETTE = _Py_Nature_TypeType_DIGIT_INIT(Nature::SILHOUETTE);
-+static PyLongObject _Nature_BORDER = _Py_Nature_TypeType_DIGIT_INIT(Nature::BORDER);
-+static PyLongObject _Nature_CREASE = _Py_Nature_TypeType_DIGIT_INIT(Nature::CREASE);
-+static PyLongObject _Nature_RIDGE = _Py_Nature_TypeType_DIGIT_INIT(Nature::RIDGE);
-+static PyLongObject _Nature_VALLEY = _Py_Nature_TypeType_DIGIT_INIT(Nature::VALLEY);
-+static PyLongObject _Nature_SUGGESTIVE_CONTOUR = _Py_Nature_TypeType_DIGIT_INIT(Nature::SUGGESTIVE_CONTOUR);
-+static PyLongObject _Nature_MATERIAL_BOUNDARY = _Py_Nature_TypeType_DIGIT_INIT(Nature::MATERIAL_BOUNDARY);
-+static PyLongObject _Nature_EDGE_MARK = _Py_Nature_TypeType_DIGIT_INIT(Nature::EDGE_MARK);
-+#endif
-
- #define BPy_Nature_POINT ((PyObject *)&_Nature_POINT)
- #define BPy_Nature_S_VERTEX ((PyObject *)&_Nature_S_VERTEX)
-@@ -249,7 +280,12 @@ static PyObject *BPy_Nature_bitwise(PyOb
- else {
- result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1);
- if (result) {
-+#if PY_VERSION_HEX >= 0x030c0000 /* Python 3.12 and newer */
-+ result->i.long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE((v > 0 ? 1 : -1), 1);
-+ result->i.long_value.ob_digit[0] = v;
-+#else
- result->i.ob_digit[0] = v;
-+#endif
- }
- }
- return (PyObject *)result;
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 7e321a9ad525cd..1c0167a3cb32a2 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=4.0.2
-revision=3
+version=4.2.3
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -31,7 +31,7 @@ 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=aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3
+checksum=be009fcf5ff68d87004fb985a81d2db16ea44c88a5b89e10febb02b6802eee76
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] 5+ messages in thread
end of thread, other threads:[~2024-11-05 13:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-04 1:50 [PR PATCH] blender: update to 4.2.3 zlice
2024-11-04 3:38 ` zlice
2024-11-04 16:44 ` [PR PATCH] [Updated] " zlice
2024-11-04 16:49 ` zlice
2024-11-05 13:33 ` [PR PATCH] [Updated] " zlice
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).