CVS commit: pkgsrc/audio/cmus

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul  2 06:23:50 UTC 2019

Modified Files:
        pkgsrc/audio/cmus: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/audio/cmus/patches: patch-op_alsa.c

Log Message:
cmus: Add alsa support.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/cmus/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/cmus/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/cmus/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/cmus/patches/patch-op_alsa.c

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

Modified files:

Index: pkgsrc/audio/cmus/Makefile
diff -u pkgsrc/audio/cmus/Makefile:1.78 pkgsrc/audio/cmus/Makefile:1.79
--- pkgsrc/audio/cmus/Makefile:1.78     Tue Jul  2 06:15:29 2019
+++ pkgsrc/audio/cmus/Makefile  Tue Jul  2 06:23:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2019/07/02 06:15:29 nia Exp $
+# $NetBSD: Makefile,v 1.79 2019/07/02 06:23:50 nia Exp $
 
 DISTNAME=              cmus-2.8.0
 CATEGORIES=            audio
@@ -20,7 +20,6 @@ REPLACE_SH+=          cmus-status-display
 GCC_REQD+=             4.9
 
 CONFIGURE_ARGS+=       prefix=${PREFIX}
-CONFIGURE_ARGS+=       CONFIG_ALSA=n
 # not in pkgsrc yet
 CONFIGURE_ARGS+=       CONFIG_ROAR=n
 # requires systemd

Index: pkgsrc/audio/cmus/PLIST
diff -u pkgsrc/audio/cmus/PLIST:1.17 pkgsrc/audio/cmus/PLIST:1.18
--- pkgsrc/audio/cmus/PLIST:1.17        Thu May  9 13:22:58 2019
+++ pkgsrc/audio/cmus/PLIST     Tue Jul  2 06:23:50 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/05/09 13:22:58 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/07/02 06:23:50 nia Exp $
 bin/cmus
 bin/cmus-remote
 ${PLIST.faad}lib/cmus/ip/aac.so
@@ -14,6 +14,7 @@ ${PLIST.opus}lib/cmus/ip/opus.so
 ${PLIST.vorbis}lib/cmus/ip/vorbis.so
 lib/cmus/ip/wav.so
 ${PLIST.wavpack}lib/cmus/ip/wavpack.so
+${PLIST.alsa}lib/cmus/op/alsa.so
 ${PLIST.libao}lib/cmus/op/ao.so
 ${PLIST.coreaudio}lib/cmus/op/coreaudio.so
 ${PLIST.jack}lib/cmus/op/jack.so

Index: pkgsrc/audio/cmus/distinfo
diff -u pkgsrc/audio/cmus/distinfo:1.23 pkgsrc/audio/cmus/distinfo:1.24
--- pkgsrc/audio/cmus/distinfo:1.23     Mon Feb 11 10:07:37 2019
+++ pkgsrc/audio/cmus/distinfo  Tue Jul  2 06:23:50 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2019/02/11 10:07:37 nia Exp $
+$NetBSD: distinfo,v 1.24 2019/07/02 06:23:50 nia Exp $
 
 SHA1 (cmus-2.8.0.tar.gz) = f2ef867a481190f1f1b34dad450a12ae94201d44
 RMD160 (cmus-2.8.0.tar.gz) = 00cb515afa9848db7610771052409d0d3f9d29d7
 SHA512 (cmus-2.8.0.tar.gz) = cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 Size (cmus-2.8.0.tar.gz) = 317243 bytes
+SHA1 (patch-op_alsa.c) = 3a50d91fb0ec04dcb67c926fb3ed80abd4baacd3
 SHA1 (patch-op_mixer__sun.c) = 13cb31e8b4aeab487b10af2aceeff9e248eb4b58
 SHA1 (patch-op_sun.c) = d8ab18cf049b05cfa1228483456523e7682d4c55

Index: pkgsrc/audio/cmus/options.mk
diff -u pkgsrc/audio/cmus/options.mk:1.20 pkgsrc/audio/cmus/options.mk:1.21
--- pkgsrc/audio/cmus/options.mk:1.20   Mon Feb 11 10:07:37 2019
+++ pkgsrc/audio/cmus/options.mk        Tue Jul  2 06:23:50 2019
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.20 2019/02/11 10:07:37 nia Exp $
+# $NetBSD: options.mk,v 1.21 2019/07/02 06:23:50 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.cmus
-PKG_SUPPORTED_OPTIONS=         flac mad vorbis libao musepack faad wavpack \
-                               ffmpeg opus jack pulseaudio
+PKG_SUPPORTED_OPTIONS+=                alsa flac mad vorbis libao musepack faad
+PKG_SUPPORTED_OPTIONS+=                wavpack ffmpeg opus jack pulseaudio
 PKG_OPTIONS_OPTIONAL_GROUPS=   mod
 PKG_OPTIONS_GROUP.mod=         modplug mikmod
 PKG_SUGGESTED_OPTIONS=         faad flac libao mad modplug opus vorbis
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 PKG_OPTIONS_LEGACY_OPTS+=      ao:libao
 PKG_OPTIONS_LEGACY_OPTS+=      mpcdec:musepack
 
@@ -29,11 +30,13 @@ CONFIGURE_ARGS+=    CONFIG_AO=n
 
 # ALSA support
 #
-# UNTESTED
-#.if !empty(PKG_OPTIONS:Malsa)
-#ONLY_FOR_PLATFORM=  Linux-*-* # Alsa is Linux only
-#CONFIGURE_ARGS+=      CONFIG_ALSA=y
-#.endif
+.if !empty(PKG_OPTIONS:Malsa)
+. include "../../audio/alsa-lib/buildlink3.mk"
+CONFIGURE_ARGS+=       CONFIG_ALSA=y
+PLIST.alsa=            yes
+.else
+CONFIGURE_ARGS+=       CONFIG_ALSA=n
+.endif
 
 # PULSE support
 #

Added files:

Index: pkgsrc/audio/cmus/patches/patch-op_alsa.c
diff -u /dev/null pkgsrc/audio/cmus/patches/patch-op_alsa.c:1.1
--- /dev/null   Tue Jul  2 06:23:51 2019
+++ pkgsrc/audio/cmus/patches/patch-op_alsa.c   Tue Jul  2 06:23:50 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-op_alsa.c,v 1.1 2019/07/02 06:23:50 nia Exp $
+
+Support NetBSD.
+
+--- op/alsa.c.orig     2019-01-29 09:09:08.000000000 +0000
++++ op/alsa.c
+@@ -59,6 +59,10 @@
+ 
+ #include <alsa/asoundlib.h>
+ 
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++
+ static sample_format_t alsa_sf;
+ static snd_pcm_t *alsa_handle;
+ static snd_pcm_format_t alsa_fmt;