diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-16 00:04:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-16 00:04:23 +0000 |
| commit | 1f462d155b62b1720f59969291951ae9fdfd07b7 (patch) | |
| tree | 4c784fe7ee4297348b8d8a578db8bd01b1bb0106 | |
| parent | 2019-06-15 23:44:34 UTC (diff) | |
| parent | dev-util/spirv-tools: Drop old (diff) | |
| download | gentoo-1f462d155b62b1720f59969291951ae9fdfd07b7.tar.gz gentoo-1f462d155b62b1720f59969291951ae9fdfd07b7.tar.bz2 gentoo-1f462d155b62b1720f59969291951ae9fdfd07b7.zip | |
Merge updates from master
| -rw-r--r-- | dev-util/spirv-tools/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild (renamed from dev-util/spirv-tools/spirv-tools-2018.4.ebuild) | 15 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-9999.ebuild | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 1c3cbefec4f1..f3c7bac54f2a 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,3 +1,2 @@ -DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4 diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild index f8f03ba31210..57c340b2d99f 100644 --- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) -inherit cmake-multilib cmake-utils +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" @@ -16,10 +17,14 @@ KEYWORDS="~amd64 ~x86" # in the generated library. Easily hit with non-standard compiler flags RESTRICT="test" +DEPEND="" RDEPEND="" -DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710" -EGIT_COMMIT="f508896d6487d09f5c9a2a3835595446fec0791a" +BDEPEND="${PYTHON_DEPS} + >=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=( diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 1df290d2083c..07ff87f02689 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) inherit cmake-multilib cmake-utils git-r3 @@ -16,8 +17,10 @@ SLOT="0" # in the generated library. Easily hit with non-standard compiler flags RESTRICT="test" +DEPEND="" RDEPEND="" -DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" +BDEPEND="${PYTHON_DEPS} + >=dev-util/spirv-headers-1.3.4_pre20190302" multilib_src_configure() { local mycmakeargs=( |