From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6BDE1582EF for ; Fri, 28 Feb 2025 15:32:50 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D06AA343260 for ; Fri, 28 Feb 2025 15:32:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 631501102D2; Fri, 28 Feb 2025 15:32:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 58E991102D2 for ; Fri, 28 Feb 2025 15:32:45 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A2513430DE for ; Fri, 28 Feb 2025 15:32:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98587276F for ; Fri, 28 Feb 2025 15:32:43 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1740756756.7698b1138ebcb40c05e6e30b76a291aa5cf98397.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/Manifest dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch dev-util/glslang/glslang-1.3.290.0.ebuild dev-util/glslang/glslang-1.3.296.0-r1.ebuild X-VCS-Directories: dev-util/glslang/files/ dev-util/glslang/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7698b1138ebcb40c05e6e30b76a291aa5cf98397 X-VCS-Branch: master Date: Fri, 28 Feb 2025 15:32:43 +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: 454cf23f-952e-4639-bc2b-46bfe6061a76 X-Archives-Hash: 34d33d2e5cda757ac8ff567270c1f4ea commit: 7698b1138ebcb40c05e6e30b76a291aa5cf98397 Author: Matt Turner gentoo org> AuthorDate: Fri Feb 28 15:31:02 2025 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Feb 28 15:32:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7698b113 dev-util/glslang: Drop old versions Signed-off-by: Matt Turner gentoo.org> dev-util/glslang/Manifest | 2 - .../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 -------------------- 4 files changed, 112 deletions(-) diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index e664caa4dc22..69ac743241be 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,3 +1 @@ -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 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 -}