From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE5D813835A for ; Thu, 17 Dec 2020 02:41:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EB3BE09F7; Thu, 17 Dec 2020 02:41:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFD74E09F7 for ; Thu, 17 Dec 2020 02:41:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0C44340EB8 for ; Thu, 17 Dec 2020 02:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E97C2C5 for ; Thu, 17 Dec 2020 02:40:57 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1608172819.94127c3a68228a52440a458afd5cbab5d0f5c7b5.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/shaderc/Manifest media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild X-VCS-Directories: media-libs/shaderc/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 94127c3a68228a52440a458afd5cbab5d0f5c7b5 X-VCS-Branch: master Date: Thu, 17 Dec 2020 02:40:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b95282c6-b9ba-4fdf-8dac-5b30877a7e89 X-Archives-Hash: d82bd3e928a15c72b48e1c98bc62a3e5 commit: 94127c3a68228a52440a458afd5cbab5d0f5c7b5 Author: Nick Sarnie gentoo org> AuthorDate: Thu Dec 17 02:23:09 2020 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Thu Dec 17 02:40:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94127c3a media-libs/shaderc: Version bump and drop old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Nick Sarnie gentoo.org> media-libs/shaderc/Manifest | 1 + .../shaderc/shaderc-2020.5_pre20201216.ebuild | 92 ++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index d04536b9863..4e746dc81cf 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1 +1,2 @@ DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2 +DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3 diff --git a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild new file mode 100644 index 00000000000..63a26151653 --- /dev/null +++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,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="4089217d30c1f035c44a08255b875b5fea4f4bc5" +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_pre20201216[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2020.6[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/spirv-headers-1.5.4.1 + 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 +}