CVS commit: pkgsrc/multimedia/mpv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May 31 15:55:11 UTC 2019

Modified Files:
        pkgsrc/multimedia/mpv: Makefile options.mk

Log Message:
mpv: Remove pulseaudio SUGGESTED_OPTION, add sdl2, and alsa on Linux.

Originally, packages were changed to support pulseaudio because NetBSD
didn't have a native audio mixer. But that isn't true any more.

SDL2 supports lots of audio (and video) outputs that mpv doesn't natively.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/mpv/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.81 pkgsrc/multimedia/mpv/Makefile:1.82
--- pkgsrc/multimedia/mpv/Makefile:1.81 Thu Apr 25 07:33:09 2019
+++ pkgsrc/multimedia/mpv/Makefile      Fri May 31 15:55:11 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2019/04/25 07:33:09 maya Exp $
+# $NetBSD: Makefile,v 1.82 2019/05/31 15:55:11 nia Exp $
 
 DISTNAME=      mpv-0.29.1
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/mpv/options.mk
diff -u pkgsrc/multimedia/mpv/options.mk:1.16 pkgsrc/multimedia/mpv/options.mk:1.17
--- pkgsrc/multimedia/mpv/options.mk:1.16       Mon Nov 26 12:24:47 2018
+++ pkgsrc/multimedia/mpv/options.mk    Fri May 31 15:55:11 2019
@@ -1,12 +1,13 @@
-# $NetBSD: options.mk,v 1.16 2018/11/26 12:24:47 abs Exp $
+# $NetBSD: options.mk,v 1.17 2019/05/31 15:55:11 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mpv
 
 .include "../../multimedia/libva/available.mk"
 .include "../../multimedia/libvdpau/available.mk"
 
-PKG_SUPPORTED_OPTIONS= ass bluray caca lua pulseaudio rpi sdl2 v4l2
-PKG_SUGGESTED_OPTIONS= ass bluray lua pulseaudio
+PKG_SUPPORTED_OPTIONS= alsa ass bluray caca lua pulseaudio rpi sdl2 v4l2
+PKG_SUGGESTED_OPTIONS= ass bluray lua sdl2
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .if ${VAAPI_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=        vaapi
@@ -21,6 +22,16 @@ PKG_SUGGESTED_OPTIONS+=      vdpau
 .include "../../mk/bsd.options.mk"
 
 ###
+### alsa support
+###
+.if !empty(PKG_OPTIONS:Malsa)
+WAF_CONFIGURE_ARGS+=   --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+WAF_CONFIGURE_ARGS+=   --disable-alsa
+.endif
+
+###
 ### libbluray support
 ###
 .if !empty(PKG_OPTIONS:Mbluray)