Update to 2.8.0. This version corresponds to GNOME 2.8.0.

Changes since 2.7.1:

	* GStreamer-based (CDDB-capable) backend to GNOME CD
	* Added "nb" and "bs" translations
	* Added ALSA switches (simple boolean on/off) to Volume Control
	* Made the whole release compile properly using -Wall -Werror

Bugs fixed since 2.7.1:

	* 51152: CD Player does not support CDDA
	* 123937: Progress bar does not move while recording
	* 140082: Too many "name-changed" events for Play/Pause button
	* 142828: Bad preprocessor directive in gnet-private.h
	* 143287: [Solaris], Need to set the audio port
	* 143327: No ATK name for Available Themes selection widget
	* 144341: gnome-cd chrashes/hangs when opening/closing tray
	* 144536: missing gst-cdparanoia-cdrom.c and gst-cdparanoia-cdrom.h
	* 148353: gnome-cd crashes when pressing ejecting a cd while it is ...
	* 151305: missing return value in seek_to()
	* 151306: Cleanup of issues reported by sparse/gcc

This is gnome-media 2.7.1

Changes since 2.6.1:

      * Swapped About and Help (Jorn Baayen)
      * Fixed cddb-slave2 documentation link (Kaushal Kumar)
      * Added "tk" translation
      * Fixed compiler warnings in CDDBSlave2
      * Lots of functionality updates in CDDBSlave2
      * Fixed spelling errors in schemas

Bugs fixed since 2.6.1:

      * 117695: Don't flood syslog with failed CDROMVOLREAD ioctls (Thomas)
      * 130233: Internationalize profile names and descriptions (Thomas)
      * 134339: Change dir to path in source (Thomas)
      * 134340: Use ngettext (Thomas)
      * 134341: Whitespace before punctuation in gnome-media message (Thomas)
      * 137139: Change terminal to profile (Thomas)
      * 141985: Check .cddb directory for entries (Thomas)
      * 114015: Fix window title for gnome-cd on unknown discs (Thomas)
      * 135139: Add NetBSD support (Julio M. Merino Vidal)
      * 130651: Change name and comment in .desktop file (Thomas)
      * 140344: use gnome-common (Christian Neumair)
      * 141406: use a colorspace convertor from gst-plugins
      * 137198: install gstreamer-properties correctly (Julio Vidal)
      * 125409: redraw display text when style changes (Leena Gunda)
      * 137464: use gtk_icon_theme in recorder (Fernando Herrera)
      * 141985: also check .cddb entries (Thomas)
      * 114015: Fix display of unknown entries (Thomas)
      * 124924: Initialize pointers (Thomas)
      * 119596: Differentiate between audio and data cd (Balamurali Viswanathan)
      * 139555: Make CD playback stop when application exits (Richard Kinder)

5 files changed, 14 insertions, 145 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index bd0275ea4af..bc38c5f7933 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/06/06 08:09:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/09/21 17:13:35 jmmv Exp $
 
-DISTNAME=		gnome-media-2.6.2
-PKGREVISION=		1
+DISTNAME=		gnome-media-2.8.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -11,8 +10,9 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gst-plugins-esound>=0.8.1:../../audio/gst-plugins-esound
-DEPENDS+=		gst-plugins-oss>=0.8.1:../../audio/gst-plugins-oss
+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
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -24,7 +24,7 @@ USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		XGETTEXT="${LOCALBASE}/bin/xgettext"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
index e6d8dfafe00..82175eb6702 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome2-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/15 16:34:10 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/21 17:13:35 jmmv Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
@@ -314,6 +314,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
@@ -345,6 +346,7 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
 ${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/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
@@ -362,6 +364,7 @@ ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index e5bbd284f48..c65ded53c5f 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/05/15 16:34:10 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/09/21 17:13:35 jmmv Exp $
 
-SHA1 (gnome-media-2.6.2.tar.bz2) = 06dfe66ecbb462bd07930d706fd897aa532bccf2
-Size (gnome-media-2.6.2.tar.bz2) = 2970530 bytes
-SHA1 (patch-ag) = 114ddd8d95bf4b2e471d3bc13308aa03cef7dd1a
-SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e
+SHA1 (gnome-media-2.8.0.tar.bz2) = 7984f31d661801156b2d2b14141cfc45d8e727c7
+Size (gnome-media-2.8.0.tar.bz2) = 3171171 bytes
diff --git a/multimedia/gnome2-media/patches/patch-ag b/multimedia/gnome2-media/patches/patch-ag
deleted file mode 100644
index 531f7cda0c1..00000000000
--- a/multimedia/gnome2-media/patches/patch-ag
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2004/04/17 15:04:31 jmmv Exp $
-
---- gnome-cd/freebsd-cdrom.c.orig	Thu Apr 15 15:03:50 2004
-+++ gnome-cd/freebsd-cdrom.c	Thu Apr 15 15:11:36 2004
-@@ -166,7 +166,12 @@
- {
- 	FreeBSDCDRom *lcd = FREEBSD_CDROM (cdrom);
- 	FreeBSDCDRomPrivate *priv;
-+#ifdef __FreeBSD__
- 	struct ioc_read_toc_single_entry tocentry;
-+#else
-+	struct ioc_read_toc_entry tocentries;
-+	struct cd_toc_entry tocentry;
-+#endif
- 	int i, j;
- 	GError *error;
- 
-@@ -190,29 +195,56 @@
- 
- 	freebsd_cdrom_invalidate (lcd);
- 	priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (FreeBSDCDRomTrackInfo));
-+#ifdef __FreeBSD__
- 	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
- 		tocentry.track = j;
- 		tocentry.address_format = CD_MSF_FORMAT;
--
-+#else
-+	tocentries.data_len = sizeof(tocentry);
-+	tocentries.data = &tocentry;
-+	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
-+		tocentries.starting_track = j;
-+		tocentries.address_format = CD_MSF_FORMAT;
-+#endif
-+#ifdef __FreeBSD__
- 		if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
-+#else
-+		if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
-+#endif
- 			g_warning ("IOCtl failed");
- 			continue;
- 		}
- 
- 		priv->track_info[i].track = j;
-+#ifdef __FreeBSD__
- 		priv->track_info[i].audio_track = tocentry.entry.control == 0 ? 1 : 0;
- 		ASSIGN_MSF (priv->track_info[i].address, tocentry.entry.addr.msf);
-+#else
-+		priv->track_info[i].audio_track = tocentry.control == 0 ? 1 : 0;
-+		ASSIGN_MSF (priv->track_info[i].address, tocentry.addr.msf);
-+#endif
- 	}
- 
-+#ifdef __FreeBSD__
- 	/* On FreeBSD, the leadout track is the track LAST_TRACK + 1. */
- 	tocentry.track = priv->number_tracks + 1;
- 	tocentry.address_format = CD_MSF_FORMAT;
- 	if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
-+#else
-+	/* On NetBSD, the leadout track is the track 0xAA. */
-+	tocentries.starting_track = 0xAA;
-+	tocentries.address_format = CD_MSF_FORMAT;
-+	if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
-+#endif
- 		g_warning ("Error getting leadout");
- 		freebsd_cdrom_invalidate (lcd);
- 		return;
- 	}
-+#ifdef __FreeBSD__
- 	ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf);
-+#else
-+	ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf);
-+#endif
- 	calculate_track_lengths (lcd);
- 
- 	freebsd_cdrom_close (lcd);
-@@ -232,11 +264,18 @@
- 		return FALSE;
- 	}
- 
-+#ifdef __FreeBSD__
- 	if (gnome_cdrom_get_status (cdrom, &status, error) == FALSE) {
- 		freebsd_cdrom_close (lcd);
- 		g_free (status);
- 		return FALSE;
- 	}
-+#else
-+	status = g_new0 (GnomeCDRomStatus, 1);
-+	status->volume = 0;
-+	status->cd = GNOME_CDROM_STATUS_OK;
-+	ioctl(cdrom->fd, CDIOCALLOW);
-+#endif
- 
- 	if (status->cd != GNOME_CDROM_STATUS_TRAY_OPEN) {
- 		if (ioctl (cdrom->fd, CDIOCEJECT, 0) < 0) {
-@@ -862,7 +901,19 @@
- 		return FALSE;
- 	}
- #endif
-+#ifdef __FreeBSD__
- 	/* FIXME: Figure out how to do this on FreeBSD */
-+#else
-+	if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
-+		realstatus->cd = GNOME_CDROM_STATUS_NO_DISC;
-+		realstatus->audio = GNOME_CDROM_AUDIO_NOTHING;
-+		realstatus->track = -1;
-+
-+		freebsd_cdrom_close (lcd);
-+		return TRUE;
-+	}
-+	subchnl.track = 0;
-+#endif
- 	realstatus->cd = GNOME_CDROM_STATUS_OK;
- 
- 	subchnl.address_format = CD_MSF_FORMAT;
diff --git a/multimedia/gnome2-media/patches/patch-ai b/multimedia/gnome2-media/patches/patch-ai
deleted file mode 100644
index c3e2f2a4aea..00000000000
--- a/multimedia/gnome2-media/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/04/02 05:51:03 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=135139
-
---- configure.orig	2003-12-31 04:10:36.000000000 +0100
-+++ configure
-@@ -23197,6 +23197,11 @@ case "$host" in
- 	CDROM_HOST_LINUX=true
- 	default_cd_device="/dev/cdrom"
- 	;;
-+*NetBSD*)
-+	CDROM_HOST=freebsd
-+	CDROM_HOST_FREEBSD=true
-+	default_cd_device="/dev/rcd0d"
-+	;;
- *SunOS*)
- 	CDROM_HOST=solaris
- 	CDROM_HOST_SOLARIS=true