* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/, dev-util/spirv-tools/files/
@ 2019-03-03 14:48 Nick Sarnie
0 siblings, 0 replies; 4+ messages in thread
From: Nick Sarnie @ 2019-03-03 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 1f846f1c5d2c33badd5274386ba3be75959fad53
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 14:39:37 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 14:47:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f846f1c
dev-util/spirv-tools: Bump revision
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...v-tools-2019.1-Fix-vertex-instrumentation.patch | 113 +++++++++++++++++++++
...-2019.1.ebuild => spirv-tools-2019.1-r1.ebuild} | 2 +
2 files changed, 115 insertions(+)
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
new file mode 100644
index 00000000000..4ca2c53969a
--- /dev/null
+++ b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
@@ -0,0 +1,113 @@
+From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001
+From: greg-lunarg <greg@lunarg.com>
+Date: Wed, 16 Jan 2019 16:02:07 -0700
+Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and
+ InstanceIndex (#2294)
+
+...instead of VertexId and InstanceId
+---
+ include/spirv-tools/instrument.hpp | 4 ++--
+ source/opt/instrument_pass.cpp | 8 ++++----
+ source/opt/ir_context.cpp | 4 ++--
+ test/opt/inst_bindless_check_test.cpp | 14 +++++++-------
+ 4 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp
+index 69d1ad259..f8068099c 100644
+--- a/include/spirv-tools/instrument.hpp
++++ b/include/spirv-tools/instrument.hpp
+@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4;
+ // error.
+ //
+ // Vertex Shader Output Record Offsets
+-static const int kInstVertOutVertexId = kInstCommonOutCnt;
+-static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1;
++static const int kInstVertOutVertexIndex = kInstCommonOutCnt;
++static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1;
+
+ // Frag Shader Output Record Offsets
+ static const int kInstFragOutFragCoordX = kInstCommonOutCnt;
+diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp
+index 8ba8ce504..6935a43dc 100644
+--- a/source/opt/instrument_pass.cpp
++++ b/source/opt/instrument_pass.cpp
+@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx,
+ switch (stage_idx) {
+ case SpvExecutionModelVertex: {
+ // Load and store VertexId and InstanceId
+- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId),
+- kInstVertOutVertexId, base_offset_id, builder);
+- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId),
+- kInstVertOutInstanceId, base_offset_id, builder);
++ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex),
++ kInstVertOutVertexIndex, base_offset_id, builder);
++ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex),
++ kInstVertOutInstanceIndex, base_offset_id, builder);
+ } break;
+ case SpvExecutionModelGLCompute: {
+ // Load and store GlobalInvocationId. Second word is unused; store zero.
+diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
+index a2f207c0c..fe69027f8 100644
+--- a/source/opt/ir_context.cpp
++++ b/source/opt/ir_context.cpp
+@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) {
+ reg_type = type_mgr->GetRegisteredType(&v4float_ty);
+ break;
+ }
+- case SpvBuiltInVertexId:
+- case SpvBuiltInInstanceId:
++ case SpvBuiltInVertexIndex:
++ case SpvBuiltInInstanceIndex:
+ case SpvBuiltInPrimitiveId:
+ case SpvBuiltInInvocationId:
+ case SpvBuiltInGlobalInvocationId: {
+diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp
+index ddafb3dc2..a426ce04c 100644
+--- a/test/opt/inst_bindless_check_test.cpp
++++ b/test/opt/inst_bindless_check_test.cpp
+@@ -1650,7 +1650,7 @@ OpCapability Sampled1D
+ OpExtension "SPV_KHR_storage_buffer_storage_class"
+ %1 = OpExtInstImport "GLSL.std.450"
+ OpMemoryModel Logical GLSL450
+-OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID
++OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex
+ OpSource GLSL 450
+ OpName %main "main"
+ OpName %lod "lod"
+@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0
+ OpMemberDecorate %_struct_61 1 Offset 4
+ OpDecorate %63 DescriptorSet 7
+ OpDecorate %63 Binding 0
+-OpDecorate %gl_VertexID BuiltIn VertexId
+-OpDecorate %gl_InstanceID BuiltIn InstanceId
++OpDecorate %gl_VertexIndex BuiltIn VertexIndex
++OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex
+ %void = OpTypeVoid
+ %12 = OpTypeFunction %void
+ %float = OpTypeFloat 32
+@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId
+ %uint_2 = OpConstant %uint 2
+ %uint_3 = OpConstant %uint 3
+ %_ptr_Input_uint = OpTypePointer Input %uint
+-%gl_VertexID = OpVariable %_ptr_Input_uint Input
+-%gl_InstanceID = OpVariable %_ptr_Input_uint Input
++%gl_VertexIndex = OpVariable %_ptr_Input_uint Input
++%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input
+ %uint_5 = OpConstant %uint 5
+ %uint_6 = OpConstant %uint 6
+ %uint_7 = OpConstant %uint 7
+@@ -1819,11 +1819,11 @@ OpStore %81 %55
+ %83 = OpIAdd %uint %68 %uint_3
+ %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83
+ OpStore %84 %uint_0
+-%87 = OpLoad %uint %gl_VertexID
++%87 = OpLoad %uint %gl_VertexIndex
+ %88 = OpIAdd %uint %68 %uint_4
+ %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88
+ OpStore %89 %87
+-%91 = OpLoad %uint %gl_InstanceID
++%91 = OpLoad %uint %gl_InstanceIndex
+ %93 = OpIAdd %uint %68 %uint_5
+ %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93
+ OpStore %94 %91
+
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r1.ebuild
similarity index 93%
rename from dev-util/spirv-tools/spirv-tools-2019.1.ebuild
rename to dev-util/spirv-tools/spirv-tools-2019.1-r1.ebuild
index d59ad889f8b..49e7dc8a87d 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r1.ebuild
@@ -20,6 +20,8 @@ RDEPEND=""
DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
S="${WORKDIR}/SPIRV-Tools-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch )
+
multilib_src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/, dev-util/spirv-tools/files/
@ 2020-01-26 21:10 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-01-26 21:10 UTC (permalink / raw
To: gentoo-commits
commit: ae80d3bd2ce0361a868adbf17f82ce0e48723f08
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 21:01:54 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 21:09:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae80d3bd
dev-util/spirv-tools: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/spirv-tools/Manifest | 1 -
...v-tools-2019.1-Fix-vertex-instrumentation.patch | 113 ---------------------
dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild | 44 --------
.../spirv-tools-2019.10_pre20191027.ebuild | 43 --------
4 files changed, 201 deletions(-)
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index b0aeec4417e..4d858e1c34b 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1 @@
-DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
deleted file mode 100644
index 4ca2c53969a..00000000000
--- a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001
-From: greg-lunarg <greg@lunarg.com>
-Date: Wed, 16 Jan 2019 16:02:07 -0700
-Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and
- InstanceIndex (#2294)
-
-...instead of VertexId and InstanceId
----
- include/spirv-tools/instrument.hpp | 4 ++--
- source/opt/instrument_pass.cpp | 8 ++++----
- source/opt/ir_context.cpp | 4 ++--
- test/opt/inst_bindless_check_test.cpp | 14 +++++++-------
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp
-index 69d1ad259..f8068099c 100644
---- a/include/spirv-tools/instrument.hpp
-+++ b/include/spirv-tools/instrument.hpp
-@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4;
- // error.
- //
- // Vertex Shader Output Record Offsets
--static const int kInstVertOutVertexId = kInstCommonOutCnt;
--static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1;
-+static const int kInstVertOutVertexIndex = kInstCommonOutCnt;
-+static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1;
-
- // Frag Shader Output Record Offsets
- static const int kInstFragOutFragCoordX = kInstCommonOutCnt;
-diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp
-index 8ba8ce504..6935a43dc 100644
---- a/source/opt/instrument_pass.cpp
-+++ b/source/opt/instrument_pass.cpp
-@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx,
- switch (stage_idx) {
- case SpvExecutionModelVertex: {
- // Load and store VertexId and InstanceId
-- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId),
-- kInstVertOutVertexId, base_offset_id, builder);
-- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId),
-- kInstVertOutInstanceId, base_offset_id, builder);
-+ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex),
-+ kInstVertOutVertexIndex, base_offset_id, builder);
-+ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex),
-+ kInstVertOutInstanceIndex, base_offset_id, builder);
- } break;
- case SpvExecutionModelGLCompute: {
- // Load and store GlobalInvocationId. Second word is unused; store zero.
-diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
-index a2f207c0c..fe69027f8 100644
---- a/source/opt/ir_context.cpp
-+++ b/source/opt/ir_context.cpp
-@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) {
- reg_type = type_mgr->GetRegisteredType(&v4float_ty);
- break;
- }
-- case SpvBuiltInVertexId:
-- case SpvBuiltInInstanceId:
-+ case SpvBuiltInVertexIndex:
-+ case SpvBuiltInInstanceIndex:
- case SpvBuiltInPrimitiveId:
- case SpvBuiltInInvocationId:
- case SpvBuiltInGlobalInvocationId: {
-diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp
-index ddafb3dc2..a426ce04c 100644
---- a/test/opt/inst_bindless_check_test.cpp
-+++ b/test/opt/inst_bindless_check_test.cpp
-@@ -1650,7 +1650,7 @@ OpCapability Sampled1D
- OpExtension "SPV_KHR_storage_buffer_storage_class"
- %1 = OpExtInstImport "GLSL.std.450"
- OpMemoryModel Logical GLSL450
--OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID
-+OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex
- OpSource GLSL 450
- OpName %main "main"
- OpName %lod "lod"
-@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0
- OpMemberDecorate %_struct_61 1 Offset 4
- OpDecorate %63 DescriptorSet 7
- OpDecorate %63 Binding 0
--OpDecorate %gl_VertexID BuiltIn VertexId
--OpDecorate %gl_InstanceID BuiltIn InstanceId
-+OpDecorate %gl_VertexIndex BuiltIn VertexIndex
-+OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex
- %void = OpTypeVoid
- %12 = OpTypeFunction %void
- %float = OpTypeFloat 32
-@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId
- %uint_2 = OpConstant %uint 2
- %uint_3 = OpConstant %uint 3
- %_ptr_Input_uint = OpTypePointer Input %uint
--%gl_VertexID = OpVariable %_ptr_Input_uint Input
--%gl_InstanceID = OpVariable %_ptr_Input_uint Input
-+%gl_VertexIndex = OpVariable %_ptr_Input_uint Input
-+%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input
- %uint_5 = OpConstant %uint 5
- %uint_6 = OpConstant %uint 6
- %uint_7 = OpConstant %uint 7
-@@ -1819,11 +1819,11 @@ OpStore %81 %55
- %83 = OpIAdd %uint %68 %uint_3
- %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83
- OpStore %84 %uint_0
--%87 = OpLoad %uint %gl_VertexID
-+%87 = OpLoad %uint %gl_VertexIndex
- %88 = OpIAdd %uint %68 %uint_4
- %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88
- OpStore %89 %87
--%91 = OpLoad %uint %gl_InstanceID
-+%91 = OpLoad %uint %gl_InstanceIndex
- %93 = OpIAdd %uint %68 %uint_5
- %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93
- OpStore %94 %91
-
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
deleted file mode 100644
index 9c2530ee05d..00000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# 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.3.4_pre20190302"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
-S="${WORKDIR}/SPIRV-Tools-${PV}"
-PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch )
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
- "-DSPIRV_WERROR=OFF"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- cmake-utils_src_install
- echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
- insinto /usr/include/"${PN}"
- doins "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
deleted file mode 100644
index 4706f482cc7..00000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# 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.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
- "-DSPIRV_WERROR=OFF"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- cmake-utils_src_install
- echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
- insinto /usr/include/"${PN}"
- doins "${PN}-commit.h"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/, dev-util/spirv-tools/files/
@ 2020-06-17 5:46 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-06-17 5:46 UTC (permalink / raw
To: gentoo-commits
commit: a46a92220c0f5a24a25819bc3ce1d02c994ed668
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 05:34:42 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 05:45:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46a9222
dev-util/spirv-tools: Drop old versions
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/spirv-tools/Manifest | 3 --
...E_INSTALL_LIBDIR-in-installed-CMake-files.patch | 23 -----------
.../spirv-tools-2019.10_pre20191027-r1.ebuild | 45 ----------------------
dev-util/spirv-tools/spirv-tools-2020.1.ebuild | 41 --------------------
.../spirv-tools-2020.4_pre20200429.ebuild | 42 --------------------
5 files changed, 154 deletions(-)
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index d8268e41ec1..88c170f4812 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1 @@
-DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
-DIST spirv-tools-2020.1.tar.gz 2053947 BLAKE2B d9e641407e871cda5680e9ddac6af5213848b03ef9d13b9fe1acffcea12e9e40b43a834f9e0ae269f43dfffdc19bfaeca502b69ff69d59b95f6810f89b6bd276 SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46
DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-DIST spirv-tools-2020.4_pre20200429.tar.gz 2158602 BLAKE2B 1368fd1d446db447ecc20b7aa06e4a64f2a0278825e1384d789cf0ad0a0d7be4064b49e60d1a79c676056c0c22be5dd855f880a1288a11ad31fe96172e9cc0a6 SHA512 e6412306d7923a8e922edf48b1300f0b0ed35d126e3f56ceaa0c787ff2ff5625d20cf1fab14e022b2503dac0b469eb4ecff01f74f6e18884630f161d03d84728
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
deleted file mode 100644
index c7dda4594c2..00000000000
--- a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4c9f81249f0808af316f39c8f0e8b67e46ec0967 Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Mon, 18 Nov 2019 11:07:48 -0800
-Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
-
-Fixes #3017
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19108f3a0..aecaf8d68 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
- endmacro()
- else()
- macro(spvtools_config_package_dir TARGET PATH)
-- set(${PATH} lib/cmake/${TARGET})
-+ set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
- endmacro()
- endif()
-
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
deleted file mode 100644
index edab7a1b8b9..00000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-# 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.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch" )
-
-S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
- "-DSPIRV_WERROR=OFF"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- cmake-utils_src_install
- echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
- insinto /usr/include/"${PN}"
- doins "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
deleted file mode 100644
index 3c8fb137c2e..00000000000
--- a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64 ~x86"
- S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-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.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
- "-DSPIRV_WERROR=OFF"
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild b/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild
deleted file mode 100644
index d4687f7e8e3..00000000000
--- a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="49ca250b44c633ba7cb8897002e62781a451421c"
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64 x86"
- S="${WORKDIR}"/${MY_PN}-${SNAPSHOT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-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.3"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
- "-DSPIRV_WERROR=OFF"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/, dev-util/spirv-tools/files/
@ 2022-07-21 11:59 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-07-21 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 399cd1d4ece5603105971b37179ea7ee74b74f3d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 11:51:57 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 11:59:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=399cd1d4
dev-util/spirv-tools: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/spirv-tools/Manifest | 1 -
.../files/spirv-tools-1.3.211-cmake-librt.patch | 40 ------------------
dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild | 49 ----------------------
3 files changed, 90 deletions(-)
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 20c4be99a67f..406db9466a87 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1 @@
-DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842
DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188
diff --git a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch
deleted file mode 100644
index 48afd5a736f1..000000000000
--- a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/KhronosGroup/SPIRV-Tools/commit/cb96abbf7affd986016f17dd09f9f971138a922b
-
-From: Chad Versace <chad@kiwitree.net>
-Date: Thu, 14 Apr 2022 06:04:12 -0700
-Subject: [PATCH] Fix CMake for librt (#4773)
-
-In the installed file
-/usr/lib64/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake, occurences of
-librt in the INTERFACE_LINK_LIBRARIES property are incorrect. The
-property contains the absolute path to librt. In most situations, this
-produces no problem. But when building in a sysroot, which is commonly
-done when cross-compiling, the absolute path breaks dependent projects.
-
-For example, when building spirv-tools using the Chrome OS SDK, and
-targeting the board 'volteer', where the build sysroot is
-'/build/volteer', the file includes this line
- INTERFACE_LINK_LIBRARIES "/build/volteer/usr/lib64/librt.so"
-when it should instead say
- INTERFACE_LINK_LIBRARIES "rt"
-
-The CMake documentation agrees [1]:
- Note that it is not advisable to populate the
- INTERFACE_LINK_LIBRARIES of a target with absolute paths to
- dependencies. That would hard-code into installed packages the
- library file paths for dependencies as found on the machine the
- package was made on.
-
-[1] https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_LINK_LIBRARIES.html
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
- find_library(LIBRT rt)
- if(LIBRT)
- foreach(target ${SPIRV_TOOLS_TARGETS})
-- target_link_libraries(${target} ${LIBRT})
-+ target_link_libraries(${target} rt)
- endforeach()
- endif()
- endif()
-
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild
deleted file mode 100644
index 246a6fc6ad67..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- inherit git-r3
-else
- 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 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-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-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cmake-librt.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
- "-DSPIRV_WERROR=OFF"
- "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
- "-DBUILD_SHARED_LIBS=ON"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-21 11:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-26 21:10 [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/, dev-util/spirv-tools/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-07-21 11:59 Matt Turner
2020-06-17 5:46 Matt Turner
2019-03-03 14:48 Nick Sarnie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox