commit: 8bb8fc47d982c5d5575e21ffc1dfed9bc754943b
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 19:31:08 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 19:52:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb8fc47
dev-util/spirv-tools: Bump version
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
dev-util/spirv-tools/Manifest | 1 +
...rv-tools-9999.ebuild => spirv-tools-2019.4.ebuild} | 19 +++++++++++--------
dev-util/spirv-tools/spirv-tools-9999.ebuild | 3 ++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f3c7bac54f2..d3216999821 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1,3 @@
DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B
a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb
SHA512
068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B
823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f
SHA512
c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
+DIST spirv-tools-2019.4.tar.gz 1668814 BLAKE2B
c86db61c2dd13f0ee7d74cab81959f79f860f6a1e6e3d8488c63f1315a7ce4586496927669885093af00961cd49e6f7ad192efbc22d4606632a171237ae420aa
SHA512
6396c0a58736790af30b38e3c4725b110f0b8042cf633c39ac87e0144fc98941bf1931f6945b71c49ab2bffa4934232f3ca3aa3516f136c07411a222b92a5efa
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild
b/dev-util/spirv-tools/spirv-tools-2019.4.ebuild
similarity index 64%
copy from dev-util/spirv-tools/spirv-tools-9999.ebuild
copy to dev-util/spirv-tools/spirv-tools-2019.4.ebuild
index a30f91104a1..d68e1edf044 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.4.ebuild
@@ -4,24 +4,28 @@
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-multilib cmake-utils git-r3 python-any-r1
+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_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git";
-SRC_URI=""
+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"
+
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}"
+EGIT_COMMIT="d65513e92c3fc2832248ce4a4b4343c6220caffc"
+S="${WORKDIR}/SPIRV-Tools-${PV}"
+
multilib_src_configure() {
local mycmakeargs=(
"-DSPIRV-Headers_SOURCE_DIR=/usr/"
@@ -33,8 +37,7 @@ multilib_src_configure() {
multilib_src_install() {
cmake-utils_src_install
-
- # create a header file with the commit hash of the current revision
- # vulkan-tools needs this to build
- echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
+ echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
+ insinto /usr/include/"${PN}"
+ doins "${PN}-commit.h"
}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild
b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index a30f91104a1..ab456b28e5a 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -16,7 +16,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.3.4_pre20190302"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
@@ -38,3 +38,4 @@ multilib_src_install() {
# vulkan-tools needs this to build
echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
}
+
