diff --git a/media-video/mpv/mpv-0.40.0.ebuild b/media-video/mpv/mpv-0.40.0.ebuild index fd89269f00c3d..b17efcfce030c 100644 --- a/media-video/mpv/mpv-0.40.0.ebuild +++ b/media-video/mpv/mpv-0.40.0.ebuild @@ -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 diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 21c9db982186a..aaf45c44fd62f 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -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