commit:     ba4ff88a968cbdd9ff0dae67cd28b914a303c6a5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 00:13:41 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 00:16:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4ff88a

media-video/mpv: add USE=sixel support

Revbump to handle restoring dropped keywords rather than .mask.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/mpv/metadata.xml                              | 1 +
 media-video/mpv/{mpv-9999.ebuild => mpv-0.35.0-r1.ebuild} | 9 +++++----
 media-video/mpv/mpv-9999.ebuild                           | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 0f527c3340f7..49c4dfe18641 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -29,6 +29,7 @@
                <flag name="rubberband">Enable high quality pitch correction 
via <pkg>media-libs/rubberband</pkg></flag>
                <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based 
video and audio outputs
                        (Note: these outputs exist for compatibility reasons 
only, avoid if possible)</flag>
+               <flag name="sixel">Enable support for the sixel video backend 
using <pkg>media-libs/libsixel</pkg></flag>
                <flag name="sndio">Enable sound support via 
<pkg>media-sound/sndio</pkg></flag>
                <flag name="tools">Install extra tools: mpv_identify.sh, 
mpv_idet.sh, and umpv</flag>
                <flag name="uchardet">Enable subtitles charset discovery via 
<pkg>app-i18n/uchardet</pkg></flag>

diff --git a/media-video/mpv/mpv-9999.ebuild 
b/media-video/mpv/mpv-0.35.0-r1.ebuild
similarity index 96%
copy from media-video/mpv/mpv-9999.ebuild
copy to media-video/mpv/mpv-0.35.0-r1.ebuild
index 0624e8ac6f99..70fc31844c15 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
        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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv 
~x86 ~amd64-linux"
+       KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="Media player for the command line"
@@ -24,7 +24,7 @@ IUSE="
        +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
        dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
        +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
-       raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+       raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
        vaapi vdpau vulkan wayland +xv zimg zlib"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
@@ -45,7 +45,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
        media-libs/libass:=[fontconfig]
-       >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+       media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
        X? (
                x11-libs/libX11
                x11-libs/libXScrnSaver
@@ -93,6 +93,7 @@ COMMON_DEPEND="
        raspberry-pi? ( media-libs/raspberrypi-userland )
        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 )
@@ -207,7 +208,7 @@ src_configure() {
                $(meson_feature libplacebo)
                $(meson_feature mmal rpi-mmal)
                $(meson_feature sdl sdl2-video)
-               -Dsixel=disabled # TODO? needs keywording/testing
+               $(meson_feature sixel)
                $(meson_feature wayland)
                $(meson_feature xv)
 

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 0624e8ac6f99..3138e56d9b66 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="
        +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
        dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
        +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
-       raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+       raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
        vaapi vdpau vulkan wayland +xv zimg zlib"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
@@ -93,6 +93,7 @@ COMMON_DEPEND="
        raspberry-pi? ( media-libs/raspberrypi-userland )
        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 )
@@ -207,7 +208,7 @@ src_configure() {
                $(meson_feature libplacebo)
                $(meson_feature mmal rpi-mmal)
                $(meson_feature sdl sdl2-video)
-               -Dsixel=disabled # TODO? needs keywording/testing
+               $(meson_feature sixel)
                $(meson_feature wayland)
                $(meson_feature xv)
 

Reply via email to