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

[Nick Sarnie]

commit:     e618eaa6746fd424eb1737fa66c82c41c678a499
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 22:39:37 2021 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 23:11:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e618eaa6

dev-util/spirv-tools: Version bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 dev-util/spirv-tools/Manifest                                       | 1 +
 .../{spirv-tools-99999999.ebuild => spirv-tools-1.2.198.ebuild}     | 6 +++---
 dev-util/spirv-tools/spirv-tools-99999999.ebuild                    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 4edb6a92d23e..304a387a6e17 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1,3 @@
+DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 
036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119
 SHA512 
90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B 
ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd
 SHA512 
74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
 DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 
87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430
 SHA512 
d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea

diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild 
b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
similarity index 87%
copy from dev-util/spirv-tools/spirv-tools-99999999.ebuild
copy to dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
index fa22fe6b2b6d..535410ee3e23 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git";
        inherit git-r3
 else
-       EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
+       EGIT_COMMIT="sdk-${PV}.0"
        
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
        S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
@@ -26,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
+COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
@@ -34,7 +34,7 @@ BDEPEND="${PYTHON_DEPS}
 
 multilib_src_configure() {
        local mycmakeargs=(
-               "-DSPIRV-Headers_SOURCE_DIR=/usr/"
+               "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
                "-DSPIRV_WERROR=OFF"
                "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
                "-DBUILD_SHARED_LIBS=ON"

diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild 
b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index fa22fe6b2b6d..1a401b8cc38d 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
+COMMON_DEPEND="~dev-util/spirv-headers-1.2.198"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}