From 4b1be5ef874aaeb61a2116048e0c2312e53f8c69 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Feb 2025 19:27:52 +0000 Subject: gentoo auto-resync : 28:02:2025 - 19:27:52 --- dev-util/glslang/Manifest | 7 +--- .../glslang/files/glslang-1.3.283.0-gcc15.patch | 24 ------------ dev-util/glslang/glslang-1.3.290.0.ebuild | 45 ---------------------- dev-util/glslang/glslang-1.3.296.0-r1.ebuild | 41 -------------------- dev-util/glslang/glslang-1.4.304.0.ebuild | 2 +- 5 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch delete mode 100644 dev-util/glslang/glslang-1.3.290.0.ebuild delete mode 100644 dev-util/glslang/glslang-1.3.296.0-r1.ebuild (limited to 'dev-util/glslang') diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index 12a74566de0d..68081c6443da 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,9 +1,4 @@ -AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71fde277d832ccc6bce1d233348b8124ec69a1a58420a36e74979b1daa4dcf1376883ea98335f59bfd4d55c66b23749fb SHA512 ca2cb4c6579e79a0eb8847da49984d9f0cda0777d6baacbeb51977a864f285bfd8577fcf754de39f11e8ad101c76171c58b08a2359bd7624cb5ae9633137b5fe -DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e -DIST glslang-1.3.296.0.tar.gz 3868046 BLAKE2B c68b5e59e5490d2102d084a7d852a818c05eb0d496866796567a7606cb4685b378a4a15a0d2bc196c6ca035cd6f023ffdcf9a6e5cf0b450e340b5f4e97052793 SHA512 5c6ad0fc14c3a1d3282d692da77f2e155e7a9e5e84c89a3dbb3d64f9a0e5803c9db49085e05c6e2581f3448567ff35b85eff363047b67620bf153b7c02598af4 DIST glslang-1.4.304.0.tar.gz 3917406 BLAKE2B 6d5beec94c5daafe905dabd6a4031e1c010cc9b395c5d8a8b4fdafd265a076251519056236b8f98fff613f21a0af6d4a2562c4c3c8255731642a6b887f3c4d24 SHA512 dae98afbea27b518e6230ebae5207c67b4f1a695b8f65033159bcf0064ec6546c8db4f2d52bd028353c15e4d7d9409c1f7dffc589639bfd8ee07d98ea7c73b12 -EBUILD glslang-1.3.290.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c -EBUILD glslang-1.3.296.0-r1.ebuild 1059 BLAKE2B 9bec6c5e3e4e876872e8dbefdad5110f0dd0c472dd41303c276c371a651c8d5024b7a1e4df59fa9b7db70d2d622cadb58ff1a10f107864e31aa7cd983d8d6b37 SHA512 8430083bb552bdf840cf60af26986c1eb144964610f345a061565e49f40de1dd72e1f5f5b51c0fc6406978d3be77de49d74270b156dc2483b87289fc13839f5e -EBUILD glslang-1.4.304.0.ebuild 1062 BLAKE2B 4351aefa73fa25e756832929cf03df472a9a7abb18b54307f58aebc79b993b543a9770613bdbf388f8e9689e962b54331d1602e534c86580e2d2c429e7db5974 SHA512 fa198ac25486a8c31cf431cda6b7aa9a1d03a7cd3d2c62c97e7ead3e47f39fb8ba1b96df8a6b65068c0acedd96a2af311eda8817d70a66d52822ce0748cf37a6 +EBUILD glslang-1.4.304.0.ebuild 1061 BLAKE2B cfdc5e14251179a886a5703058ec53e6067c21191800873f0c3ace7e50f121cc961a298f96c3339331ada0d292df535472a4d93cfac6c95c85fe622472c83cd6 SHA512 1b3cc5a12113a658223baaa3145d66b80da24830d2448b0c296b67aaf1a7b8f82f88779fb3cc46c702120ce2bec20955c177899faebb6f8116b6da344b4332ce EBUILD glslang-9999.ebuild 1067 BLAKE2B 2c246eb17b47e9d5509cc52a75c65b7d3f7bb28ffcf94edba182f28521621478982d89a9497d60e21c3863e775516647de6c33cdb4dc1df99b069c89e25f7b61 SHA512 10ce391d7da11c314c8db7b7857d4405edbfc4265a614f7a79d92c6d99d9228aa87a235d72fb27b98a1e64388ed987d3d8fb431e54c7a7ea3a6c06163e46f835 MISC metadata.xml 334 BLAKE2B ae09d8fe730e84cb5958c711c272ec0508a1be199fedeba1b82ae43552cdf4557e387b8405312bfe1cc4bdc43a1bd68507056ed182691d20e7759fb7fa8b396e SHA512 7abee6c6391f6c42a546a3f98791e3623152e1c6d0900afeb321ebad1a864ab71c2a282be2f651273b667986d9902bed7e9b5315fb5c569bab4f34c7812ed8bb 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 deleted file mode 100644 index aea224c37b69..000000000000 --- a/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.290.0.ebuild b/dev-util/glslang/glslang-1.3.290.0.ebuild deleted file mode 100644 index 3097d8e30d64..000000000000 --- a/dev-util/glslang/glslang-1.3.290.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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 -} diff --git a/dev-util/glslang/glslang-1.3.296.0-r1.ebuild b/dev-util/glslang/glslang-1.3.296.0-r1.ebuild deleted file mode 100644 index 7730251cb6f3..000000000000 --- a/dev-util/glslang/glslang-1.3.296.0-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2025 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/15" - -# Bug 698850 -RESTRICT="test" - -BDEPEND="${PYTHON_DEPS} - ~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}] -" - -DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_PCH=OFF - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON - ) - cmake_src_configure -} diff --git a/dev-util/glslang/glslang-1.4.304.0.ebuild b/dev-util/glslang/glslang-1.4.304.0.ebuild index ceeb4b06f19b..b7b0c06f7fd4 100644 --- a/dev-util/glslang/glslang-1.4.304.0.ebuild +++ b/dev-util/glslang/glslang-1.4.304.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${GIT_COMMIT}" fi -- cgit v1.2.3