From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- dev-util/spirv-tools/Manifest | 8 ++-- dev-util/spirv-tools/spirv-tools-2020.3.ebuild | 41 -------------------- .../spirv-tools-2020.5_pre20201107.ebuild | 2 +- dev-util/spirv-tools/spirv-tools-2020.6.ebuild | 44 ++++++++++++++++++++++ dev-util/spirv-tools/spirv-tools-9999.ebuild | 4 +- 5 files changed, 51 insertions(+), 48 deletions(-) delete mode 100644 dev-util/spirv-tools/spirv-tools-2020.3.ebuild create mode 100644 dev-util/spirv-tools/spirv-tools-2020.6.ebuild (limited to 'dev-util/spirv-tools') diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 118229546b8f..2bc672d50ea5 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,6 +1,6 @@ -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 -EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64 -EBUILD spirv-tools-2020.5_pre20201107.ebuild 1231 BLAKE2B 42263f9563cfdf7d4efbbc932b377f6ad0e92b01b1ff457690dbcbe72aaa19c22a862dad5a4161ca2bbb4d9a7f4347599522f859a4d07504bc4ec24fb53ae656 SHA512 999f277a3e3acfdf1644c2bf1ad0a8c41a60c7322eaf588183bb251ee19ce16a3b83217bd5f2ce18dcc8a21147c1ee3056ce6c89614c7fcff174b93c4153fef1 -EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d +DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2 +EBUILD spirv-tools-2020.5_pre20201107.ebuild 1230 BLAKE2B c22ed6c1c229fbd4530eb631dd6920fef98c29578432ba71370512be1bafcc2fb8da12478be16ca2f54a8a126237689ba7cdad1cd5782a34ff409fa43053e24b SHA512 172fce20975bd218161edf8d873beb6d1c647377d099627797d522befa4773bb224393eafc95bc5a7c123236106d41453ecb9873ff8663c1a857c3b663fdb365 +EBUILD spirv-tools-2020.6.ebuild 1205 BLAKE2B 4e74e0c95341d93f71be441da32b0ee04a8b29834242c668a6f87378497fd8463537a7a15b61d40a70cbc953f9522918fb8965c581e37fb135ad379313d7a47e SHA512 7fa96042df7287684db7bc86dba3e5baa2ff266ea0442d324b6660ec9aee791772f3ae600b687d62d4913010981d48928111b9bbe380088abdf7d117a9d75365 +EBUILD spirv-tools-9999.ebuild 1232 BLAKE2B 0c5acd106fbf664a8f9f1d82ee921e1ad8f8f73ee1b7182f69c7dc1f6303dd6f53ce9bbd96a0b2dd6ded7b73baf7956e2cd757540e7b36a57923b1a4afdbfb70 SHA512 c6d27ddeed7cfa4ec06d6dfa9366082ed1818f4a87dea5c4b01fa6aef87bda429c93776e9d5c7187ee018a10dc5b68d058710425dd11f8271ad61d3e19236733 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6 diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild deleted file mode 100644 index 16c82fcd1bd9..000000000000 --- a/dev-util/spirv-tools/spirv-tools-2020.3.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 arm arm64 ~ppc 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.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 -} 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 7921c01f46cd..41ee1a4b749d 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.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild new file mode 100644 index 000000000000..d6ecf835b95b --- /dev/null +++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild @@ -0,0 +1,44 @@ +# 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,9} ) +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="${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" +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.4.1" +DEPEND="${COMMON_DEPEND}" +RDEPEND="" +BDEPEND="${PYTHON_DEPS} + ${COMMON_DEPEND}" + +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 d1cdb00c129a..5e644f17681c 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 MY_PN=SPIRV-Tools CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -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} -- cgit v1.2.3