From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-libs/shaderc/Manifest | 4 +- .../shaderc/shaderc-2020.4_pre20201106.ebuild | 92 ---------------------- .../shaderc/shaderc-2020.6_pre20210327.ebuild | 92 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild create mode 100644 media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild (limited to 'media-libs/shaderc') diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 516bee2aacd6..f52b7b3d6c90 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,6 +1,6 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed -DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3 -EBUILD shaderc-2020.4_pre20201106.ebuild 2159 BLAKE2B 5a1ae3c49778a45be4c9e468618890ae370d7024e302e43337afa5d93a3e90ba72647d256c5242f07a15ca50b63b2cb0fc14e1b1f4b8a2b911bcc825d60b5a48 SHA512 68339ba7418738a0eefb1577f54268c7ce12c2dfc14f4fb3b47fc98257dc428c355cc7e5c4e0736fe1437756ccbd4005b9195066ffec9632395f59b648604664 +DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c EBUILD shaderc-2020.5_pre20201216.ebuild 2152 BLAKE2B e9779b48efd4dc8233ba298ca956e536a8ddb8fce6451b960b94209d750539c4bf25227b5466c8009a5edcfb7fe0cad78bc9fb33f35a6ea02dbf69e751c77c9b SHA512 190557755660bac2d52542e435fa0ebd50bf1b5971dba4cc84dc775835b60d53f945d84f58e64393ae8da57260bc83d684560bd5cdc7e0b2a3ecc5cd2a6d3745 +EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B 3f7b8071cdd102b995188bb744472041ac791916426ac976ef66bcc7daeced36ac646bb8b8ec29eac396c29f07d291e5906a11859b465cd1370420e51828b674 SHA512 2af1ae076e7ea20b40ed4f1f58d1cdd0e22f134d3cf991774cb80a1d8eccadaa8adae59bb6472111dd0b1c2f00a56868f13c1dec9e1d9c51a320047b2f7bf231 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5 diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild deleted file mode 100644 index 7e4884d24ced..000000000000 --- a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) - -CMAKE_ECLASS=cmake - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Collection of tools, libraries and tests for shader compilation" -HOMEPAGE="https://github.com/google/shaderc" -EGIT_COMMIT="fcafd5b49266d65ab7e4268c825224e8b6c1b8bb" -SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="doc test" - -RDEPEND=" - >=dev-util/glslang-10.11.0.0_pre20200924[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2020.5_pre20201107[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-util/spirv-headers-1.5.4 - doc? ( dev-ruby/asciidoctor ) - test? ( - dev-cpp/gtest - $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]') - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2020.4-fix-build.patch -) - -# https://github.com/google/shaderc/issues/470 -RESTRICT=test - -python_check_deps() { - if use test; then - has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - cmake_comment_add_subdirectory examples - - # Unbundle glslang, spirv-headers, spirv-tools - cmake_comment_add_subdirectory third_party - sed -i \ - -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \ - glslc/test/CMakeLists.txt || die - - # Disable git versioning - sed -i -e '/build-version/d' glslc/CMakeLists.txt || die - - # Manually create build-version.inc as we disabled git versioning - cat <<- EOF > glslc/src/build-version.inc || die - "${P}\n" - "$(best_version dev-util/spirv-tools)\n" - "$(best_version dev-util/glslang)\n" - EOF - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DSHADERC_SKIP_TESTS="$(usex !test)" - -DSHADERC_ENABLE_WERROR_COMPILE="false" - ) - cmake_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi && use doc; then - cmake_src_make glslc_doc_README - fi - cmake_src_compile -} - -multilib_src_install() { - if multilib_is_native_abi; then - use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) - fi - cmake_src_install -} diff --git a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild new file mode 100644 index 000000000000..d116c32b130b --- /dev/null +++ b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) + +CMAKE_ECLASS=cmake + +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Collection of tools, libraries and tests for shader compilation" +HOMEPAGE="https://github.com/google/shaderc" +EGIT_COMMIT="3fe94c6a76d2b617e7fb20fdf3cde98001a274e3" +SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="doc test" + +RDEPEND=" + >=dev-util/glslang-11.2.0[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2021.0_pre20210327[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/spirv-headers-1.5.4.2_pre20210327 + doc? ( dev-ruby/asciidoctor ) + test? ( + dev-cpp/gtest + $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.4-fix-build.patch +) + +# https://github.com/google/shaderc/issues/470 +RESTRICT=test + +python_check_deps() { + if use test; then + has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]" + fi +} + +src_prepare() { + cmake_comment_add_subdirectory examples + + # Unbundle glslang, spirv-headers, spirv-tools + cmake_comment_add_subdirectory third_party + sed -i \ + -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \ + glslc/test/CMakeLists.txt || die + + # Disable git versioning + sed -i -e '/build-version/d' glslc/CMakeLists.txt || die + + # Manually create build-version.inc as we disabled git versioning + cat <<- EOF > glslc/src/build-version.inc || die + "${P}\n" + "$(best_version dev-util/spirv-tools)\n" + "$(best_version dev-util/glslang)\n" + EOF + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DSHADERC_SKIP_TESTS="$(usex !test)" + -DSHADERC_ENABLE_WERROR_COMPILE="false" + ) + cmake_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi && use doc; then + cmake_src_make glslc_doc_README + fi + cmake_src_compile +} + +multilib_src_install() { + if multilib_is_native_abi; then + use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) + fi + cmake_src_install +} -- cgit v1.2.3