From b77e1a6cc7c668e135d139c5ec5ad0ae1c11b857 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Oct 2022 03:02:28 +0000 Subject: gentoo auto-resync : 30:10:2022 - 03:02:28 --- media-libs/shaderc/Manifest | 3 +- media-libs/shaderc/shaderc-2022.1-r2.ebuild | 88 ----------------------------- media-libs/shaderc/shaderc-2022.2-r1.ebuild | 79 ++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 90 deletions(-) delete mode 100644 media-libs/shaderc/shaderc-2022.1-r2.ebuild create mode 100644 media-libs/shaderc/shaderc-2022.2-r1.ebuild (limited to 'media-libs/shaderc') diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 125e5468be93..26854570844d 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,6 +1,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed -DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b DIST shaderc-2022.2.tar.gz 223386 BLAKE2B feb18bef51bea72574d784d4992e5b8514b0d1d70fbd9194ad842a361740ed3d66c6c3d2cf6114a0ef77279845ab686d01ad5fcd91cbddcc289cee4e521aec6a SHA512 85962f17d07496ba4cef3ad62dc7fd1967ff628449ceb1fec77336211fddbd2554ea94e5558cfaf2cfe4dcfdf6f56744d905714be7dbb776ba2bcd67e4665039 -EBUILD shaderc-2022.1-r2.ebuild 2093 BLAKE2B e94a3d6b2d47ef5cfdfa7462d5b0a097dd328b12f0178ce435b3dfa7a296bd67c94851737d686992d24414504f495716629a7aba75e313398ef2f07a11bdcf7b SHA512 cddf402a44c048967e39d6b4d121e918958b1c54c229cf2b2de730fb8f733edaace541308c39bd8bbcd04e15b1b440938f097a0360383400fe37c08534206ff3 +EBUILD shaderc-2022.2-r1.ebuild 1879 BLAKE2B cca8a6b8c1114e2a52ad15201e386508f04b64fb4a5f486e51361a6136d2ec7bea96940fd412b6bf3d1568e7dad1d6b57cb047e45923177ea0509b007608a741 SHA512 f34c1d8eeb813a261b970d6eec24c8d85e1613b3a21d6b9ba61a99a6713870fb8c64643c24ff544ada75b3af7b4a0229be23c6a1938ee94e5e4a9f150f18cc0d EBUILD shaderc-2022.2.ebuild 2093 BLAKE2B f9df1d4f1d3e2f036754ea7cd87df3cadd6e2a13500aecc0950cc3b3660eadacac3e64ea72155667b80f27d1f1a49a5b814545009f082586629c12646595dbf9 SHA512 0ee15477b10936deabf08572c3e54c31391b4b01b792880cba40bc762217cff266e58791f7d8734cae136b2649c19da90149b05e3485d5870ebf9867a51643f8 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70 diff --git a/media-libs/shaderc/shaderc-2022.1-r2.ebuild b/media-libs/shaderc/shaderc-2022.1-r2.ebuild deleted file mode 100644 index 9e5933824f86..000000000000 --- a/media-libs/shaderc/shaderc-2022.1-r2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Collection of tools, libraries and tests for shader compilation" -HOMEPAGE="https://github.com/google/shaderc" -EGIT_COMMIT="${PV}" -SRC_URI="https://github.com/google/${PN}/archive/v${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-1.3.216[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-1.3.216[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-util/spirv-headers-1.3.216 - test? ( dev-cpp/gtest ) -" -BDEPEND="doc? ( dev-ruby/asciidoctor ) - test? ( $(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 - python_has_version "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_compile 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-2022.2-r1.ebuild b/media-libs/shaderc/shaderc-2022.2-r1.ebuild new file mode 100644 index 000000000000..42aa3aa3e57d --- /dev/null +++ b/media-libs/shaderc/shaderc-2022.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Collection of tools, libraries and tests for shader compilation" +HOMEPAGE="https://github.com/google/shaderc" +EGIT_COMMIT="${PV}" +SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" +IUSE="doc" + +RDEPEND=" + >=dev-util/glslang-1.3.224[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-1.3.224[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/spirv-headers-1.3.224" + +BDEPEND="doc? ( dev-ruby/asciidoctor )" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.4-fix-build.patch +) + +# https://github.com/google/shaderc/issues/470 +RESTRICT=test + +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="true" + -DSHADERC_ENABLE_WERROR_COMPILE="false" + ) + cmake_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi && use doc; then + cmake_src_compile 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