diff options
Diffstat (limited to 'dev-util/spirv-tools')
| -rw-r--r-- | dev-util/spirv-tools/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-2020.6.ebuild (renamed from dev-util/spirv-tools/spirv-tools-2020.3.ebuild) | 11 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-9999.ebuild | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 5cc21ac225cf..e33e66fe1467 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,2 +1,2 @@ -DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542 +DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2 diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild index b033f1d59633..a6a0af0f850d 100644 --- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild index e8bcfd680cc2..abd96728ee58 100644 --- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild @@ -12,9 +12,10 @@ 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 arm arm64 ~ppc ppc64 x86" - S="${WORKDIR}"/${MY_PN}-${PV} + EGIT_COMMIT="${PV}" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi DESCRIPTION="Provides an API and commands for processing SPIR-V modules" @@ -25,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.3" +COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1" DEPEND="${COMMON_DEPEND}" RDEPEND="" BDEPEND="${PYTHON_DEPS} @@ -35,6 +36,8 @@ multilib_src_configure() { local mycmakeargs=( "-DSPIRV-Headers_SOURCE_DIR=/usr/" "-DSPIRV_WERROR=OFF" + "-DSPIRV_TOOLS_BUILD_STATIC=OFF" + "-DBUILD_SHARED_LIBS=ON" ) cmake_src_configure diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 808ff078ee4d..eeeccf517079 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.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" +COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1" DEPEND="${COMMON_DEPEND}" RDEPEND="" BDEPEND="${PYTHON_DEPS} |