git: 966b63a0412c - 2021Q4 - multimedia/mpv: restore SNDIO (--ao=sndio) after 0cee9d1b218a

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 25 Dec 2021 10:20:27 UTC
The branch 2021Q4 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=966b63a0412c3a2fb1793e94d93e62a1efb7e1ab

commit 966b63a0412c3a2fb1793e94d93e62a1efb7e1ab
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-25 09:58:23 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-25 10:12:21 +0000

    multimedia/mpv: restore SNDIO (--ao=sndio) after 0cee9d1b218a
    
    Requested by:   Brad Smith <brad@comstyle.com>
    
    (cherry picked from commit a6e090a8c9f44a519972f942b4351017cfba0ef1)
---
 multimedia/mpv/Makefile | 8 +++++++-
 multimedia/mpv/distinfo | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 9b2c2180cc40..9b7ba249326f 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -23,6 +23,8 @@ PATCHFILES+=	968faef86723.patch:-p1 # libplacebo 3.104
 PATCHFILES+=	7c4465cefb27.patch:-p1 # libplacebo 3.104
 PATCHFILES+=	cc4ada655aae.patch:-p1 # https://github.com/mpv-player/mpv/pull/9209
 PATCHFILES+=	b030cfe05f58.patch:-p1 # https://github.com/mpv-player/mpv/pull/9440
+PATCHFILES+=	edf0039d7621.patch:-p1 # https://github.com/mpv-player/mpv/pull/9298
+PATCHFILES+=	5319731526fb.patch:-p1 # https://github.com/mpv-player/mpv/pull/9298
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player
@@ -63,7 +65,7 @@ OPTIONS_DEFAULT=	ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L YTDL
 OPTIONS_GROUP_VO=	CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
-OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL
+OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL SNDIO
 OPTIONS_SUB=		yes
 
 DVDNAV_DESC=		DVD menu navigation
@@ -138,6 +140,10 @@ SDL_CONFIGURE_ON=		--enable-sdl2
 SIXEL_LIB_DEPENDS=		libsixel.so:graphics/libsixel
 SIXEL_CONFIGURE_OFF=		--disable-sixel
 
+SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
+SNDIO_CONFIGURE_ON=		--enable-sndio
+SNDIO_CONFIGURE_OFF=		--disable-sndio
+
 TEST_CONFIGURE_ON=		--enable-tests
 
 UCHARDET_LIB_DEPENDS=		libuchardet.so:textproc/uchardet
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index d6ed262befef..d91fb48605d3 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -35,3 +35,7 @@ SHA256 (cc4ada655aae.patch) = 6937e60a1b04a5c32fc6d34a760e79ad408ed56374d4b9d689
 SIZE (cc4ada655aae.patch) = 5202
 SHA256 (b030cfe05f58.patch) = df7590e1d27e8e6c0e326781723ee87ef7c3fdf5a88438c8c29bb729a911ff74
 SIZE (b030cfe05f58.patch) = 5270
+SHA256 (edf0039d7621.patch) = 8c7e75d9e2a0ae2622fd23df8121d756fc919f7f9733edd7c59c2cc1900a3507
+SIZE (edf0039d7621.patch) = 12278
+SHA256 (5319731526fb.patch) = 29364fa31f184a5f6d59bbcceea0a7c9269ca4af08a34f93eccd283254709a68
+SIZE (5319731526fb.patch) = 6629