Enable pulseaudio again, it is not too old now.

XXX: then gstmix wiil be disabled because it is deprecated feature,
XXX: but stay keeping enabled for compatibility.

Bump PKGREVISION.

2 files changed, 39 insertions, 5 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index a397aa2ecf2..3e490803c24 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/09/14 11:01:02 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/11/06 11:38:08 obache Exp $
 
 DISTNAME=		gnome-media-2.28.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.28/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,13 +17,16 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config xgettext
 
+# XXX: deprecated feature
+CONFIGURE_ARGS+=	--enable-gstmix
+
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
 GCONF_SCHEMAS+=	gnome-volume-control.schemas
 
 .include "../../audio/libcanberra/buildlink3.mk"
-# pkgsrc pulseaudio is too old
-#.include "../../audio/pulseaudio/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pulseaudio+=		pulseaudio>=0.9.15
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/gnome-media/PLIST b/multimedia/gnome-media/PLIST
index 6babd08fd0e..056c4540f90 100644
--- a/multimedia/gnome-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.13 2010/04/11 08:11:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/11/06 11:38:08 obache Exp $
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
 bin/gnome-volume-control
+bin/gnome-volume-control-applet
 bin/gstreamer-properties
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
@@ -18,10 +19,31 @@ share/gconf/schemas/gnome-audio-profiles.schemas
 share/gconf/schemas/gnome-sound-recorder.schemas
 share/gconf/schemas/gnome-volume-control.schemas
 share/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-high.png
+share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-low.png
+share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-high.png
+share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-low.png
+share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-high.png
+share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-low.png
+share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-high.png
+share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-low.png
+share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 share/gnome-media/pixmaps/chain-broken.png
 share/gnome-media/pixmaps/chain.png
 share/gnome-media/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
+share/gnome/autostart/gnome-volume-control-applet.desktop
 share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
 share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png
 share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml
@@ -128,17 +150,26 @@ share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
 share/gstreamer-properties/gstreamer-properties.ui
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.svg
 share/icons/hicolor/16x16/devices/gvc-3d-sound.png
 share/icons/hicolor/16x16/devices/gvc-headphones.png
 share/icons/hicolor/16x16/devices/gvc-line-in.png
 share/icons/hicolor/16x16/devices/gvc-tone.png
 share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
 share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.svg
 share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
+share/icons/hicolor/24x24/apps/gnome-volume-control.png
 share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.svg
 share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
+share/icons/hicolor/48x48/apps/gnome-volume-control.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
+share/icons/hicolor/scalable/apps/gnome-volume-control.svg
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-media-2.0.mo