From 04b35f566703f8bb84d52e8d2ff2f0f54c21900b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Nov 2023 22:34:27 +0000 Subject: gentoo auto-resync : 10:11:2023 - 22:34:26 --- media-libs/shaderc/Manifest | 5 +- media-libs/shaderc/shaderc-2023.4.ebuild | 79 ----------------------------- media-libs/shaderc/shaderc-2023.6-r1.ebuild | 79 +++++++++++++++++++++++++++++ media-libs/shaderc/shaderc-2023.7.ebuild | 6 +-- 4 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 media-libs/shaderc/shaderc-2023.4.ebuild create mode 100644 media-libs/shaderc/shaderc-2023.6-r1.ebuild (limited to 'media-libs/shaderc') diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index daa9f85e717e..8fa4896d12be 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,8 +1,7 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed -DIST shaderc-2023.4.tar.gz 225728 BLAKE2B b033f9d5e8afdf53afb5c3299a2b0496558b25d4fb1b04eab0ab1610377c391084fcb952bf2836bf88078e902e78bd579d46ae8f07aaed42569edbbc21b0d5c9 SHA512 18b7c31eec9408fc038211d4424d5d82414f427a580ec6f412e9e8d6a7e060e4c39d2c223bfbbf4bd167a1575a7bb900591ff834b3356f4024772e0b96993e91 DIST shaderc-2023.6.tar.gz 226361 BLAKE2B 023ce15caaff6ff9474f361c6c5442fd8c58bbb079774fd3c8525824e70e63c1b8fff37490601b599f4ed44f4bfaec3ca746b7a734782fc2af8d78c4f1f1de53 SHA512 6580384ac27c4f2225529873ba46ca61240bdf63f4f5b89875e9bd20a774fed49328094379b7f469c3b97b6a3744cb649998c0d6d5a391023317a64a91754bb1 DIST shaderc-2023.7.tar.gz 227360 BLAKE2B de5ee8cc35bc76ba1301e80217587cbf55885999297755d78a72fe0940431351d4070cdd0793fe8f43208d40c9ec343bbe888da2b8ded471bd241be067b1addf SHA512 f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269 -EBUILD shaderc-2023.4.ebuild 1899 BLAKE2B 1750ba01044a0e6f369fe72796280836c71af9442bfc934d9a9b3a9d40f46fa23243e05bcde109dda9f659a5b169837dc23887a9997b0c15be3edb54e6a17a00 SHA512 8ea726bf609eb38785455797087bd87cad0aaca33e720def5140a2fbc50f5b95a7cb0b6c58ebb68125e78633b24b6ff4970834b81c6de850c2836c64100595b9 +EBUILD shaderc-2023.6-r1.ebuild 1906 BLAKE2B eec778484c3a322ad2b852c8d3da8d550af95a2a1d047f48c93b62e1309a801e6ecbe7182488ef2017a9a757bb89c2140814b1734188a787793c660f6c8199f5 SHA512 015c8c6abb9380e10e67d98d47b863c982fa1fdd83b18269c174e124119010696fb68eff887f23e950828285c14c3d2dc0ff2a785f0c87af7daf59da45603487 EBUILD shaderc-2023.6.ebuild 1906 BLAKE2B 744fc1948e5949d636559bbe24db795f7228846f37504bb6c6ecbc104fb9d737f4a96273af5a35daebbad241f01c1b10817421cd07d3a6f7b3d8b34b9bbd13da SHA512 5fc386bd7e9bfd6d0137a28d8220b811a5dc4e0a4632d95cbeaddf1d3c29a437d052d0a07d3543455de03dca2aa188fc87d17190fb4ec1e28b65e0af6b98ed9e -EBUILD shaderc-2023.7.ebuild 1909 BLAKE2B c210bb6ac8c5f097b32083183cb555bbe1977616cb4312156a1b14bc01364512dfcd7e333d78aa5bea5d0905467a05de4dcc4edbe75abd5339620db73252d202 SHA512 8d34d9ee6571392bbd0fb6657b3f9d1406344a9316519dd9c144ec01db1322eaa242c7a88a3322bbef8809462bbe5f7f0a96b0f8a5eb6c1224190dba4eadf0db +EBUILD shaderc-2023.7.ebuild 1906 BLAKE2B 6e6c794d72a5fa293ed884344ded3d8d21f4f439f5c1f01b88224ffa24e5d091aec683983d67aa09ab3872b85dd0a6f9af5b3ea8e235bd14d7941b2b5fa7160d SHA512 1b4e82c73c5fecd533e25517d7e600d12760b9d1ac290ef095a3fdc213b7bb0bc88005ab353e274408388b5b40f3a7b95618124f0d3bf6491160e978e86b64e2 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70 diff --git a/media-libs/shaderc/shaderc-2023.4.ebuild b/media-libs/shaderc/shaderc-2023.4.ebuild deleted file mode 100644 index fbb683b556cc..000000000000 --- a/media-libs/shaderc/shaderc-2023.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib multibuild 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 ~riscv x86" -IUSE="doc" - -RDEPEND=" - >=dev-util/glslang-1.3.250:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-1.3.250[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-util/spirv-headers-1.3.250" - -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 -} diff --git a/media-libs/shaderc/shaderc-2023.6-r1.ebuild b/media-libs/shaderc/shaderc-2023.6-r1.ebuild new file mode 100644 index 000000000000..74887a3cb668 --- /dev/null +++ b/media-libs/shaderc/shaderc-2023.6-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +inherit cmake-multilib multibuild 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 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc" + +RDEPEND=" + ~dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + ~dev-util/spirv-headers-1.3.261" + +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 +} diff --git a/media-libs/shaderc/shaderc-2023.7.ebuild b/media-libs/shaderc/shaderc-2023.7.ebuild index 1cdf6cf9b869..fc654ae93d20 100644 --- a/media-libs/shaderc/shaderc-2023.7.ebuild +++ b/media-libs/shaderc/shaderc-2023.7.ebuild @@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86" IUSE="doc" RDEPEND=" - >=dev-util/glslang-1.3.268:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-1.3.268[${MULTILIB_USEDEP}] + ~dev-util/glslang-1.3.268:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-tools-1.3.268[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} ${PYTHON_DEPS} - >=dev-util/spirv-headers-1.3.261" + ~dev-util/spirv-headers-1.3.268" BDEPEND="doc? ( dev-ruby/asciidoctor )" -- cgit v1.2.3