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 9D031159C9B for ; Sat, 3 Aug 2024 02:58:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E098FE29F4; Sat, 3 Aug 2024 02:58:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C54E1E29F4 for ; Sat, 3 Aug 2024 02:58:26 +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 8E1F9340CC9 for ; Sat, 3 Aug 2024 02:58:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB4C01DCC for ; Sat, 3 Aug 2024 02:58:23 +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: <1722653329.f17a695c19ac2e1c176f6f2a4af91305bc640787.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch dev-util/glslang/glslang-1.3.283.0.ebuild X-VCS-Directories: dev-util/glslang/ dev-util/glslang/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f17a695c19ac2e1c176f6f2a4af91305bc640787 X-VCS-Branch: master Date: Sat, 3 Aug 2024 02:58:23 +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: 2a6bd029-fd33-4056-be5a-8c9e662a309f X-Archives-Hash: 2b7a13e0a987e573e4a07e9c3d6c0517 commit: f17a695c19ac2e1c176f6f2a4af91305bc640787 Author: Sam James gentoo org> AuthorDate: Sat Aug 3 02:48:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 3 02:48:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17a695c dev-util/glslang: fix build w/ gcc-15 Signed-off-by: Sam James gentoo.org> .../glslang/files/glslang-1.3.283.0-gcc15.patch | 24 ++++++++++++++++++++++ dev-util/glslang/glslang-1.3.283.0.ebuild | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch new file mode 100644 index 000000000000..aea224c37b69 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch @@ -0,0 +1,24 @@ +https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd + +From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:44:21 +0100 +Subject: [PATCH] SPIRV/SpvBuilder.h: add missing include + +Without the change `glslang` build fails on upcoming `gcc-15` as: + + In file included from /build/source/SPIRV/GlslangToSpv.cpp:45: + SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared + 248 | Id makeDebugLexicalBlock(uint32_t line); + | ^~~~~~~~ +--- a/SPIRV/SpvBuilder.h ++++ b/SPIRV/SpvBuilder.h +@@ -56,6 +56,7 @@ namespace spv { + } + + #include ++#include + #include + #include + #include + diff --git a/dev-util/glslang/glslang-1.3.283.0.ebuild b/dev-util/glslang/glslang-1.3.283.0.ebuild index 0f9664315560..3097d8e30d64 100644 --- a/dev-util/glslang/glslang-1.3.283.0.ebuild +++ b/dev-util/glslang/glslang-1.3.283.0.ebuild @@ -32,6 +32,10 @@ BDEPEND="${PYTHON_DEPS} DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.3.283.0-gcc15.patch +) + multilib_src_configure() { local mycmakeargs=( -DENABLE_PCH=OFF