summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-10-03 17:22:20 +0100
committerSam James <sam@gentoo.org>2023-10-03 17:22:20 +0100
commit580ee060c186678d960994df4f6d21133ac4b393 (patch)
tree6871e95e8dab9191545abe85500189d53272b04d /media-gfx
parentdev-util/meson: backport PEP632 py3.12 fixes, revert bindgen breakage (diff)
downloadgentoo-580ee060c186678d960994df4f6d21133ac4b393.tar.gz
gentoo-580ee060c186678d960994df4f6d21133ac4b393.tar.bz2
gentoo-580ee060c186678d960994df4f6d21133ac4b393.zip
media-gfx/blender: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/914740 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/blender-3.3.6-r1.ebuild1
-rw-r--r--media-gfx/blender/blender-3.3.8.ebuild1
-rw-r--r--media-gfx/blender/blender-3.4.1-r3.ebuild1
-rw-r--r--media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch12
4 files changed, 15 insertions, 0 deletions
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 5680b3b6a336..8452075832d4 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild
index fac6a83ed7f7..920d4210ff7c 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 7a0b020b28fc..801a0d0bf0db 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -140,6 +140,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
new file mode 100644
index 000000000000..955be2424e19
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/914740
+--- a/intern/cycles/util/thread.cpp
++++ b/intern/cycles/util/thread.cpp
+@@ -6,6 +6,8 @@
+ #include "util/system.h"
+ #include "util/windows.h"
+
++#include <system_error>
++
+ CCL_NAMESPACE_BEGIN
+
+ thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)