From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-util/spirv-tools/Manifest | 4 ++- dev-util/spirv-tools/spirv-tools-2020.1.ebuild | 41 ++++++++++++++++++++++++++ dev-util/spirv-tools/spirv-tools-9999.ebuild | 27 +++++++++-------- 3 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 dev-util/spirv-tools/spirv-tools-2020.1.ebuild (limited to 'dev-util/spirv-tools') diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index c7ceb897a3b6..4fc0d4c3097e 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,5 +1,7 @@ AUX spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 711 BLAKE2B faed59dc76f9320972bdc7966c757df76a1353ccefe9f6dacbf473a8f576eb222d0b4ceaa97a641b41c6c520a6a21149956aeab88b840124caaac08b7a27d66e SHA512 b12004d2e5d6b058549c4e12abcea531e4b8113beabc2264161197b247209168affa0aae529f5ac122b3aa7ece6f4000d877bd5fa4a230f44cb6e9a08ea22661 DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4 +DIST spirv-tools-2020.1.tar.gz 2053947 BLAKE2B d9e641407e871cda5680e9ddac6af5213848b03ef9d13b9fe1acffcea12e9e40b43a834f9e0ae269f43dfffdc19bfaeca502b69ff69d59b95f6810f89b6bd276 SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46 EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1259 BLAKE2B a40c8c9229746472df5430fc1fad85e91fb91e450f0bbd3ce41b1c23eccd5e401de34ab0eb1227b0be3b63a99f9b58ed52d20e1936f817bcb889e94b2b4ac5a3 SHA512 824f6826eecc640d26b2c58adc26605a8003f695b3cae33efa130d3fdddc46a958011a4d4ef125b69ac2d0d514cb491c263a29ff9785f76a2bdab465c73e9445 -EBUILD spirv-tools-9999.ebuild 1098 BLAKE2B 3c609f34d268c8f31b10757825c002c4aa35ee97446ae8b83a603b08b29c425ae4604ab916173beb3afaca464621c75edc24013a55964b2b6c36a2e50ef447d0 SHA512 75b5ec8960a1e056757f574a3a676ac725f5fba39c74ed05e6e985f1aeeb4aacdc32bbc64bb3777cc279f76353f0876269fa4904094570e7c339f8fe8cec5200 +EBUILD spirv-tools-2020.1.ebuild 1076 BLAKE2B 9501147d40883ba2aab5a8f484281bed99dc9536ae9963b8077e3eef1aff41f9b29847b1e8de75ec93d25759093dca19942ab3fc7cdf2176bd2cd672eb4542fe SHA512 806dbf63f4a564b1d5dda351e1eea834c1d2c154f5fa95eaf6a0bb37fbb76225591e84662e4083b4f129cb4cebd27734029fc5646c17576fee01ece1f3012745 +EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B 9501147d40883ba2aab5a8f484281bed99dc9536ae9963b8077e3eef1aff41f9b29847b1e8de75ec93d25759093dca19942ab3fc7cdf2176bd2cd672eb4542fe SHA512 806dbf63f4a564b1d5dda351e1eea834c1d2c154f5fa95eaf6a0bb37fbb76225591e84662e4083b4f129cb4cebd27734029fc5646c17576fee01ece1f3012745 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6 diff --git a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild new file mode 100644 index 000000000000..3c8fb137c2e3 --- /dev/null +++ b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild @@ -0,0 +1,41 @@ +# 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 ~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.1" +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-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 0d2943714b8e..3c8fb137c2e3 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -2,14 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake-multilib cmake-utils git-r3 python-any-r1 +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 ~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" -EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git" -SRC_URI="" LICENSE="Apache-2.0" SLOT="0" @@ -28,13 +37,5 @@ multilib_src_configure() { "-DSPIRV_WERROR=OFF" ) - cmake-utils_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 + cmake_src_configure } -- cgit v1.2.3