From 04b35f566703f8bb84d52e8d2ff2f0f54c21900b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 10 Nov 2023 22:34:27 +0000
Subject: gentoo auto-resync : 10:11:2023 - 22:34:26

---
 dev-util/glslang/Manifest                          |  5 ++-
 .../files/glslang-1.3.238-Fix-cmake-targets.patch  | 26 +++++++++++++
 dev-util/glslang/glslang-1.3.268-r2.ebuild         | 44 ++++++++++++++++++++++
 dev-util/glslang/glslang-1.3.268.ebuild            | 42 ---------------------
 dev-util/glslang/glslang-9999.ebuild               |  6 ++-
 5 files changed, 77 insertions(+), 46 deletions(-)
 create mode 100644 dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
 create mode 100644 dev-util/glslang/glslang-1.3.268-r2.ebuild
 delete mode 100644 dev-util/glslang/glslang-1.3.268.ebuild

(limited to 'dev-util/glslang')

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 4f1233f263fe..f1e5da49b988 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,9 +1,10 @@
 AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
+AUX glslang-1.3.238-Fix-cmake-targets.patch 1125 BLAKE2B aaf925ce96678f43a4a496278447d92b1cbbd1dbfed2e571960ec10a15439fa08beb51a335c588a72c9449cd32cdd9d05ac2d7426606129fda44f453f379c619 SHA512 fc5cffda5c236e0b819f0dff18d64c603a29a7b1d9cf12f9fed124bfa6aca0dd491f41019503acceb145bded419323cc3cc132f1a029ca7c37a37c59ad639b58
 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
 EBUILD glslang-1.3.250.ebuild 973 BLAKE2B 919386f57885af782452f75a529139be6a81c0d709a5262cb574981988067e145bd24623fc668d9e72beade43d6eba17cf808bae4e1418806ac69850f143e268 SHA512 81a8570342bdf685bea69252a6d52b7295562ec22d1f176dddc92fcf9ea648bd2fb7ce1e827f1bd3e34b87fe59d0f10bfd8ae12faf15e652b61e903493f3d3a7
 EBUILD glslang-1.3.261.ebuild 973 BLAKE2B 919386f57885af782452f75a529139be6a81c0d709a5262cb574981988067e145bd24623fc668d9e72beade43d6eba17cf808bae4e1418806ac69850f143e268 SHA512 81a8570342bdf685bea69252a6d52b7295562ec22d1f176dddc92fcf9ea648bd2fb7ce1e827f1bd3e34b87fe59d0f10bfd8ae12faf15e652b61e903493f3d3a7
-EBUILD glslang-1.3.268.ebuild 1132 BLAKE2B 1c2020d0b199f8b3a437c66f0c81cf96b3d2d432e35380d9350c9a7fdc4e8d622665b5d490cfbc8f3e7fa4179894a3d8486c1d37c99f5e6c9d32ced815611f6b SHA512 fbc910971fc745fa96aa7c3f82aa1c73846c0d06751bdcc57fd51b32eca4770d77ef4dc19395c4b57546f9bf5083ea21de6f22f1bfdc84d38552ee955023f378
-EBUILD glslang-9999.ebuild 1138 BLAKE2B 0c7217f854dac41f198c302efb55df64cb544c15d2451149b74b4eb4d6735f3cbcf26c1566dac167a44564a28783850c5099be9fea47c469b6f6744136a8e672 SHA512 d3516eb5862c876dd042a5a4f797eb21753e6384e5bea9818aafe2e0cb38150cafbb2fe2218dba0ade24d280ebfd024b738f4ec1953bc4d4bca8af46426c1101
+EBUILD glslang-1.3.268-r2.ebuild 1188 BLAKE2B bf7e203a0e705ff716d2cd15eb73f8890331dc67d8371c731dc3bb1a43255455c94b47e3cf8696826ebdd664922a9088431c0b501a2b68c84c67dc9ca671472c SHA512 cfc502751db328a76cc9299e6f0b86ff6bfbc86215bd43802b2ed1df5be42407e06916bb1d026551daea8fa4c6273cbb27abe7c194d0838250b57544be7a2ae3
+EBUILD glslang-9999.ebuild 1194 BLAKE2B 23e05e882daf0231a13f77e8e02976e5c9cf1889a41563d71bd5515628adc6f4576f917cc3b21b2bc4e2eded3643e16a96aa6dac5a8656d6d3f478e39fe730b3 SHA512 45ab2201bae0c93c3714b71d687decda8b33d9f09b8a44d5278d4a9d1bef0a51c8b63a9e4f09fd017b8d8dc44c7871b80884e7efb98d33505dbd6bb7ee5f3828
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
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
new file mode 100644
index 000000000000..3afcec329f07
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
@@ -0,0 +1,26 @@
+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
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>)
+ 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
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ 
+ if(ENABLE_OPT)
+     target_include_directories(glslang-standalone
diff --git a/dev-util/glslang/glslang-1.3.268-r2.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild
new file mode 100644
index 000000000000..2ac7f3ffb59c
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.268-r2.ebuild
@@ -0,0 +1,44 @@
+# 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
+}
diff --git a/dev-util/glslang/glslang-1.3.268.ebuild b/dev-util/glslang/glslang-1.3.268.ebuild
deleted file mode 100644
index b68eb152c14b..000000000000
--- a/dev-util/glslang/glslang-1.3.268.ebuild
+++ /dev/null
@@ -1,42 +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/12"
-
-# 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" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PCH=OFF
-		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 7cc9322b0516..dd1be10214bc 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V ge
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
-SLOT="0/12"
+SLOT="0/13"
 
 # Bug 698850
 RESTRICT="test"
@@ -31,7 +31,9 @@ BDEPEND="${PYTHON_DEPS}
 
 DEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
+		  "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
+)
 
 multilib_src_configure() {
 	local mycmakeargs=(
-- 
cgit v1.2.3