Add hal and pulseaudio options. Enable pulseaudio by default.

Bump PKGREVISION.

3 files changed, 29 insertions, 6 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ae8822989e6..a2efdfd207e 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2008/12/18 17:28:16 bjs Exp $
+# $NetBSD: Makefile,v 1.70 2008/12/19 23:28:40 jmcneill Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index aaf917497ce..1f75b114f5a 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.24 2008/11/08 19:00:15 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.25 2008/12/19 23:28:40 jmcneill Exp $
 ${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
 ${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libtelepathy_plugin.la
+${PLIST.hal}lib/vlc/misc/libprobe_hal_plugin.la
+${PLIST.hal}lib/vlc/services_discovery/libhal_plugin.la
 ${PLIST.x11}bin/qvlc
 ${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
 ${PLIST.x11}lib/vlc/codec/libpng_plugin.la
@@ -20,6 +22,7 @@ ${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la
 ${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la
 ${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la
 ${PLIST.esound}lib/vlc/audio_output/libesd_plugin.la
+${PLIST.pulseaudio}lib/vlc/audio_output/libpulse_plugin.la
 ${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
 ${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
 ${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 05cc495f957..aceeceeed03 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2008/11/08 19:00:15 ahoka Exp $
+# $NetBSD: options.mk,v 1.12 2008/12/19 23:28:40 jmcneill Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS=		debug faad arts dbus skins sdl esound x11 gnome
-PKG_SUGGESTED_OPTIONS=		x11 esound
+PKG_SUPPORTED_OPTIONS=		debug faad arts dbus hal skins sdl esound pulseaudio x11 gnome
+PKG_SUGGESTED_OPTIONS=		x11 esound pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,6 +16,16 @@ CONFIGURE_ARGS+=	--enable-esd
 PLIST.esound=		yes
 .endif
 
+## PulseAudio support
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=	--enable-pulse
+.include "../../audio/pulseaudio/buildlink3.mk"
+PLIST.pulseaudio=	yes
+.else
+CONFIGURE_ARGS+=	--disable-pulse
+.endif
+
 ## SDL backend support
 
 .if !empty(PKG_OPTIONS:Msdl)
@@ -47,8 +57,18 @@ CONFIGURE_ARGS+=	--enable-dbus
 CONFIGURE_ARGS+=	--enable-notify
 .include "../../sysutils/libnotify/buildlink3.mk"
 PLIST.dbus=		yes
+## HAL support (requires dbus)
+.if !empty(PKG_OPTIONS:Mhal)
+CONFIGURE_ARGS+=	--enable-hal
+.include "../../sysutils/hal/buildlink3.mk"
+PLIST.hal=		yes
+.else
+CONFIGURE_ARGS+=	--disable-hal
+.endif
 .else
 CONFIGURE_ARGS+=	--disable-dbus
+CONFIGURE_ARGS+=	--disable-hal
+CONFIGURE_ARGS+=	--disable-notify
 .endif
 
 ## DEBUG build or release build