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 B66BB158041 for ; Sun, 3 Mar 2024 17:08:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEB1CE2A9A; Sun, 3 Mar 2024 17:08:20 +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 pigeon.gentoo.org (Postfix) with ESMTPS id C785BE2A9A for ; Sun, 3 Mar 2024 17:08:20 +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 CDF2A335C34 for ; Sun, 3 Mar 2024 17:08:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B10AB2F for ; Sun, 3 Mar 2024 17:08:18 +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: <1709485676.aaeb7d0e77864ff685977982dc56f2b0e3773531.mattst88@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/Manifest dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch dev-util/glslang/glslang-1.3.250.ebuild dev-util/glslang/glslang-1.3.261.ebuild dev-util/glslang/glslang-1.3.268-r2.ebuild X-VCS-Directories: dev-util/glslang/files/ dev-util/glslang/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: aaeb7d0e77864ff685977982dc56f2b0e3773531 X-VCS-Branch: master Date: Sun, 3 Mar 2024 17:08:18 +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: 721c4ac6-a195-423d-9d1e-61c25ef9020f X-Archives-Hash: 36eb0cd00e9ad59cae55b2d0319d589b commit: aaeb7d0e77864ff685977982dc56f2b0e3773531 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 3 17:06:57 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 3 17:07:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaeb7d0e dev-util/glslang: Drop old versions Signed-off-by: Matt Turner gentoo.org> dev-util/glslang/Manifest | 3 -- .../glslang-1.3.236-Install-static-libs.patch | 39 ------------------- .../files/glslang-1.3.238-Fix-cmake-targets.patch | 26 ------------- dev-util/glslang/glslang-1.3.250.ebuild | 37 ------------------ dev-util/glslang/glslang-1.3.261.ebuild | 37 ------------------ dev-util/glslang/glslang-1.3.268-r2.ebuild | 44 ---------------------- 6 files changed, 186 deletions(-) diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index 56ac5caaed4e..017e4df7b206 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,4 +1 @@ -DIST glslang-1.3.250.tar.gz 3707963 BLAKE2B 24096c88307dfca765bb5fdbcebe1ec8f658ee640408f89cf2e17b3dd35c4870fa2de07403fe754991d953a4b171a75f499638c599c3045e2560fae0c871dabe SHA512 deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c -DIST glslang-1.3.261.tar.gz 3705459 BLAKE2B 0576d87d6172910ec8853c44920614745be7c244bd70e1f424f07de3befabf93745142ddbc242cedde7ca3c646017104bd6dec2bc6a4c1ff29ac3b4041d68a7a SHA512 dc26a6b4311319e2897141bbb424eac6fc7deec99b90ac87c1f734701a8d52d55e5a6884183583f526580fe173ace01f5a5bc666658e1699a57d2e522f0edc84 -DIST glslang-1.3.268.tar.gz 3765735 BLAKE2B 20e4063c080da6fa7427d8b9af9af27a6e5e8895e870620e4b5e14e4d5548020de38b932b24df5596df0452ab2511497605343f9ff4511fad325aa696ab565cd SHA512 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f DIST glslang-1.3.275.tar.gz 3773036 BLAKE2B 6bb30d6972fd64a9acde4b4c22e3db48d77c49a885efc47208c1c5a641d1e01d687b016ada94c89da6c48c735394023bd3efea5d77108d0fed9ab0b4fa92adfe SHA512 0c06b07e2424a24dc6b87eb1e76d866bb8d72d632e874e6f100140e24f3a5f562e66b275673677165ee8c7f7c619d09cb272bcd528be6801c7c1702a100b0f4a diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch deleted file mode 100644 index 826e0f6cd856..000000000000 --- a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index b44cbc73..41f6de93 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -41,7 +41,7 @@ if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT glslang-targets) - - # Backward compatibility -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index a8b14911..57ec1efd 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -203,7 +203,7 @@ endif() - ################################################################################ - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslang-targets) -- if(NOT BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) - -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 16eb939b..959788dc 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -52,7 +52,7 @@ else() - target_link_libraries(OSDependent Threads::Threads) - endif() - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT glslang-targets) - - # Backward compatibility diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch deleted file mode 100644 index 3afcec329f07..000000000000 --- a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index a80e74ed..8a15f00d 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -106,7 +106,7 @@ if(ENABLE_OPT) - target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC - $ -- $) -+ $) - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif() -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index ad88442c..db2ca5ff 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -69,7 +69,7 @@ endif() - target_link_libraries(glslang-standalone ${LIBRARIES}) - target_include_directories(glslang-standalone PUBLIC - $ -- $) -+ $) - - if(ENABLE_OPT) - target_include_directories(glslang-standalone diff --git a/dev-util/glslang/glslang-1.3.250.ebuild b/dev-util/glslang/glslang-1.3.250.ebuild deleted file mode 100644 index d720251291ea..000000000000 --- a/dev-util/glslang/glslang-1.3.250.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" - inherit git-r3 -else - SNAPSHOT_COMMIT="sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}/${PN}-${SNAPSHOT_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/12" - -# Bug 698850 -RESTRICT="test" - -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" ) - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_PCH=OFF - ) - cmake_src_configure -} diff --git a/dev-util/glslang/glslang-1.3.261.ebuild b/dev-util/glslang/glslang-1.3.261.ebuild deleted file mode 100644 index d720251291ea..000000000000 --- a/dev-util/glslang/glslang-1.3.261.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" - inherit git-r3 -else - SNAPSHOT_COMMIT="sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}/${PN}-${SNAPSHOT_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/12" - -# Bug 698850 -RESTRICT="test" - -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" ) - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_PCH=OFF - ) - cmake_src_configure -} diff --git a/dev-util/glslang/glslang-1.3.268-r2.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild deleted file mode 100644 index af9b2a33b3dd..000000000000 --- a/dev-util/glslang/glslang-1.3.268-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" - inherit git-r3 -else - SNAPSHOT_COMMIT="vulkan-sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}/${PN}-${SNAPSHOT_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/13" - -# Bug 698850 -RESTRICT="test" - -BDEPEND="${PYTHON_DEPS} - ~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}] -" - -DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" - -PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch - "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_PCH=OFF - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON - ) - cmake_src_configure -}