On linux include alsa support.

2 files changed, 64 insertions, 4 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index c77e7f7b483..0374284cecb 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2015/12/29 04:54:36 dholland Exp $
+# $NetBSD: Makefile,v 1.104 2016/01/06 10:24:43 markd Exp $
 
 DISTNAME=	pulseaudio-7.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -59,6 +59,11 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 PLIST.evdev=		yes
 .endif
 
+.if ${OPSYS} == "Linux"
+PLIST.alsa=		yes
+.include "../../audio/alsa-lib/buildlink3.mk"
+.endif
+
 .include "options.mk"
 
 PKGCONFIG_OVERRIDE+=	libpulse-mainloop-glib.pc.in
@@ -85,7 +90,7 @@ CONF_FILES+=	${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
 CONF_FILES+=	${EGDIR}/pulseaudio-system.conf \
 		${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
 
-PLIST_VARS+=		bonjour coreaudio evdev oss sun
+PLIST_VARS+=		alsa bonjour coreaudio evdev oss sun
 
 .if ${OPSYS} == "SunOS"
 PLIST.sun=		yes
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index c8a43bb464e..50a2d2cfad0 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/09/25 14:37:27 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.20 2016/01/06 10:24:43 markd Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
@@ -53,6 +53,8 @@ lib/libpulsecore-6.0.la
 lib/pkgconfig/libpulse-mainloop-glib.pc
 lib/pkgconfig/libpulse-simple.pc
 lib/pkgconfig/libpulse.pc
+${PLIST.alsa}lib/pulse-6.0/modules/libalsa-util.a
+${PLIST.alsa}lib/pulse-6.0/modules/libalsa-util.so
 ${PLIST.avahi}lib/pulse-6.0/modules/libavahi-wrap.a
 ${PLIST.avahi}lib/pulse-6.0/modules/libavahi-wrap.so
 lib/pulse-6.0/modules/libcli.a
@@ -73,6 +75,12 @@ lib/pulse-6.0/modules/libraop.a
 lib/pulse-6.0/modules/libraop.so
 lib/pulse-6.0/modules/librtp.a
 lib/pulse-6.0/modules/librtp.so
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-card.a
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-card.so
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-sink.a
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-sink.so
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-source.a
+${PLIST.alsa}lib/pulse-6.0/modules/module-alsa-source.so
 lib/pulse-6.0/modules/module-always-sink.a
 lib/pulse-6.0/modules/module-always-sink.so
 lib/pulse-6.0/modules/module-augment-properties.a
@@ -294,6 +302,53 @@ share/locale/tr/LC_MESSAGES/pulseaudio.mo
 share/locale/uk/LC_MESSAGES/pulseaudio.mo
 share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
 share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-front-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-headphone-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-headset-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic-always.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-rear-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-lineout.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-speaker-always.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-0.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-1.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-2.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-3.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-4.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/default.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-korecontroller.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
+${PLIST.alsa}share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
 share/vala/vapi/libpulse-mainloop-glib.deps
 share/vala/vapi/libpulse-mainloop-glib.vapi
 share/vala/vapi/libpulse-simple.deps