gentoo auto-resync : 14:01:2023 - 17:52:11

5 files changed, 9 insertions, 112 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 285d373338f0..b256d34f8a55 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -5,10 +5,8 @@ AUX libplacebo-5.229.1-python-executable.patch 400 BLAKE2B 1de79b031d4aa7c55e058
 AUX libplacebo-5.229.1-shared-glslang.patch 737 BLAKE2B b2a17ad66de37414790a1a4a5360def84326867e5f63959156daeb4aa9ead676279f730912e6c98e40d6322637178408d68d9a08ad542a40b1fb6b02c242b9b7 SHA512 902feb8e0752a9ce5b50dd040015368a1ed3eb90fb78713093c43a66eb881b2f2c8872fab60d695e9cdd4821b84f6e75e5e5a3416c592d86e1a70ff5a2667b61
 DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262
 DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
-DIST libplacebo-v5.229.1.tar.gz 673121 BLAKE2B 0a59e16b4565b10b222c5a5a8e607670bd4010a2be9b99ebdc15638827fcaf21bbf3c16a3cd2b902bcef43041dec56441494a0f618094e14db8f99a9d314c621 SHA512 45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334
 DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165
-EBUILD libplacebo-4.192.1-r2.ebuild 2333 BLAKE2B e3c2735e64a54f34c83b14d425e8c99170e9d8048bd02ae1b4fc44e676b8fe1e03d92bcfbc7d353186a98387c0609d767bfe118d2e64e54baba577fe58b7071f SHA512 49008898a94dd60fd96a9489dca9421c2d3d6a34bcc3a9b8dd953707a4f7a6a7534112a4cd4bc339b637317590c8329b210eb8310924f3bb945a806f884536b7
-EBUILD libplacebo-5.229.1.ebuild 3073 BLAKE2B 6d6aa844a1d7e9104cd88709055b1b82901ca8ff89c2ee5c395ed1d097973a893e751941c27b90030d10284dd612fc10353f4d7af11c5c72f3bda369e0d32bc6 SHA512 80c9b7fce7ce70ee18db44a16c1a12cc076fb49ba856b7855192c866b52a34161687b12af6e512a4ef06e19aac0f134548ada3bd524bcffb5be1f1bd9eab121d
-EBUILD libplacebo-5.229.2.ebuild 3074 BLAKE2B 55a9c4109bf201ac64ae46fa50e8a9e61d482769ee53ae332e3e27de1bba9228a9a6bd38c93890410b9a5d918d04f72570fba51f90dcce2766c1af3a94a02565 SHA512 ca846167b0d355c5d8bcf4b1fe11b3e72868a5e9aa53d65700041b938a586aed92bd6321a6a7ce2f135053038a03f184324530cc05c078c0cacc6f405e9335e8
-EBUILD libplacebo-9999.ebuild 3076 BLAKE2B 81c80fe48d52835d60315a19a364a700d10f5d2217aa1a89ae2e6cca9e22c5cfd761bf9db1a7bd02da61f74fe0a0e83d9f29e932548f480cef237f140812ab6c SHA512 83fc05ee35a6b4fc8e5085c8b1bc6792ce3d63ddfede2dbeafac753c88afe2ae8c50ccafd51343ecfe3a8cde0bffcad020ca99972344c74a9eed59912ee6996d
+EBUILD libplacebo-4.192.1-r2.ebuild 2337 BLAKE2B 59df7348e231e55cc96037ccfb9084fe66f053ea72fc7f34a2e77597cd7187b744e060bdb031ba3a482a7511a0ff3a1ff76c00153d12f8b1287287def74c61b6 SHA512 b179a958d850445108d755b5a8c9770ba87c9554584654e34a684cf80ea8eb20172b562ad817245218075b07d860881b0ab8a90c1758633815fcf55e5edacac5
+EBUILD libplacebo-5.229.2.ebuild 3073 BLAKE2B 88d52ee2c99e9343d11605e0ac0fd978f961fe4e54af8dbb9b76ec90a789cee3fc0ac32ab57bb05905e61d987af5d2796c32e61505dc87d08f9e4181c3aac1db SHA512 a777977ffec07fe99707cf3d73207e618f81f8f3704a89e6834558e21e4c65ee6326c0c6e283fd68621e75bcbede050edc3a697f2838395f23c14d88e8438ca4
+EBUILD libplacebo-9999.ebuild 3026 BLAKE2B 2d205e1fdcd490e1def24c7ece6b64f5ffc5bd22b7ffe50fb3ee2087644f23df3f29f777a672bbdb00b6beaa12a3617ab836dc4485f68b062e4bb163d8478b59 SHA512 2b6798bded10aee7802425bd8b8c249cd4449cb3d909dd93dffbda5ce8226e71002ef5843a25bbdee5af30fdbdd46b9a80ec38485f1c0def667bc880bc5fc6e7
 MISC metadata.xml 678 BLAKE2B 7b4c70ba3d89a81182905365354eaac312888c492a33e2d7b410c79139af9680aeac65c2dc6b692410e601c9bba13c4ff16f80c48c2d9accc3d5d1f82be5395f SHA512 64cd5d5d2231ed1bf6298f074d56471bf158ea29fdac3c4d7f1e54b7259e4ce294b6c1ed31b1397fad952224e9211778bdb59dd33c429870fd58ab9931ab0677
diff --git a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
index 96e2470a8d31..6f8a4dbea00f 100644
--- a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
+++ b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
@@ -53,7 +53,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
deleted file mode 100644
index 06ebf3b6e6a7..000000000000
--- a/media-libs/libplacebo/libplacebo-5.229.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	GLAD_PV=2.0.1 # verify bug #881999 before bumping
-	SRC_URI="
-		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
-		opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="amd64 ppc64 x86"
-fi
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://code.videolan.org/videolan/libplacebo/"
-
-LICENSE="LGPL-2.1+ opengl? ( MIT )"
-SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
-IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-# libglvnd is used with dlopen() through glad (inc. egl/gles)
-RDEPEND="
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
-	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
-	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-# vulkan-headers is required even with USE=-vulkan (bug #882065)
-DEPEND="
-	${RDEPEND}
-	dev-util/vulkan-headers"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]')
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
-	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
-	"${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch
-)
-
-python_check_deps() {
-	# note: setuptools can be removed when using >=glad-2.0.2
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=( $(usev opengl 3rdparty/glad) )
-		git-r3_src_unpack
-	else
-		default
-		if use opengl; then
-			rmdir "${S}"/3rdparty/glad || die
-			mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# typically auto-skipped, but may assume usable opengl/vulkan then hang
-	sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die
-	sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddemos=false #851927
-		$(meson_use test tests)
-		$(meson_feature lcms)
-		$(meson_feature opengl)
-		$(meson_feature opengl gl-proc-addr)
-		$(meson_feature shaderc)
-		$(usex shaderc -Dglslang=disabled $(meson_feature glslang))
-		$(meson_feature unwind)
-		$(meson_feature vulkan)
-		$(meson_feature vulkan vk-proc-addr)
-		-Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
-	)
-
-	meson_src_configure
-}
diff --git a/media-libs/libplacebo/libplacebo-5.229.2.ebuild b/media-libs/libplacebo/libplacebo-5.229.2.ebuild
index 95d5231d0b11..d89de1f37823 100644
--- a/media-libs/libplacebo/libplacebo-5.229.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-5.229.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
@@ -15,7 +15,7 @@ else
 		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
 		opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ppc64 x86"
 fi
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index fce1ddbf5e43..898b602f306a 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
@@ -51,7 +51,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
 	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
-	"${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch
 )
 
 python_check_deps() {