gentoo auto-resync : 19:07:2022 - 20:39:44

5 files changed, 97 insertions, 4 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f52601cadc2b..772e8c0cc46e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 8925958d8610..95dc7f97f246 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -3,5 +3,5 @@ DIST libdc1394-2.2.5.tar.gz 611918 BLAKE2B 64a5e156bfcef1f7a0ab2ec9be6cab65cf47b
 DIST libdc1394-2.2.6.tar.gz 612067 BLAKE2B bf2c5f1ce86220229d66db0549a637efeeb2bf80880fefc830510c65d7a63090b79f1c40df7a12f655808263b7ac5166391a5de63b2158a804e30edee35e89e9 SHA512 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25
 DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda495c25dc3e1e87499f61b67373870c4b3f171edd9e5cf20e29c5d4c1eb11858001c67658e06715be3550668a61d SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55
 EBUILD libdc1394-2.2.5-r1.ebuild 1381 BLAKE2B afe9d0304ab4c83decba846eb6d5ba775aee2407f8f1a516d9d6698633c6227aad649dd863c58bf98240b345b4a7e7968712332d6e77f8c5d44e726caf09f315 SHA512 b0d1c5d5120f87717491693fa4608a3f3cc65e6cf1940c9fed3dfdfea98a50f1152d5644ac5da30ac7d937230e964fb1c3996aa28ddb12033633812e758b18a2
-EBUILD libdc1394-2.2.6.ebuild 1398 BLAKE2B 0cce6b4373de4c956f470324537e6d092a42fb2d910e8a02c167a07707964b63876caf7314262d1a1751f104cde304a96db7884a6304d7c9e599e038e2c4e506 SHA512 079869c65e4ad1deb9ccc21ed79a6109f2e1fad14e0c87aaeb980a3c4b29cc219c0d273460e9c5ae444ff79de292e23abdc052fbbba46ae8b911060ecf7d5f9e
+EBUILD libdc1394-2.2.6.ebuild 1397 BLAKE2B c33a542e7d91c3dc5c4ac4f233d52a049c6cbffcf9e74fefe72b35875d4040fcb58b3decf941b58ca96d9c2d30bc4e19812354c0b0d33fc80f6fed4f800fb58f SHA512 923485f2195665943e4924508357f94924709abb7958a62855912380f369c8f2b353fe2bdd0256db3ed360fe93269367fb7a30b9bec7726ec1add034d2829ac7
 MISC metadata.xml 311 BLAKE2B 92e311962edf0811711167da50628966e8e928e12c629a137ae9b9bdf7bffc5d9c11ec1060ca1e1722877c983ec5bf9f6e72b3ddfbee2447ffeefdf7a099aa93 SHA512 8c9df8a206c5d7930e3a181bde5d7699d98fbdd16ab959a351315446fe2f2bda24c913ff46adc4865e372e14972a45adfa7e16ceaf0792feb587850456f0e7f2
diff --git a/media-libs/libdc1394/libdc1394-2.2.6.ebuild b/media-libs/libdc1394/libdc1394-2.2.6.ebuild
index 22af7967eee9..30492f47103c 100644
--- a/media-libs/libdc1394/libdc1394-2.2.6.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2/25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 68189969fadf..c558870b5a48 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +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
 EBUILD shaderc-2022.1-r1.ebuild 2104 BLAKE2B 4804181cd83601ecd542de5d80598d9e5066973fd64d5b848d487657185de002aabb3141d7d6779df85899093734126a2f4507eca1d9562fa45cf3cf2ea26e28 SHA512 8386390f27797f855254cf79b81d192e7322e93054b77c3b14ec41645e8b7f75f0b916ecf8f81180a404ef796832a08be5647111899248ec24f111b85687cf61
+EBUILD shaderc-2022.1-r2.ebuild 2107 BLAKE2B 09019dd0d66d341f596b283b96cda333c862d9d7b8240f46b33abf84a2e71de74bb455c585630006585a1ba07058c95dee1572783ff639c320822115eae5a2aa SHA512 673e001db812123fcd89f0cbe3fcdc9e89ed00720c58ac986e246439f867634246ca3e47df9b5bb582096443af2c7c658898faaa7ecfe2783e066b2fc568481c
 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
new file mode 100644
index 000000000000..510a9ffae13b
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2022.1-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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="${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
+	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|\$<TARGET_FILE:spirv-dis>|${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
+}