[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/

[Nick Sarnie]

commit:     dfb43edc6cbd9e1d306e9e36ecb7a9a7289e2255
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  9 21:48:49 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 22:56:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb43edc

dev-util/glslang: add 1.3.268

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 dev-util/glslang/Manifest                                      |  1 +
 .../glslang/{glslang-9999.ebuild => glslang-1.3.268.ebuild}    | 10 +++++++---
 dev-util/glslang/glslang-9999.ebuild                           | 10 +++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 443897c0278c..ab3265f9412a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-util/glslang/glslang-9999.ebuild 
b/dev-util/glslang/glslang-1.3.268.ebuild
similarity index 81%
copy from dev-util/glslang/glslang-9999.ebuild
copy to dev-util/glslang/glslang-1.3.268.ebuild
index 709018572a28..b68eb152c14b 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-1.3.268.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git";
        inherit git-r3
 else
-       SNAPSHOT_COMMIT="sdk-${PV}.0"
+       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}"
@@ -25,14 +25,18 @@ SLOT="0/12"
 # Bug 698850
 RESTRICT="test"
 
-BDEPEND="${PYTHON_DEPS}"
+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=1
+               -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 709018572a28..7cc9322b0516 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git";
        inherit git-r3
 else
-       SNAPSHOT_COMMIT="sdk-${PV}.0"
+       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}"
@@ -25,14 +25,18 @@ SLOT="0/12"
 # Bug 698850
 RESTRICT="test"
 
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}
+       ~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]
+"
+
+DEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
 
 multilib_src_configure() {
        local mycmakeargs=(
                -DENABLE_PCH=OFF
-               -DALLOW_EXTERNAL_SPIRV_TOOLS=1
+               -DALLOW_EXTERNAL_SPIRV_TOOLS=ON
        )
        cmake_src_configure
 }