| 1 |
commit: 8bb8fc47d982c5d5575e21ffc1dfed9bc754943b |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 27 19:31:08 2019 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 27 19:52:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb8fc47 |
| 7 |
|
| 8 |
dev-util/spirv-tools: Bump version |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 11 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/spirv-tools/Manifest | 1 + |
| 14 |
...rv-tools-9999.ebuild => spirv-tools-2019.4.ebuild} | 19 +++++++++++-------- |
| 15 |
dev-util/spirv-tools/spirv-tools-9999.ebuild | 3 ++- |
| 16 |
3 files changed, 14 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest |
| 19 |
index f3c7bac54f2..d3216999821 100644 |
| 20 |
--- a/dev-util/spirv-tools/Manifest |
| 21 |
+++ b/dev-util/spirv-tools/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad |
| 24 |
DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4 |
| 25 |
+DIST spirv-tools-2019.4.tar.gz 1668814 BLAKE2B c86db61c2dd13f0ee7d74cab81959f79f860f6a1e6e3d8488c63f1315a7ce4586496927669885093af00961cd49e6f7ad192efbc22d4606632a171237ae420aa SHA512 6396c0a58736790af30b38e3c4725b110f0b8042cf633c39ac87e0144fc98941bf1931f6945b71c49ab2bffa4934232f3ca3aa3516f136c07411a222b92a5efa |
| 26 |
|
| 27 |
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-2019.4.ebuild |
| 28 |
similarity index 64% |
| 29 |
copy from dev-util/spirv-tools/spirv-tools-9999.ebuild |
| 30 |
copy to dev-util/spirv-tools/spirv-tools-2019.4.ebuild |
| 31 |
index a30f91104a1..d68e1edf044 100644 |
| 32 |
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild |
| 33 |
+++ b/dev-util/spirv-tools/spirv-tools-2019.4.ebuild |
| 34 |
@@ -4,24 +4,28 @@ |
| 35 |
EAPI=7 |
| 36 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
| 37 |
|
| 38 |
-inherit cmake-multilib cmake-utils git-r3 python-any-r1 |
| 39 |
+inherit cmake-multilib cmake-utils python-any-r1 |
| 40 |
|
| 41 |
DESCRIPTION="Provides an API and commands for processing SPIR-V modules" |
| 42 |
HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" |
| 43 |
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git" |
| 44 |
-SRC_URI="" |
| 45 |
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 46 |
|
| 47 |
LICENSE="Apache-2.0" |
| 48 |
SLOT="0" |
| 49 |
+KEYWORDS="~amd64 ~x86" |
| 50 |
# Tests fail upon finding symbols that do not match a regular expression |
| 51 |
# in the generated library. Easily hit with non-standard compiler flags |
| 52 |
RESTRICT="test" |
| 53 |
-COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" |
| 54 |
+ |
| 55 |
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1" |
| 56 |
DEPEND="${COMMON_DEPEND}" |
| 57 |
RDEPEND="" |
| 58 |
BDEPEND="${PYTHON_DEPS} |
| 59 |
${COMMON_DEPEND}" |
| 60 |
|
| 61 |
+EGIT_COMMIT="d65513e92c3fc2832248ce4a4b4343c6220caffc" |
| 62 |
+S="${WORKDIR}/SPIRV-Tools-${PV}" |
| 63 |
+ |
| 64 |
multilib_src_configure() { |
| 65 |
local mycmakeargs=( |
| 66 |
"-DSPIRV-Headers_SOURCE_DIR=/usr/" |
| 67 |
@@ -33,8 +37,7 @@ multilib_src_configure() { |
| 68 |
|
| 69 |
multilib_src_install() { |
| 70 |
cmake-utils_src_install |
| 71 |
- |
| 72 |
- # create a header file with the commit hash of the current revision |
| 73 |
- # vulkan-tools needs this to build |
| 74 |
- echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die |
| 75 |
+ echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die |
| 76 |
+ insinto /usr/include/"${PN}" |
| 77 |
+ doins "${PN}-commit.h" |
| 78 |
} |
| 79 |
|
| 80 |
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild |
| 81 |
index a30f91104a1..ab456b28e5a 100644 |
| 82 |
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild |
| 83 |
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild |
| 84 |
@@ -16,7 +16,7 @@ SLOT="0" |
| 85 |
# Tests fail upon finding symbols that do not match a regular expression |
| 86 |
# in the generated library. Easily hit with non-standard compiler flags |
| 87 |
RESTRICT="test" |
| 88 |
-COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" |
| 89 |
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1" |
| 90 |
DEPEND="${COMMON_DEPEND}" |
| 91 |
RDEPEND="" |
| 92 |
BDEPEND="${PYTHON_DEPS} |
| 93 |
@@ -38,3 +38,4 @@ multilib_src_install() { |
| 94 |
# vulkan-tools needs this to build |
| 95 |
echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die |
| 96 |
} |
| 97 |
+ |
Archives