gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

media-video/mpv: re-enable gl-x11 only with USE=vdpau

Browse Source 
Closes: https://bugs.gentoo.org/955122
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-04-30 19:17:22 -04:00
parent 22d831d3f4
commit ca9107e1cd
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media-video/mpv/mpv-0.40.0-r1.ebuild → media-video/mpv/mpv-0.40.0-r2.ebuild
View File

@@ -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)

11
media-video/mpv/mpv-9999.ebuild
View File

@@ -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)