From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01C85158089 for ; Tue, 3 Oct 2023 16:23:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 404AC2BC024; Tue, 3 Oct 2023 16:23:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 297332BC024 for ; Tue, 3 Oct 2023 16:23:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55525335CB4 for ; Tue, 3 Oct 2023 16:23:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92B1C926 for ; Tue, 3 Oct 2023 16:23:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1696350140.580ee060c186678d960994df4f6d21133ac4b393.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-3.3.6-r1.ebuild media-gfx/blender/blender-3.3.8.ebuild media-gfx/blender/blender-3.4.1-r3.ebuild media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch X-VCS-Directories: media-gfx/blender/ media-gfx/blender/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 580ee060c186678d960994df4f6d21133ac4b393 X-VCS-Branch: master Date: Tue, 3 Oct 2023 16:23:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09f5f76d-b75c-4d33-a560-e575d82e8390 X-Archives-Hash: ede46d668db3eb12666003ac9d1e64c3 commit: 580ee060c186678d960994df4f6d21133ac4b393 Author: Sam James gentoo org> AuthorDate: Tue Oct 3 16:22:20 2023 +0000 Commit: Sam James gentoo 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 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 ++ + CCL_NAMESPACE_BEGIN + + thread::thread(function run_cb) : run_cb_(run_cb), joined_(false)