[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

["Sam James" <sam@gentoo.org>]

commit:     580ee060c186678d960994df4f6d21133ac4b393
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 16:22:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 16:22:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580ee060

media-gfx/blender: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/914740
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/blender-3.3.6-r1.ebuild                |  1 +
 media-gfx/blender/blender-3.3.8.ebuild                   |  1 +
 media-gfx/blender/blender-3.4.1-r3.ebuild                |  1 +
 media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch | 12 ++++++++++++
 4 files changed, 15 insertions(+)

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)