From d91034bb707551b50209cfd2b2225da76fc88126 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 23 Oct 2023 20:37:30 +0100
Subject: gentoo auto-resync : 23:10:2023 - 20:37:30

---
 media-video/Manifest.gz         | Bin 25387 -> 25383 bytes
 media-video/mpv/Manifest        |   2 +-
 media-video/mpv/mpv-9999.ebuild |  22 ++++++++++------------
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'media-video')

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 57510fa3dc48..221dd9c76718 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index cd5197596d08..e0dc92d3fc28 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -6,5 +6,5 @@ DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 EBUILD mpv-0.35.1-r2.ebuild 7652 BLAKE2B 7042109178a580d3d88bf7781cc7d1e8c503ba404eaff4512061a1d6526aa4aedb33537e103dedf5d2beec61fd4978b1762dd6de8950b1a31effadd601e5a905 SHA512 594c7b3a433ff96ec7ea84633e5660580fcf5b79d1c3021714d1b79782065e391895762795ccd796c3ad265b4c087ebc75582b07a8a8d6b5b7a66ff3bd9d93bb
 EBUILD mpv-0.36.0-r1.ebuild 7525 BLAKE2B d42bce2d6ccfc7a856f1f58fead84fb73dbeaffbee1136ccfdf817bfc2c265eabc6b5847f556887dd22674c726467d8d8d991da44733721abaa552827ec2743a SHA512 efeb54cab013523c250ce5531d7858e4fab3b7999e63508aa66c126e79b51a74db43afa6971035029d32effb7aa363ba3423993cd513d1de1272c5d16c5d780b
-EBUILD mpv-9999.ebuild 7186 BLAKE2B fd2a72c32fa9f6bb23f2b2c8dd2a4ac34e5e60295123b148cdf38063fe7a0deeaeb33c6bb4f83f8a7dd9f3bfddd73bde05f575eca926c0e4d7df91ad7aaf5766 SHA512 227c0f7bc13355e900600c63e6bd80bcce94368cebf9241946ff8180217bf2ac716156abec598b422c6e35b55fc89317f385d7cf3c8b33a8e1467ebcdb81c2cb
+EBUILD mpv-9999.ebuild 7055 BLAKE2B 9aae0ce752991cdc1f616a06665392dcadedb27eefac6d6480a987c4fc37eeafc34e52d4c6f9b8de1e8ef636a421e6fc44c801b8b1e8a83ee4f1c87e08d9f062 SHA512 e8c8a207278cf15b8328fb2c1a7a103bbe6db55adc98eef4fa012ca212b5771ea81b2145c97939832afdfb6cbd343a8afa3118efe9a6e5cd99dffc7d6c8b1aab
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 1175525fffac..534bec70ead1 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -23,15 +23,14 @@ SLOT="0/2" # soname
 IUSE="
 	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
 	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
-	+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
-	raspberry-pi rubberband sdl selinux sixel sndio test tools
-	+uchardet vaapi vdpau vulkan wayland xv zimg zlib
+	+lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi
+	rubberband sdl selinux sixel sndio test tools +uchardet vaapi
+	vdpau vulkan wayland xv zimg zlib
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( cli libmpv )
 	egl? ( || ( X drm wayland ) )
-	libplacebo? ( || ( egl opengl vulkan ) )
 	lua? ( ${LUA_REQUIRED_USE} )
 	nvenc? ( || ( egl opengl vulkan ) )
 	opengl? ( || ( X aqua ) )
@@ -40,7 +39,7 @@ REQUIRED_USE="
 	uchardet? ( iconv )
 	vaapi? ( || ( X drm wayland ) )
 	vdpau? ( X )
-	vulkan? ( || ( X wayland ) libplacebo )
+	vulkan? ( || ( X wayland ) )
 	xv? ( X )
 "
 RESTRICT="!test? ( test )"
@@ -48,6 +47,7 @@ RESTRICT="!test? ( test )"
 # raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
 COMMON_DEPEND="
 	media-libs/libass:=[fontconfig]
+	>=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
 	>=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
 	X? (
 		x11-libs/libX11
@@ -72,7 +72,10 @@ COMMON_DEPEND="
 		media-libs/libdvdnav
 		media-libs/libdvdread:=
 	)
-	egl? ( media-libs/libglvnd )
+	egl? (
+		media-libs/libglvnd
+		media-libs/libplacebo[opengl]
+	)
 	gamepad? ( media-libs/libsdl2[joystick] )
 	iconv? (
 		virtual/libiconv
@@ -83,10 +86,6 @@ COMMON_DEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	lcms? ( media-libs/lcms:2 )
 	libcaca? ( media-libs/libcaca )
-	libplacebo? (
-		>=media-libs/libplacebo-6.292:=[opengl?,vulkan?]
-		egl? ( media-libs/libplacebo[opengl] )
-	)
 	lua? ( ${LUA_DEPS} )
 	openal? ( media-libs/openal )
 	opengl? ( media-libs/libglvnd[X?] )
@@ -204,7 +203,6 @@ src_configure() {
 		$(meson_feature drm)
 		$(meson_feature jpeg)
 		$(meson_feature libcaca caca)
-		$(meson_feature libplacebo)
 		$(meson_feature mmal rpi-mmal)
 		$(meson_feature sdl sdl2-video)
 		$(meson_feature sixel)
@@ -242,7 +240,7 @@ src_configure() {
 
 		# notable options left to automagic
 		#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
-		#vulkan-interop: USE="libplacebo vulkan" + ffmpeg-9999 currently
+		#vulkan-interop: USE="vulkan" + ffmpeg-9999 currently
 		# TODO?: perhaps few more similar compound options should be left auto
 	)
 
-- 
cgit v1.2.3