commit: ca9107e1cd748ea06933d1af3a6a7c8dbef35cb0 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Apr 30 23:17:22 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Apr 30 23:28:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9107e1
media-video/mpv: re-enable gl-x11 only with USE=vdpau Closes: https://bugs.gentoo.org/955122 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../mpv/{mpv-0.40.0-r1.ebuild => mpv-0.40.0-r2.ebuild} | 11 +++++++++-- media-video/mpv/mpv-9999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/mpv-0.40.0-r1.ebuild b/media-video/mpv/mpv-0.40.0-r2.ebuild similarity index 94% rename from media-video/mpv/mpv-0.40.0-r1.ebuild rename to media-video/mpv/mpv-0.40.0-r2.ebuild index b2f382c6a5ec..cd3745e3e962 100644 --- a/media-video/mpv/mpv-0.40.0-r1.ebuild +++ b/media-video/mpv/mpv-0.40.0-r2.ebuild @@ -91,7 +91,10 @@ COMMON_DEPEND=" sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + media-libs/libglvnd[X] + x11-libs/libvdpau + ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland @@ -127,6 +130,9 @@ pkg_pretend() { 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." + ewarn + ewarn "USE=vdpau (for nvidia) still enables gl-x11 as it requires it, however" + ewarn "it is recommended to instead use --hwdec=nvdec (USE=nvenc) or =vulkan." fi } @@ -196,10 +202,11 @@ src_configure() { $(meson_feature wayland) $(meson_feature xv) - -Dgl=$(use aqua || use egl || use libmpv && + -Dgl=$(use aqua || use egl || use libmpv || use vdpau && echo enabled || echo disabled) $(meson_feature egl) $(meson_feature libmpv plain-gl) + $(meson_feature vdpau gl-x11) # only needed for vdpau (bug #955122) $(meson_feature vulkan) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 7307c88582af..88ecf1a641b1 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -91,7 +91,10 @@ COMMON_DEPEND=" sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + media-libs/libglvnd[X] + x11-libs/libvdpau + ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland @@ -130,6 +133,9 @@ pkg_pretend() { 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." + ewarn + ewarn "USE=vdpau (for nvidia) still enables gl-x11 as it requires it, however" + ewarn "it is recommended to instead use --hwdec=nvdec (USE=nvenc) or =vulkan." fi } @@ -199,10 +205,11 @@ src_configure() { $(meson_feature wayland) $(meson_feature xv) - -Dgl=$(use aqua || use egl || use libmpv && + -Dgl=$(use aqua || use egl || use libmpv || use vdpau && echo enabled || echo disabled) $(meson_feature egl) $(meson_feature libmpv plain-gl) + $(meson_feature vdpau gl-x11) # only needed for vdpau (bug #955122) $(meson_feature vulkan)
