gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 77 insertions, 1 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 3b5583640140..950769757178 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,7 @@
+AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71fde277d832ccc6bce1d233348b8124ec69a1a58420a36e74979b1daa4dcf1376883ea98335f59bfd4d55c66b23749fb SHA512 ca2cb4c6579e79a0eb8847da49984d9f0cda0777d6baacbeb51977a864f285bfd8577fcf754de39f11e8ad101c76171c58b08a2359bd7624cb5ae9633137b5fe
 DIST glslang-1.3.283.0.tar.gz 3846095 BLAKE2B 9a5f7c80671ab391d72d1e924f92bfdb850611e594c170365927c4b06adc596fc788d2f365f43fa2ca5ad54dbde7206c6a137dbb4b2875afced6b0dc64331273 SHA512 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda
-EBUILD glslang-1.3.283.0.ebuild 1059 BLAKE2B 4cfae704b9481e9fdd678107e628bf1883679808c8d2c658279c6757b5e735d90e88829e2da2e3b6efb18e66765677d96e3940fae52cbcdc03a52bb871205e0f SHA512 02522568b4906ae373e7b545f81b1e0fc1b46141b7cbacdf38cf7a51654ba1b44aa03b8beb37734f802bd609f5a0f7015ae70450ae46d8a1b816f7ceb53f5094
+DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
+EBUILD glslang-1.3.283.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c
+EBUILD glslang-1.3.290.0.ebuild 1121 BLAKE2B e26fe22c6522598a5148170ab8a66737dc725efaf925e8f57eacf392c6d09c2f8235e34ff2f266f8d74a0a16bb497153e741f630f797f80ae9588349f4272994 SHA512 48d43055072f2cd53048a439322db20bdac79b1700147a8fdd48f1848a4e4355fbe40fb5b183f3c61157c800d810fa382b83ec2a344dca8833a6e351cfe9990a
 EBUILD glslang-9999.ebuild 1065 BLAKE2B e79ae4cd9f63772df7e596efad9cab3545da780a67842cc5505054543082c7c8eec3ee3375cf504adc7bff74f3883f26a61f21d935ff47a071d2a065dd93a41b SHA512 3e9aa9a790ca8f90bf3555d568c658d9071d21879fa22d0cbde28e59d9eb3aa6aacf826dab60f9cae5592c725f88d566b6464d8216ae94c8b82eea05cb305fd2
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
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
diff --git a/dev-util/glslang/glslang-1.3.290.0.ebuild b/dev-util/glslang/glslang-1.3.290.0.ebuild
new file mode 100644
index 000000000000..17c757b7934a
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.290.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	GIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0/14"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
+"
+
+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
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
+	)
+	cmake_src_configure
+}