public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
Date: Sat,  3 Aug 2024 02:58:23 +0000 (UTC)	[thread overview]
Message-ID: <1722653329.f17a695c19ac2e1c176f6f2a4af91305bc640787.sam@gentoo> (raw)

commit:     f17a695c19ac2e1c176f6f2a4af91305bc640787
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 02:48:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:44:21 +0100
+Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> 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 <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+

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


             reply	other threads:[~2024-08-03  2:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-03  2:58 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-03 17:08 [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/ Matt Turner
2023-11-10 18:24 Nick Sarnie
2022-11-08 23:57 Nick Sarnie
2022-09-11 15:50 Nick Sarnie
2019-11-22 23:29 Nick Sarnie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1722653329.f17a695c19ac2e1c176f6f2a4af91305bc640787.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox