aboutsummaryrefslogtreecommitdiffstats
path: root/testing/blender/0003-increase-thread-stack-size-for-musl.patch
diff options
context:
space:
mode:
authorLeon Marz <lmarz@cs.uni-frankfurt.de>2020-11-25 12:48:15 +0100
committerAndy Postnikov <apostnikov@gmail.com>2020-11-26 01:21:14 +0000
commit2479d2a377e21e0dc95c64dc8aad6177b57e5fad (patch)
treec0c8537608a901dfe9a5c602d6763d9a596f60e5 /testing/blender/0003-increase-thread-stack-size-for-musl.patch
parent127e6d2ecb7972c461b817c7268b550f1be04bbf (diff)
downloadaports-2479d2a377e21e0dc95c64dc8aad6177b57e5fad.tar.gz
aports-2479d2a377e21e0dc95c64dc8aad6177b57e5fad.tar.bz2
aports-2479d2a377e21e0dc95c64dc8aad6177b57e5fad.tar.xz
testing/blender: upgrade to 2.91.0
fixes #12105 (credit goes to @starfire24680. See !14817)
Diffstat (limited to 'testing/blender/0003-increase-thread-stack-size-for-musl.patch')
-rw-r--r--testing/blender/0003-increase-thread-stack-size-for-musl.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/testing/blender/0003-increase-thread-stack-size-for-musl.patch b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
new file mode 100644
index 0000000000..5f3ddbf38b
--- /dev/null
+++ b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
@@ -0,0 +1,48 @@
+From aa586696787091ee851c2dc00f76d2b159683c84 Mon Sep 17 00:00:00 2001
+From: Damian Kurek <starfire24680@gmail.com>
+Date: Sun, 22 Nov 2020 02:03:11 +0100
+Subject: [PATCH 3/3] increase thread stack size for musl
+
+---
+ intern/cycles/util/util_thread.cpp | 4 ++--
+ intern/cycles/util/util_thread.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp
+index cccde5a..4bf62d5 100644
+--- a/intern/cycles/util/util_thread.cpp
++++ b/intern/cycles/util/util_thread.cpp
+@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
+
+ thread::thread(function<void()> run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ /* 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. */
+@@ -56,7 +56,7 @@ void *thread::run(void *arg)
+ bool thread::join()
+ {
+ joined_ = true;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ return pthread_join(pthread_id, NULL) == 0;
+ #else
+ try {
+diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
+index 29f9bec..58a63ce 100644
+--- a/intern/cycles/util/util_thread.h
++++ b/intern/cycles/util/util_thread.h
+@@ -56,7 +56,7 @@ class thread {
+
+ protected:
+ function<void()> run_cb_;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ pthread_t pthread_id;
+ #else
+ std::thread std_thread;
+--
+2.29.2
+