From 8bcae5a5a332db9dc28c20b7a5f28337d8335254 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 5 Apr 2025 01:34:33 +0100
Subject: gentoo auto-resync : 05:04:2025 - 01:34:33

---
 media-video/Manifest.gz              | Bin 23236 -> 23229 bytes
 media-video/mpv/Manifest             |   4 +-
 media-video/mpv/mpv-0.40.0-r1.ebuild | 254 +++++++++++++++++++++++++++++++++++
 media-video/mpv/mpv-0.40.0.ebuild    | 247 ----------------------------------
 media-video/mpv/mpv-9999.ebuild      |  23 ++--
 5 files changed, 271 insertions(+), 257 deletions(-)
 create mode 100644 media-video/mpv/mpv-0.40.0-r1.ebuild
 delete mode 100644 media-video/mpv/mpv-0.40.0.ebuild

(limited to 'media-video')

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 88267acf6d2e..c936afb5419f 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 af3755695619..4a816c8fd56e 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,6 +1,6 @@
 DIST mpv-0.39.0.tar.gz 3494313 BLAKE2B 9f96ba225eb0587d50f8c439359b18f752b98024ab6b40f987be4d57b0ce4b595243f49177ffc48840b351ce19fddc84788b5784b508eb685e58fdfb8e1e0520 SHA512 9cf1d7487b1e9e36d2b731bf951c4d3b9deba95109af408ccfc71b88e85f6de2558e7b4950781667bb4d40e0352742e3ed278559ff34d07905dd459969cbf503
 DIST mpv-0.40.0.tar.gz 3561474 BLAKE2B 618cffca1ec30da0a49b91e168dd1d041e5646f7930fa65ced1f58aabed2e663f6a161c0c71b2f1769fa43a0873d91ef8219f11c5458e8ecb67b4466581c4f90 SHA512 24ccbff7fa34f85c033dc9ed94a364c6226e1081a47086365fc98e332af2004517dede371a005f1d51c2a3306b7dc915df9de4188cea140b1fd988058bbd6e8c
 EBUILD mpv-0.39.0-r1.ebuild 6978 BLAKE2B 5fe607c89e16f6e9c1414107a42bc2e76e6f7eae56b0c0923077ca770e9548f92dfd786d9c29027238ab0d1ed6b86085f2f6ad6e5663a4d037b452acf2d1e064 SHA512 fdf47bdf2ef0442eb1c71feb36cd6ecac6727202fe462a2f4ed67704eb1c4229fa0932da699ccef3a7c72d91d1d7bbc574912505677c44ad92c10523b354b2e1
-EBUILD mpv-0.40.0.ebuild 6076 BLAKE2B e706a980a6a004d6c642baf4ba7e12a8b174a19af91d24c5b31d730a3923849b0280d052b6306803e0ac2f53f765a3dde419f315b4ee0fe2340773aa4a14134e SHA512 15c133ac7088bae48660a4caa9361af8d8a8e3d6dcd42e1e6e2d4beb9968cdf24015a8b8b93d2c91436eb1f1156cccff6a19afc7c8afd072eba6d4f55e3e999d
-EBUILD mpv-9999.ebuild 6116 BLAKE2B e73e9986bc2c2a9f1c49f4c01b6405cc6ba723c6ba1b6a723089f3a5f7d6a4b7588fabaac9494708c5febd4e226ae6eb848a21eb116a00ff1be7ce81ac27ab0a SHA512 a15896aa3adc27bae7afee0e013f032bf71b1556ab530cd901118c0f95c958996526435ca1941616b591601750bdd807c50df653b23bbd4dd73394636a4abd96
+EBUILD mpv-0.40.0-r1.ebuild 6396 BLAKE2B e564a6f7cc6387e3d17ded50f41095fc03ec3f29f0aff26f48a88d81526c65b45b216ccbd30bb9fb2ac95d9d7edb12d894906902b73da85a6b84623d2b612f6b SHA512 ea681453402cd0b6be505d3bba1a3375696c8e0b5cf59613e892837c73dd3f01dfd00a84caee07050b4cd84d2fe8a1126e143860ee72b5a572b1752d993edf51
+EBUILD mpv-9999.ebuild 6436 BLAKE2B e0bddad8d3b94d971a536a8335a53b2defafd31c356f6c2f0f86f74d896e5a2f22776674e50da38e4131841c0054eb744502b49bff4047dac4823a6cbdfe83c2 SHA512 4a684af70bacf19a440b4e6140f2bc59790ac7ba635db4acff9f0b7f6518c7e7adcc7b682caf669372e0e61b81afeeb1fef9fe41777d4016eabe981393617cfa
 MISC metadata.xml 2053 BLAKE2B dc35c3bcdb29eb08725a4f908575ecc2afed2d772988ff12ad052c39e9b195a68611e8037b82ee5ceefc33c40d8df666e03aa59d836eeb7c6472bd988f49b4ee SHA512 4e7cd2da4df81f9ecafddfe93788cabbc4f0de0ff9b976af2ab3fb0f63b2d7daee6d8c5607685240f41be37a158b9fa0acd030d8c62da835891d19af3870668c
diff --git a/media-video/mpv/mpv-0.40.0-r1.ebuild b/media-video/mpv/mpv-0.40.0-r1.ebuild
new file mode 100644
index 000000000000..409716b6966f
--- /dev/null
+++ b/media-video/mpv/mpv-0.40.0-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+else
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/"
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+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
+	+lua nvenc openal pipewire pulseaudio rubberband sdl selinux sixel
+	sndio soc test tools +uchardet vaapi vdpau +vulkan wayland xv zimg
+	zlib
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( cli libmpv )
+	egl? ( || ( X drm wayland ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( || ( egl vulkan ) )
+	test? ( cli )
+	tools? ( cli )
+	uchardet? ( iconv )
+	vaapi? ( || ( X drm wayland ) )
+	vdpau? ( X )
+	vulkan? ( || ( X wayland ) )
+	xv? ( X )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	media-libs/libass:=[fontconfig]
+	>=media-libs/libplacebo-7.349.0:=[vulkan?]
+	>=media-video/ffmpeg-6.1:=[encode(+),soc(-)?,threads(+),vaapi?,vdpau?]
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXpresent
+		x11-libs/libXrandr
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray:= )
+	cdda? (
+		dev-libs/libcdio-paranoia:=
+		dev-libs/libcdio:=
+	)
+	drm? (
+		media-libs/libdisplay-info:=
+		x11-libs/libdrm
+		egl? ( media-libs/mesa[gbm(+)] )
+	)
+	dvd? ( media-libs/libdvdnav )
+	egl? (
+		media-libs/libglvnd
+		media-libs/libplacebo[opengl]
+	)
+	gamepad? ( media-libs/libsdl2[joystick] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( dev-lang/mujs:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	lcms? ( media-libs/lcms:2 )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	openal? ( media-libs/openal )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-libs/libpulse )
+	rubberband? ( media-libs/rubberband:= )
+	sdl? ( media-libs/libsdl2[sound,threads(+),video] )
+	sixel? ( media-libs/libsixel )
+	sndio? ( media-sound/sndio:= )
+	vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? ( media-libs/vulkan-loader[X?,wayland?] )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	zimg? ( media-libs/zimg )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+	dvb? ( sys-kernel/linux-headers )
+	nvenc? ( media-libs/nv-codec-headers )
+	vulkan? ( dev-util/vulkan-headers )
+	wayland? ( >=dev-libs/wayland-protocols-1.41 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/meson-1.3.0
+	virtual/pkgconfig
+	cli? ( dev-python/docutils )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+pkg_pretend() {
+	if has_version "${CATEGORY}/${PN}[X,opengl]" && use !egl; then #953107
+		ewarn "${PN}'s 'opengl' USE was removed in favour of the 'egl' USE as it was"
+		ewarn "only for the deprecated 'gl-x11' mpv option when 'egl-x11/wayland'"
+		ewarn "should be used if --gpu-api=opengl. It is recommended to enable 'egl'"
+		ewarn "unless using vulkan (default since ${PN}-0.40) or something else."
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if use !debug; then
+		if use test; then
+			einfo "Skipping -DNDEBUG due to USE=test"
+		else
+			append-cppflags -DNDEBUG # treated specially
+		fi
+	fi
+
+	local emesonargs=(
+		$(meson_use cli cplayer)
+		$(meson_use libmpv)
+		$(meson_use test tests)
+
+		$(meson_feature cli html-build)
+		$(meson_feature cli manpage-build)
+		-Dpdf-build=disabled
+
+		-Dbuild-date=false
+
+		# misc options
+		$(meson_feature archive libarchive)
+		$(meson_feature bluray libbluray)
+		$(meson_feature cdda)
+		-Dcplugins=enabled
+		$(meson_feature dvb dvbin)
+		$(meson_feature dvd dvdnav)
+		$(meson_feature gamepad sdl2-gamepad)
+		$(meson_feature iconv)
+		$(meson_feature javascript)
+		-Dlibavdevice=enabled
+		$(meson_feature lcms lcms2)
+		-Dlua=$(usex lua "${ELUA}" disabled)
+		$(meson_feature rubberband)
+		-Dsdl2=$(use gamepad || use sdl && echo enabled || echo disabled) #857156
+		$(meson_feature uchardet)
+		-Dvapoursynth=disabled # only available in overlays
+		$(meson_feature zimg)
+		$(meson_feature zlib)
+
+		# audio output
+		$(meson_feature alsa)
+		$(meson_feature coreaudio)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature sdl sdl2-audio)
+		$(meson_feature sndio)
+
+		# video output
+		$(meson_feature X x11)
+		$(meson_feature aqua cocoa)
+		$(meson_feature drm)
+		$(meson_feature jpeg)
+		$(meson_feature libcaca caca)
+		$(meson_feature sdl sdl2-video)
+		$(meson_feature sixel)
+		$(meson_feature wayland)
+		$(meson_feature xv)
+
+		-Dgl=$(use aqua || use egl || use libmpv &&
+			echo enabled || echo disabled)
+		$(meson_feature egl)
+		$(meson_feature libmpv plain-gl)
+
+		$(meson_feature vulkan)
+
+		# hardware decoding
+		$(meson_feature nvenc cuda-hwaccel)
+		$(meson_feature vaapi)
+		$(meson_feature vdpau)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	# ffmpeg tests are picky and easily break without necessarily
+	# meaning that there are runtime issues (bug #921091,#924276)
+	meson_src_test --no-suite ffmpeg
+}
+
+src_install() {
+	meson_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+
+		if use cli && use lua_single_target_luajit; then
+			pax-mark -m "${ED}"/usr/bin/${PN}
+		fi
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_fix_shebang "${ED}"/usr/bin/umpv
+	fi
+
+	if use cli; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${ED}"/usr/share/doc/{mpv,${PF}/html}/mpv.html || die
+		mv "${ED}"/usr/share/doc/{mpv,${PF}/examples} || die
+	fi
+
+	local GLOBIGNORE=*/*build*:*/*policy*
+	dodoc RELEASE_NOTES DOCS/*.{md,rst}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "various websites URL support$(usev !lua \
+		" (requires ${PN} with USE=lua)")" net-misc/yt-dlp
+}
diff --git a/media-video/mpv/mpv-0.40.0.ebuild b/media-video/mpv/mpv-0.40.0.ebuild
deleted file mode 100644
index b17efcfce030..000000000000
--- a/media-video/mpv/mpv-0.40.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-else
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/"
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-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
-	+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
-	sixel sndio soc test tools +uchardet vaapi vdpau +vulkan wayland xv
-	zimg zlib
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( cli libmpv )
-	egl? ( || ( X drm wayland ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	nvenc? ( || ( egl opengl vulkan ) )
-	opengl? ( || ( X aqua ) )
-	test? ( cli )
-	tools? ( cli )
-	uchardet? ( iconv )
-	vaapi? ( || ( X drm wayland ) )
-	vdpau? ( X )
-	vulkan? ( || ( X wayland ) )
-	xv? ( X )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	media-libs/libass:=[fontconfig]
-	>=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?]
-	>=media-video/ffmpeg-6.1:=[encode(+),soc(-)?,threads(+),vaapi?,vdpau?]
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXpresent
-		x11-libs/libXrandr
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	cdda? (
-		dev-libs/libcdio-paranoia:=
-		dev-libs/libcdio:=
-	)
-	drm? (
-		media-libs/libdisplay-info:=
-		x11-libs/libdrm
-		egl? ( media-libs/mesa[gbm(+)] )
-	)
-	dvd? ( media-libs/libdvdnav )
-	egl? (
-		media-libs/libglvnd
-		media-libs/libplacebo[opengl]
-	)
-	gamepad? ( media-libs/libsdl2[joystick] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( dev-lang/mujs:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	lcms? ( media-libs/lcms:2 )
-	libcaca? ( media-libs/libcaca )
-	lua? ( ${LUA_DEPS} )
-	openal? ( media-libs/openal )
-	opengl? ( media-libs/libglvnd[X?] )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-libs/libpulse )
-	rubberband? ( media-libs/rubberband:= )
-	sdl? ( media-libs/libsdl2[sound,threads(+),video] )
-	sixel? ( media-libs/libsixel )
-	sndio? ( media-sound/sndio:= )
-	vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
-	vdpau? ( x11-libs/libvdpau )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?] )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	zimg? ( media-libs/zimg )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-	dvb? ( sys-kernel/linux-headers )
-	nvenc? ( media-libs/nv-codec-headers )
-	vulkan? ( dev-util/vulkan-headers )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/meson-1.3.0
-	virtual/pkgconfig
-	cli? ( dev-python/docutils )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if use !debug; then
-		if use test; then
-			einfo "Skipping -DNDEBUG due to USE=test"
-		else
-			append-cppflags -DNDEBUG # treated specially
-		fi
-	fi
-
-	local emesonargs=(
-		$(meson_use cli cplayer)
-		$(meson_use libmpv)
-		$(meson_use test tests)
-
-		$(meson_feature cli html-build)
-		$(meson_feature cli manpage-build)
-		-Dpdf-build=disabled
-
-		-Dbuild-date=false
-
-		# misc options
-		$(meson_feature archive libarchive)
-		$(meson_feature bluray libbluray)
-		$(meson_feature cdda)
-		-Dcplugins=enabled
-		$(meson_feature dvb dvbin)
-		$(meson_feature dvd dvdnav)
-		$(meson_feature gamepad sdl2-gamepad)
-		$(meson_feature iconv)
-		$(meson_feature javascript)
-		-Dlibavdevice=enabled
-		$(meson_feature lcms lcms2)
-		-Dlua=$(usex lua "${ELUA}" disabled)
-		$(meson_feature rubberband)
-		-Dsdl2=$(use gamepad || use sdl && echo enabled || echo disabled) #857156
-		$(meson_feature uchardet)
-		-Dvapoursynth=disabled # only available in overlays
-		$(meson_feature zimg)
-		$(meson_feature zlib)
-
-		# audio output
-		$(meson_feature alsa)
-		$(meson_feature coreaudio)
-		$(meson_feature jack)
-		$(meson_feature openal)
-		$(meson_feature pipewire)
-		$(meson_feature pulseaudio pulse)
-		$(meson_feature sdl sdl2-audio)
-		$(meson_feature sndio)
-
-		# video output
-		$(meson_feature X x11)
-		$(meson_feature aqua cocoa)
-		$(meson_feature drm)
-		$(meson_feature jpeg)
-		$(meson_feature libcaca caca)
-		$(meson_feature sdl sdl2-video)
-		$(meson_feature sixel)
-		$(meson_feature wayland)
-		$(meson_feature xv)
-
-		-Dgl=$(use egl || use libmpv || use opengl &&
-			echo enabled || echo disabled)
-		$(meson_feature egl)
-		$(meson_feature libmpv plain-gl)
-
-		$(meson_feature vulkan)
-
-		# hardware decoding
-		$(meson_feature nvenc cuda-hwaccel)
-		$(meson_feature vaapi)
-		$(meson_feature vdpau)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	# ffmpeg tests are picky and easily break without necessarily
-	# meaning that there are runtime issues (bug #921091,#924276)
-	meson_src_test --no-suite ffmpeg
-}
-
-src_install() {
-	meson_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-
-		if use cli && use lua_single_target_luajit; then
-			pax-mark -m "${ED}"/usr/bin/${PN}
-		fi
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_fix_shebang "${ED}"/usr/bin/umpv
-	fi
-
-	if use cli; then
-		dodir /usr/share/doc/${PF}/html
-		mv "${ED}"/usr/share/doc/{mpv,${PF}/html}/mpv.html || die
-		mv "${ED}"/usr/share/doc/{mpv,${PF}/examples} || die
-	fi
-
-	local GLOBIGNORE=*/*build*:*/*policy*
-	dodoc RELEASE_NOTES DOCS/*.{md,rst}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "various websites URL support$(usev !lua \
-		" (requires ${PN} with USE=lua)")" net-misc/yt-dlp
-}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index aaf45c44fd62..e79b68414d16 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -23,17 +23,16 @@ 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
-	+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
-	sixel sndio soc test tools +uchardet vaapi vdpau +vulkan wayland xv
-	zimg zlib
+	+lua nvenc openal pipewire pulseaudio rubberband sdl selinux sixel
+	sndio soc test tools +uchardet vaapi vdpau +vulkan wayland xv zimg
+	zlib
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( cli libmpv )
 	egl? ( || ( X drm wayland ) )
 	lua? ( ${LUA_REQUIRED_USE} )
-	nvenc? ( || ( egl opengl vulkan ) )
-	opengl? ( || ( X aqua ) )
+	nvenc? ( || ( egl vulkan ) )
 	test? ( cli )
 	tools? ( cli )
 	uchardet? ( iconv )
@@ -46,7 +45,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	media-libs/libass:=[fontconfig]
-	>=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?]
+	>=media-libs/libplacebo-7.349.0:=[vulkan?]
 	>=media-video/ffmpeg-6.1:=[encode(+),soc(-)?,threads(+),vaapi?,vdpau?]
 	X? (
 		x11-libs/libX11
@@ -85,7 +84,6 @@ COMMON_DEPEND="
 	libcaca? ( media-libs/libcaca )
 	lua? ( ${LUA_DEPS} )
 	openal? ( media-libs/openal )
-	opengl? ( media-libs/libglvnd[X?] )
 	pipewire? ( media-video/pipewire:= )
 	pulseaudio? ( media-libs/libpulse )
 	rubberband? ( media-libs/rubberband:= )
@@ -126,6 +124,15 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 "
 
+pkg_pretend() {
+	if has_version "${CATEGORY}/${PN}[X,opengl]" && use !egl; then #953107
+		ewarn "${PN}'s 'opengl' USE was removed in favour of the 'egl' USE as it was"
+		ewarn "only for the deprecated 'gl-x11' mpv option when 'egl-x11/wayland'"
+		ewarn "should be used if --gpu-api=opengl. It is recommended to enable 'egl'"
+		ewarn "unless using vulkan (default since ${PN}-0.40) or something else."
+	fi
+}
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	python-single-r1_pkg_setup
@@ -192,7 +199,7 @@ src_configure() {
 		$(meson_feature wayland)
 		$(meson_feature xv)
 
-		-Dgl=$(use egl || use libmpv || use opengl &&
+		-Dgl=$(use aqua || use egl || use libmpv &&
 			echo enabled || echo disabled)
 		$(meson_feature egl)
 		$(meson_feature libmpv plain-gl)
-- 
cgit v1.2.3