gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-video/mpv: simplify ebuild a bit

Browse Source 
_multi is redundant with what the meson.build already does,
may as well drop it entirely (e.g. if feature egl and drm
are enabled, it enables egl-drm and doesn't really do anything
else special, not much sense in passing egl-drm ourselves).

This *shouldn't* change anything, so no need for a revbump.
If it does, then it's an oversight that needs fixing.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-03-27 00:49:33 -04:00
parent 5b575e0e9d
commit fd63589cc5
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
media-video/mpv/mpv-0.40.0.ebuild
View File

@@ -137,14 +137,6 @@ src_configure() {
fi
fi
mpv_feature_multi() {
local use set
for use in ${1} ${2}; do
use ${use} || set=disabled
done
echo -D${3-${2}}=${set-enabled}
}
local emesonargs=(
$(meson_use cli cplayer)
$(meson_use libmpv)
@@ -200,34 +192,14 @@ src_configure() {
-Dgl=$(use egl || use libmpv || use opengl &&
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)
$(mpv_feature_multi opengl X gl-x11)
$(mpv_feature_multi opengl aqua gl-cocoa)
$(meson_feature vulkan)
# hardware decoding
$(meson_feature nvenc cuda-hwaccel)
$(meson_feature nvenc cuda-interop)
$(meson_feature vaapi)
$(mpv_feature_multi vaapi X vaapi-x11)
$(mpv_feature_multi vaapi drm vaapi-drm)
$(mpv_feature_multi vaapi wayland vaapi-wayland)
$(meson_feature vdpau)
$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
$(mpv_feature_multi aqua opengl videotoolbox-gl)
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
#vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
# TODO?: perhaps few more similar compound options should be left auto
)
meson_src_configure

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

@@ -140,14 +140,6 @@ src_configure() {
fi
fi
mpv_feature_multi() {
local use set
for use in ${1} ${2}; do
use ${use} || set=disabled
done
echo -D${3-${2}}=${set-enabled}
}
local emesonargs=(
$(meson_use cli cplayer)
$(meson_use libmpv)
@@ -203,34 +195,14 @@ src_configure() {
-Dgl=$(use egl || use libmpv || use opengl &&
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)
$(mpv_feature_multi opengl X gl-x11)
$(mpv_feature_multi opengl aqua gl-cocoa)
$(meson_feature vulkan)
# hardware decoding
$(meson_feature nvenc cuda-hwaccel)
$(meson_feature nvenc cuda-interop)
$(meson_feature vaapi)
$(mpv_feature_multi vaapi X vaapi-x11)
$(mpv_feature_multi vaapi drm vaapi-drm)
$(mpv_feature_multi vaapi wayland vaapi-wayland)
$(meson_feature vdpau)
$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
$(mpv_feature_multi aqua opengl videotoolbox-gl)
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
#vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
# TODO?: perhaps few more similar compound options should be left auto
)
meson_src_configure