Update to 2.10.0:

This is gnome-media 2.10.0

Changes since 2.9.92:

	* fix for crasher in volume control.

This is gnome-media 2.9.92

Changes since 2.9.90:

	* polishing, finetuning, fixing possible crashers here and there...

Bugs fixed:

	* 109909: gnome-cd Seg Faults when Notification Area goes away
	* 130653: gnome-sound-recorder doesn't prompt on overwrite
	* 150450: Update of labels in CD Player Preferences dialog
	* 153496: gnome-audio-profiles-properties crash when edit
	* 158222: vu-meter segfault in led_bar_light_percent()
	* 159821: [cdparanoia] audio playback glitches using cdparanoia
	* 160340: [PATCH] gnome-sound-recorder can not play files
	* 160830: Cannot run the sound recorder, application just "quits un...
	* 162185: [PATCH] gnome-sound-recorder cannot properly save files a...
	* 162302: Trying to record in a second window kills all windows (in...
	* 162607: "Untitled" window title and default file names need trans...
	* 164010: gtk warnings
	* 164857: cdparanoia is really noisy at x48
	* 166814: gnome-media-2.8.0 fails to compile on solaris 9
	* 167338: translator-credits missing

This is gnome-media 2.9.90

Changes since 2.9.4:

	* mostly bug fixes all over the place.

Bugs fixed:

	* 105709: Track editor crashed after changing cd
	* 128956: buttons should be greyed out when no CD is present
	* 164229: While playing, the popup play menu item icon image is not...
	* 165153: gstreamer-properties.xml file causes xml lint error

This is gnome-media 2.9.4

Changes since 2.9.3:

	* translation fixes

Bugs fixed:

	* 105768: Crash when opening gnome-cd
	* 148650: changing window title to 'Multimedia Systems Selector'
	* 153537: [PATCH] typo in error message
	* 161722: Build breakage on gnome-cd
	* 162608: gnome-media mixer message needs translator comment
	* 163354: Update the Time line Display after inserting the CD

This is gnome-media 2.9.3

Changes since 2.9.2:

	* moved switches to their own tab in gst-mixer

Bugs fixed:

	* 153599: The runtime-detected mixers don't have mnemonics
	* 157117: gnome-volume-control doesn't redraw properly
	* 158346: Duplicate volume controls for ALSA EMU10k1
	* 159428: gnome-volume-control: Use simple check box if there is no...

This is gnome-media 2.9.2

Changes since 2.9.1:

	* re-added CDDA backend in GNOME-CD

Bugs fixed:

	72581:	Gnome-CD should detect multiple cdroms and put them in a ...
	150072:	small code clean ups
	154547:	compilation error in audio-profile.h with sound-juicer au...
	155088:	gnome-sound-recorder does not save files
	156874:	[PATCH] HIG fixes for preference dialog

This is gnome-media 2.9.1

Changes since 2.8.0:

	* new volume control
	* ipv6 support for CDDB.

Bugs fixes:

	* 111423: IPv6 enhancements in gnome-media
	* 144769: Volume Control (2.6.1) reports modem as primary sound card
	* 145087: cannot install .mo files into $prefix/share/locale in Sol...
	* 148858: improperly linked
	* 151971: Rewrite of gnome-volume-control
	* 153497: [PATCH] HIG fixes for new mixer's preference dialog.

4 files changed, 53 insertions, 17 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index ad89ed81461..870169f46af 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/22 16:34:36 jmmv Exp $
 
-DISTNAME=		gnome-media-2.8.0
-PKGREVISION=		1
+DISTNAME=		gnome-media-2.10.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -11,9 +10,9 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gst-plugins-cdparanoia>=0.8.4:../../audio/gst-plugins-cdparanoia
-DEPENDS+=		gst-plugins-esound>=0.8.4:../../audio/gst-plugins-esound
-DEPENDS+=		gst-plugins-oss>=0.8.4:../../audio/gst-plugins-oss
+DEPENDS+=		gst-plugins-cdparanoia>=0.8.8:../../audio/gst-plugins-cdparanoia
+DEPENDS+=		gst-plugins-esound>=0.8.8:../../audio/gst-plugins-esound
+DEPENDS+=		gst-plugins-oss>=0.8.8:../../audio/gst-plugins-oss
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -40,18 +39,24 @@ GCONF2_SCHEMAS+=	gnome-cd.schemas
 GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/GConf2-ui/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
index 8485948e88f..544dda7b503 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome2-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/03/22 16:34:36 jmmv Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
@@ -19,20 +19,28 @@ lib/libgnome-media-profiles.la
 lib/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
+share/applications/cddb-slave.desktop
 share/applications/gnome-cd.desktop
 share/applications/gnome-sound-recorder.desktop
 share/applications/gnome-volume-control.desktop
+share/applications/gstreamer-properties.desktop
 share/applications/reclevel.desktop
 share/applications/vumeter.desktop
-share/control-center-2.0/capplets/cddb-slave.desktop
-share/control-center-2.0/capplets/gstreamer-properties.desktop
 share/gconf/schemas/CDDB-Slave2.schemas
 share/gconf/schemas/gnome-audio-profiles.schemas
 share/gconf/schemas/gnome-cd.schemas
 share/gconf/schemas/gnome-sound-recorder.schemas
 share/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome-media/pixmaps/3dsound.png
+share/gnome-media/pixmaps/chain-broken.png
+share/gnome-media/pixmaps/chain.png
+share/gnome-media/pixmaps/headphones.png
 share/gnome-media/pixmaps/mixer.png
+share/gnome-media/pixmaps/noplay.png
+share/gnome-media/pixmaps/norecord.png
 share/gnome-media/pixmaps/phone.png
+share/gnome-media/pixmaps/play.png
+share/gnome-media/pixmaps/record.png
 share/gnome-media/pixmaps/tone.png
 share/gnome-media/pixmaps/video.png
 share/gnome-sound-recorder/ui/gsr.xml
@@ -337,6 +345,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-media-2.0.mo
@@ -530,7 +539,6 @@ share/pixmaps/gstreamer-properties.png
 @dirrm share/gnome-media/glade
 @dirrm share/gnome-media
 @comment in GConf2: @dirrm share/gconf/schemas
-@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libglade2: @dirrm lib/libglade/2.0
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
new file mode 100644
index 00000000000..d2be499c631
--- /dev/null
+++ b/multimedia/gnome2-media/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:34:36 jmmv Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gnome-media
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
+BUILDLINK_PACKAGES+=	gnome-media
+
+.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.10.0
+BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
+.endif	# GNOME_MEDIA_BUILDLINK3_MK
+
+.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index 5856f545f08..6236aea35b8 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 11:24:02 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/03/22 16:34:36 jmmv Exp $
 
-SHA1 (gnome-media-2.8.0.tar.bz2) = 7984f31d661801156b2d2b14141cfc45d8e727c7
-RMD160 (gnome-media-2.8.0.tar.bz2) = d4770bf373b3a7e74579006e14f82c1af18be95d
-Size (gnome-media-2.8.0.tar.bz2) = 3171171 bytes
+SHA1 (gnome-media-2.10.0.tar.bz2) = 73cd651242f4463d09b4b114e36a1b1fdd693c31
+RMD160 (gnome-media-2.10.0.tar.bz2) = fe4799d7076822e063be453989cdebab87abe95b
+Size (gnome-media-2.10.0.tar.bz2) = 3286571 bytes