media-video/mpv: update live

vaapi-egl option just got removed. This along with previous updates
now make vaapi options a lot less confusing and can be used with less
USE being enabled.

`vaapi? ( wayland? ( drm ) )` should also no longer be relevant, it
was primarily added to avoid confusion from mpv-0.34->0.35 upgrade
given the change in behavior that made it non-obvious that USE=-drm
(perhaps disabled long ago) was breaking setups. But 0.34 been gone
for a while now. Not that this means that should disable USE=drm
unless really not being used.

Also adjust gbm handling, technically only uses libgbm with egl-drm.
Still does not feel worth having its own USE=gbm like before.

Plus some minor style adjustments, used it for a while but having
second thoughts about this quoting style.

(note that there is good odds there will be 0.36.1 soon)

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

1 files changed, 16 insertions, 14 deletions

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index c2718b1e8de1..5984f7637494 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -24,8 +24,9 @@ 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"
+	raspberry-pi rubberband sdl selinux sixel sndio test tools
+	+uchardet vaapi vdpau vulkan wayland +xv zimg zlib
+"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( cli libmpv )
@@ -37,13 +38,11 @@ REQUIRED_USE="
 	test? ( cli )
 	tools? ( cli )
 	uchardet? ( iconv )
-	vaapi? (
-		|| ( X egl libplacebo wayland )
-		wayland? ( drm )
-	)
+	vaapi? ( || ( X drm wayland ) )
 	vdpau? ( X )
 	vulkan? ( || ( X wayland ) libplacebo )
-	xv? ( X )"
+	xv? ( X )
+"
 RESTRICT="!test? ( test )"
 
 # raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
@@ -67,8 +66,8 @@ COMMON_DEPEND="
 		dev-libs/libcdio:=
 	)
 	drm? (
-		media-libs/mesa[gbm(+)]
 		x11-libs/libdrm
+		egl? ( media-libs/mesa[gbm(+)] )
 	)
 	dvd? (
 		media-libs/libdvdnav
@@ -116,22 +115,26 @@ COMMON_DEPEND="
 		x11-libs/libxkbcommon
 	)
 	zimg? ( media-libs/zimg )
-	zlib? ( sys-libs/zlib:= )"
+	zlib? ( sys-libs/zlib:= )
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )"
+	tools? ( ${PYTHON_DEPS} )
+"
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	nvenc? ( media-libs/nv-codec-headers )
-	wayland? ( dev-libs/wayland-protocols )"
+	wayland? ( dev-libs/wayland-protocols )
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	cli? ( dev-python/docutils )
-	wayland? ( dev-util/wayland-scanner )"
+	wayland? ( dev-util/wayland-scanner )
+"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
@@ -200,7 +203,6 @@ src_configure() {
 		$(meson_feature X x11)
 		$(meson_feature aqua cocoa)
 		$(meson_feature drm)
-		$(meson_feature drm gbm)
 		$(meson_feature jpeg)
 		$(meson_feature libcaca caca)
 		$(meson_feature libplacebo)
@@ -214,6 +216,7 @@ src_configure() {
 			echo enabled || echo disabled)
 		$(meson_feature egl)
 		$(mpv_feature_multi egl X egl-x11)
+		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
 		$(mpv_feature_multi egl drm egl-drm)
 		$(mpv_feature_multi egl wayland egl-wayland)
 		$(meson_feature libmpv plain-gl)
@@ -231,7 +234,6 @@ src_configure() {
 		$(meson_feature vaapi)
 		$(mpv_feature_multi vaapi X vaapi-x11)
 		$(mpv_feature_multi vaapi drm vaapi-drm)
-		$(mpv_feature_multi vaapi egl vaapi-egl)
 		$(mpv_feature_multi vaapi wayland vaapi-wayland)
 
 		$(meson_feature vdpau)