gentoo auto-resync : 13:03:2023 - 18:16:03

3 files changed, 104 insertions, 8 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index e9c413310dbf..8ee5cc35a3b5 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -2,7 +2,10 @@ AUX libplacebo-5.229.1-llvm-libunwind.patch 418 BLAKE2B 0042bc6404de57fbbb814ebc
 AUX libplacebo-5.229.1-python-executable.patch 400 BLAKE2B 1de79b031d4aa7c55e058db788d2ba3ed6a66e58dac325a091b40be58b95e6cbacf852a0f1e84465d2834ecd07aa920390b90a81e03c3e21825eb0ed56c2b68f SHA512 5b8c1f5856b1e0cf67a306fc7b3fce552f26c4e8d785a2a0570b1ea983d487cd235fb9bed10f86747597f19d2b2d9a920b19a88acf3e48d44aeaa999849cff76
 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-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7
 DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165
+DIST libplacebo-v5.264.0.tar.gz 725109 BLAKE2B 0d2670df216f5e5dcc69a102b6bd7327195d538f683989360452a2bfa7ee8a673353b192b64d636a0cbdcd0caf7792099174c4c8cd63b3f163d7014f43efb6f2 SHA512 60583f97e719c9a164a3c62ca79f6ab24d2a5cd6e2e13b98a0e1eb59fe8ed9903b78cac642889566aa94b718937461413901f8509aacf9a6bfdb1d456a1bce53
 EBUILD libplacebo-5.229.2.ebuild 3073 BLAKE2B 88d52ee2c99e9343d11605e0ac0fd978f961fe4e54af8dbb9b76ec90a789cee3fc0ac32ab57bb05905e61d987af5d2796c32e61505dc87d08f9e4181c3aac1db SHA512 a777977ffec07fe99707cf3d73207e618f81f8f3704a89e6834558e21e4c65ee6326c0c6e283fd68621e75bcbede050edc3a697f2838395f23c14d88e8438ca4
-EBUILD libplacebo-9999.ebuild 3026 BLAKE2B 2d205e1fdcd490e1def24c7ece6b64f5ffc5bd22b7ffe50fb3ee2087644f23df3f29f777a672bbdb00b6beaa12a3617ab836dc4485f68b062e4bb163d8478b59 SHA512 2b6798bded10aee7802425bd8b8c249cd4449cb3d909dd93dffbda5ce8226e71002ef5843a25bbdee5af30fdbdd46b9a80ec38485f1c0def667bc880bc5fc6e7
+EBUILD libplacebo-5.264.0.ebuild 2888 BLAKE2B 86e5685f2ce2a707ace7f7d39cd4d29e57a5dbb0d2730d3d9f573dc92b9d74b741df7458681271cee33461d5a9a83d536b1d80d9c9a334aa5d34049e9613c8c4 SHA512 095f45ae3550878e17abf666e1db9d58e7ab9e274f921508aa06d4fc1575f233b2100ff238d23749e739d4f97af179ef41cd6fa9b8cf1d17c60a0f32e1cb4dd5
+EBUILD libplacebo-9999.ebuild 2888 BLAKE2B 86e5685f2ce2a707ace7f7d39cd4d29e57a5dbb0d2730d3d9f573dc92b9d74b741df7458681271cee33461d5a9a83d536b1d80d9c9a334aa5d34049e9613c8c4 SHA512 095f45ae3550878e17abf666e1db9d58e7ab9e274f921508aa06d4fc1575f233b2100ff238d23749e739d4f97af179ef41cd6fa9b8cf1d17c60a0f32e1cb4dd5
 MISC metadata.xml 680 BLAKE2B fd6f94475e6c177de61aa3e6d4444d721f86b535424a59801eddc869c518342bb0dfab13651a31a32d32190d8785f4a15727ad37c6aa30a677d100b94b5ecfd4 SHA512 f64eba1549b22452247867e3a50cb1a59d7e5aa51121741dcf4cb50dc688bb18b648e06f5e851dee4c64008f2cfd5da11c22f3d960ce36ebc5c5fce38ce0b3f8
diff --git a/media-libs/libplacebo/libplacebo-5.264.0.ebuild b/media-libs/libplacebo/libplacebo-5.264.0.ebuild
new file mode 100644
index 000000000000..2759a11085c5
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-5.264.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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.4
+	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}]')
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
+	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${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)
+		-Dlibdovi=disabled # TODO: package libdovi, ask if you need this
+		$(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-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 898b602f306a..2759a11085c5 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -10,7 +10,7 @@ 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
+	GLAD_PV=2.0.4
 	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 )"
@@ -43,9 +43,7 @@ DEPEND="
 	${RDEPEND}
 	dev-util/vulkan-headers"
 BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 	virtual/pkgconfig"
 
 PATCHES=(
@@ -54,9 +52,7 @@ PATCHES=(
 )
 
 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}]"
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 src_unpack() {
@@ -85,6 +81,7 @@ multilib_src_configure() {
 		-Ddemos=false #851927
 		$(meson_use test tests)
 		$(meson_feature lcms)
+		-Dlibdovi=disabled # TODO: package libdovi, ask if you need this
 		$(meson_feature opengl)
 		$(meson_feature opengl gl-proc-addr)
 		$(meson_feature shaderc)