aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Marz <main@lmarz.org>2023-12-07 16:32:13 +0100
committeromni <omni+alpine@hack.org>2023-12-07 22:21:21 +0000
commitc60a33dcb103c7479c2238e8585f68302f8d347c (patch)
tree43b8f7cd61ed8cb1d96b35264df5b415f125e5e3
parent1e98a21e1a10879c3875831ad497a41c8e0e30b7 (diff)
community/blender: upgrade to 4.0.2
-rw-r--r--community/blender/0002-increase-thread-stack-size-for-musl.patch49
-rw-r--r--community/blender/0003-fix-arm64.patch25
-rw-r--r--community/blender/APKBUILD11
3 files changed, 3 insertions, 82 deletions
diff --git a/community/blender/0002-increase-thread-stack-size-for-musl.patch b/community/blender/0002-increase-thread-stack-size-for-musl.patch
deleted file mode 100644
index ac75311eab4..00000000000
--- a/community/blender/0002-increase-thread-stack-size-for-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 67ce33c933f6b7d0c812804c27313f7f8aec57b5 Mon Sep 17 00:00:00 2001
-From: Damian Kurek <starfire24680@gmail.com>
-Date: Wed, 29 Mar 2023 17:24:22 +0200
-Subject: [PATCH 2/3] increase thread stack size for musl
-
-take the apple route to set stack size to 2mb.
----
- intern/cycles/util/thread.cpp | 4 ++--
- intern/cycles/util/thread.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp
-index c361bee..ce761b9 100644
---- a/intern/cycles/util/thread.cpp
-+++ b/intern/cycles/util/thread.cpp
-@@ -13,7 +13,7 @@ CCL_NAMESPACE_BEGIN
-
- thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)
- {
--#ifdef __APPLE__
-+#if 1
- /* Set the stack size to 2MB to match Linux. The default 512KB on macOS is
- * too small for Embree, and consistent stack size also makes things more
- * predictable in general. */
-@@ -43,7 +43,7 @@ void *thread::run(void *arg)
- bool thread::join()
- {
- joined_ = true;
--#ifdef __APPLE__
-+#if 1
- return pthread_join(pthread_id, NULL) == 0;
- #else
- try {
-diff --git a/intern/cycles/util/thread.h b/intern/cycles/util/thread.h
-index 35ee013..21a6732 100644
---- a/intern/cycles/util/thread.h
-+++ b/intern/cycles/util/thread.h
-@@ -43,7 +43,7 @@ class thread {
-
- protected:
- function<void()> run_cb_;
--#ifdef __APPLE__
-+#if 1
- pthread_t pthread_id;
- #else
- std::thread std_thread;
---
-2.42.1
-
diff --git a/community/blender/0003-fix-arm64.patch b/community/blender/0003-fix-arm64.patch
deleted file mode 100644
index f15db6c5494..00000000000
--- a/community/blender/0003-fix-arm64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8431cc4a1555cc60e4cb7fed15a1efec33b2c404 Mon Sep 17 00:00:00 2001
-From: Leon Marz <main@lmarz.org>
-Date: Fri, 17 Nov 2023 17:53:40 +0100
-Subject: [PATCH 3/3] fix arm64
-
----
- intern/cycles/blender/attribute_convert.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intern/cycles/blender/attribute_convert.h b/intern/cycles/blender/attribute_convert.h
-index ee26e1d..ffa2021 100644
---- a/intern/cycles/blender/attribute_convert.h
-+++ b/intern/cycles/blender/attribute_convert.h
-@@ -66,7 +66,7 @@ template<> struct AttributeConverter<blender::ColorGeometry4b> {
- static constexpr auto type_desc = TypeRGBA;
- static CyclesT convert(const blender::ColorGeometry4b &value)
- {
-- return color_srgb_to_linear(make_float4(byte_to_float(value[0]),
-+ return color_srgb_to_linear_v4(make_float4(byte_to_float(value[0]),
- byte_to_float(value[1]),
- byte_to_float(value[2]),
- byte_to_float(value[3])));
---
-2.42.1
-
diff --git a/community/blender/APKBUILD b/community/blender/APKBUILD
index 96c556b9540..ed7bdef75a0 100644
--- a/community/blender/APKBUILD
+++ b/community/blender/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Leon Marz <main@lmarz.org>
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=blender
-pkgver=4.0.1
+pkgver=4.0.2
_pkgver=${pkgver%.[0-9]}
-pkgrel=1
+pkgrel=0
_llvmver=15
pkgdesc="3D Creation/Animation/Publishing System"
url="https://www.blender.org/"
@@ -72,8 +72,6 @@ esac
subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname:python"
source="https://download.blender.org/source/blender-$pkgver.tar.xz
0001-musl-fixes.patch
- 0002-increase-thread-stack-size-for-musl.patch
- 0003-fix-arm64.patch
"
# secfixes:
@@ -105,7 +103,6 @@ _build() {
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_LIBS_PRECOMPILED=OFF \
- -DWITH_DOC_MANPAGE=OFF \
-DWITH_SYSTEM_EIGEN3=ON \
-DWITH_SYSTEM_GLOG=ON \
-DWITH_SYSTEM_LZO=ON \
@@ -156,8 +153,6 @@ python() {
}
sha512sums="
-288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae blender-4.0.1.tar.xz
+c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b blender-4.0.2.tar.xz
0d77a835e123b6e96119b2de5f3abf2471412efccc79773fc35cc3c9fa21ea8a0241eb9f3107b50591c599f1e8dbd9d6ff81714d35781e4979c81870b4679400 0001-musl-fixes.patch
-bc25e7c673b95dd1419e4f69e014bd056846bcad0c18264dc9f6b3070dabf94f6619fe120fa059d3774df0431dd510df16620e15b083dffc89a3e9a945440787 0002-increase-thread-stack-size-for-musl.patch
-2d228e9bd3f2b70b9d75661dbb70a143f99832001a9447dc493f117a10f86a187c25586915ffc7d2851eeb0bdf5d77479a3f0b9a9fc303759ab634f28d0cd1bf 0003-fix-arm64.patch
"