summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-01-05 23:18:49 +0000
committerwiz <wiz@pkgsrc.org>2014-01-05 23:18:49 +0000
commit19c1fb854c3d88017810f26b0c8795fba9a1a34f (patch)
treebab4c370614abf709417f14e8d73cf6c554b59b5 /audio
parent161d703dcca9729d7e0db492bbbc9a66d7e059cd (diff)
downloadpkgsrc-19c1fb854c3d88017810f26b0c8795fba9a1a34f.tar.gz
Add default-off pulseaudio option.
Bump PKGREVISION for the people who have pulseaudio in their default-on global options.
Diffstat (limited to 'audio')
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/musicpd/options.mk11
2 files changed, 11 insertions, 4 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 44b684696a0..cc1c5a7d5f8 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2013/10/19 09:07:00 adam Exp $
+# $NetBSD: Makefile,v 1.73 2014/01/05 23:18:49 wiz Exp $
DISTNAME= mpd-0.17.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.musicpd.org/download/mpd/0.17/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 960bc1e32d3..cb968d08dd8 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2012/06/12 15:45:54 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2014/01/05 23:18:49 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= audiofile bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libwildmidi mikmod modplug musepack musicpd-lastfm ogg shout sqlite3 wavpack zziplib
+PKG_SUPPORTED_OPTIONS= audiofile bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libwildmidi mikmod modplug musepack musicpd-lastfm ogg pulseaudio shout sqlite3 wavpack zziplib
PKG_SUGGESTED_OPTIONS= audiofile curl faad flac id3 inet6 libao musepack ogg
PKG_OPTIONS_LEGACY_OPTS= libmikmod:mikmod
@@ -152,6 +152,13 @@ CONFIGURE_ARGS+= --enable-vorbis
CONFIGURE_ARGS+= --disable-vorbis
.endif
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+. include "../../audio/pulseaudio/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-pulse
+.else
+CONFIGURE_ARGS+= --disable-pulse
+.endif
+
.if !empty(PKG_OPTIONS:Mshout)
. include "../../audio/libshout/buildlink3.mk"
. include "../../audio/lame/buildlink3.mk"