community/blender: upgrade to 4.0.1

This commit is contained in:
Leon Marz 2023-11-14 17:35:54 +01:00 committed by omni
parent 9139c9ea23
commit 06b9d63d05
4 changed files with 44 additions and 15 deletions

View File

@ -1,7 +1,7 @@
From c719ecfbeb7cdbd919cde431c330676f837dfe49 Mon Sep 17 00:00:00 2001
From 08b40b42eaf86973ff1af0c340f867ed20b843eb 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
Subject: [PATCH 1/3] musl fixes
---
extern/glog/src/config_linux.h | 1 -
@ -20,5 +20,5 @@ index b3a3325..946095a 100644
/* Define if you have the `fcntl' function */
#define HAVE_FCNTL
--
2.40.0
2.42.1

View File

@ -1,7 +1,7 @@
From c374dc84f22bbc2a092d2e0c804f8a207a2ff195 Mon Sep 17 00:00:00 2001
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/2] increase thread stack size for musl
Subject: [PATCH 2/3] increase thread stack size for musl
take the apple route to set stack size to 2mb.
---
@ -10,10 +10,10 @@ take the apple route to set stack size to 2mb.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp
index 7f1e8eb..0b44a11 100644
index c361bee..ce761b9 100644
--- a/intern/cycles/util/thread.cpp
+++ b/intern/cycles/util/thread.cpp
@@ -12,7 +12,7 @@ CCL_NAMESPACE_BEGIN
@@ -13,7 +13,7 @@ CCL_NAMESPACE_BEGIN
thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)
{
@ -22,7 +22,7 @@ index 7f1e8eb..0b44a11 100644
/* 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. */
@@ -42,7 +42,7 @@ void *thread::run(void *arg)
@@ -43,7 +43,7 @@ void *thread::run(void *arg)
bool thread::join()
{
joined_ = true;
@ -32,10 +32,10 @@ index 7f1e8eb..0b44a11 100644
#else
try {
diff --git a/intern/cycles/util/thread.h b/intern/cycles/util/thread.h
index 8d7dc45..fa1d442 100644
index 35ee013..21a6732 100644
--- a/intern/cycles/util/thread.h
+++ b/intern/cycles/util/thread.h
@@ -41,7 +41,7 @@ class thread {
@@ -43,7 +43,7 @@ class thread {
protected:
function<void()> run_cb_;
@ -45,5 +45,5 @@ index 8d7dc45..fa1d442 100644
#else
std::thread std_thread;
--
2.40.0
2.42.1

View File

@ -0,0 +1,25 @@
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

View File

@ -2,7 +2,7 @@
# Contributor: Leon Marz <main@lmarz.org>
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=blender
pkgver=3.6.5
pkgver=4.0.1
_pkgver=${pkgver%.[0-9]}
pkgrel=0
_llvmver=15
@ -15,6 +15,7 @@ makedepends="
alembic-dev
blosc-dev
boost-dev
clang-dev
cmake
eigen-dev
embree-dev
@ -72,6 +73,7 @@ subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname
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:
@ -103,6 +105,7 @@ _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 \
@ -153,7 +156,8 @@ python() {
}
sha512sums="
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae blender-3.6.5.tar.xz
2783a6fa7a2864f808d90c4bf39302000de086e27d2ae5c14697414df6dac35bfd25276aba0744a326a1617a319cba0bc0bfceb8f0b28a166baa44b8d08df90d 0001-musl-fixes.patch
3f831f945579b9e91a52436772f267e67a58070ccaf06f780c150719638ac4c5ce98d0889e13b803a859a62a36981a2e1cf8a47d4c25ed37d17e611a650ce5c5 0002-increase-thread-stack-size-for-musl.patch
288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae blender-4.0.1.tar.xz
0d77a835e123b6e96119b2de5f3abf2471412efccc79773fc35cc3c9fa21ea8a0241eb9f3107b50591c599f1e8dbd9d6ff81714d35781e4979c81870b4679400 0001-musl-fixes.patch
bc25e7c673b95dd1419e4f69e014bd056846bcad0c18264dc9f6b3070dabf94f6619fe120fa059d3774df0431dd510df16620e15b083dffc89a3e9a945440787 0002-increase-thread-stack-size-for-musl.patch
2d228e9bd3f2b70b9d75661dbb70a143f99832001a9447dc493f117a10f86a187c25586915ffc7d2851eeb0bdf5d77479a3f0b9a9fc303759ab634f28d0cd1bf 0003-fix-arm64.patch
"