--- a/ChangeLog	Tue Jun 15 20:37:47 2004 +0000
+++ b/ChangeLog	Tue Jun 15 21:08:09 2004 +0000
@@ -1,3 +1,10 @@
+2004-06-15  Brian Cameron <[email protected]>
+
+	* gnome-media.spec: Bumping to 2.6.1 made patch
+	  gnome-media-04-add-gst-cflags-ldflags.diff unnecessary, so removed.
+	  Renamed other patches to keep numbering consistant.  This fixed bug
+	  5061791.
+
 2004-06-15  Damien Carbery <[email protected]>
 
 	* evolution.spec: Add docs tarball from [email protected].

--- a/gnome-media.spec	Tue Jun 15 20:37:47 2004 +0000
+++ b/gnome-media.spec	Tue Jun 15 21:08:09 2004 +0000
@@ -16,11 +16,10 @@
 Patch1:       gnome-media-01-g11n-potfiles.diff
 Patch2:       gnome-media-02-window-title.diff
 Patch3:       gnome-media-03-menu-entry.diff
-Patch4:       gnome-media-04-add-gst-cflags-ldflags.diff
-Patch5:       gnome-media-05-cddb-help-filename-update.diff
-Patch6:       gnome-media-06-solaris.diff
-Patch7:       gnome-media-07-destroy-cache.diff
-Patch8:       gnome-media-08-set-audio-port.diff
+Patch4:       gnome-media-04-cddb-help-filename-update.diff
+Patch5:       gnome-media-05-solaris.diff
+Patch6:       gnome-media-06-destroy-cache.diff
+Patch7:       gnome-media-07-set-audio-port.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}
@@ -57,7 +56,6 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 bzcat %SOURCE1 | tar xvf -
 bzcat %SOURCE2 | tar xvf -
@@ -170,6 +168,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jun 15 2004 - [email protected]
+- Bumping to 2.6.1 made patch gnome-media-04-add-gst-cflags-ldflags.diff
+  unnecessary, so removed.  This fixed bug 5061791.
+
 * Fri Jun 11 2004 - [email protected]
 - Integrated docs 0.4 tarball from [email protected]
 

--- a/patches/gnome-media-04-add-gst-cflags-ldflags.diff	Tue Jun 15 20:37:47 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- /home/bc99092/temp/gnome-media-2.6.0/configure.in	2004-03-22 10:02:23.000000000 -0600
-+++ gnome-media-2.6.0/configure.in	2004-03-28 16:49:41.043440000 -0600
-@@ -101,6 +101,9 @@
-     HAVE_GST=yes,HAVE_GST=no)
- fi
- 
-+CFLAGS="$CFLAGS $GSR_CFLAGS"
-+LDFLAGS="$LDFLAGS $GSR_LIBS"
-+
- if test "x$HAVE_GST" = "xno"; then
-   AC_MSG_WARN(you need GStreamer installed for the mixer and recorder to work)
- else

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-04-cddb-help-filename-update.diff	Tue Jun 15 21:08:09 2004 +0000
@@ -0,0 +1,11 @@
+--- gnome-media-2.6.0/cddb-slave2/cddb-slave-capplet.c	2003-10-05 15:21:01.000000000 +0530
++++ gnome-media-2.6.0-new/cddb-slave2/cddb-slave-capplet.c	2004-04-27 16:17:40.000000000 +0530
+@@ -104,7 +104,7 @@ dialog_button_clicked_cb (GtkDialog *dia
+ 	switch (response_id) {
+ 	case GTK_RESPONSE_HELP:
+ 		gnome_help_display_desktop (NULL, "user-guide",
+-					    "wgoscustlookandfeel.xml",
++					    "user-guide.xml",
+ 					    "goscustlookandfeel-39", &error);
+ 		if (error) {
+ 			GtkWidget *msg_dialog;

--- a/patches/gnome-media-05-cddb-help-filename-update.diff	Tue Jun 15 20:37:47 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-media-2.6.0/cddb-slave2/cddb-slave-capplet.c	2003-10-05 15:21:01.000000000 +0530
-+++ gnome-media-2.6.0-new/cddb-slave2/cddb-slave-capplet.c	2004-04-27 16:17:40.000000000 +0530
-@@ -104,7 +104,7 @@ dialog_button_clicked_cb (GtkDialog *dia
- 	switch (response_id) {
- 	case GTK_RESPONSE_HELP:
- 		gnome_help_display_desktop (NULL, "user-guide",
--					    "wgoscustlookandfeel.xml",
-+					    "user-guide.xml",
- 					    "goscustlookandfeel-39", &error);
- 		if (error) {
- 			GtkWidget *msg_dialog;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-05-solaris.diff	Tue Jun 15 21:08:09 2004 +0000
@@ -0,0 +1,48 @@
+--- gnome-media-2.6.1/grecord/src/gsr-window.c-orig	Fri May 28 15:55:33 2004
++++ gnome-media-2.6.1/grecord/src/gsr-window.c	Fri May 28 16:12:13 2004
+@@ -1316,6 +1316,10 @@
+ 	GSRWindowPipeline *obj;
+ 	GstElement *pipeline;
+ 	guint32 id;
++#ifdef __sun
++	GstElement *audioconvert;
++	GstElement *audioscale;
++#endif
+ 	GstElement *spider;
+ 
+ 	pipeline = gst_pipeline_new ("play-pipeline");
+@@ -1343,6 +1347,20 @@
+ 		return NULL;
+ 	}
+ 	
++#ifdef __sun
++ 	audioconvert = gst_element_factory_make ("audioconvert", "audioconvert");
++	if (!audioconvert) {
++		g_error ("Could not find element audioconvert");
++		return NULL;
++	}
++	
++ 	audioscale = gst_element_factory_make ("audioscale", "audioscale");
++	if (!audioscale) {
++		g_error ("Could not find element audioscale");
++		return NULL;
++	}
++#endif
++	
+ 	obj->sink = gst_gconf_get_default_audio_sink ();
+ 	if (!obj->sink)
+ 	{
+@@ -1350,8 +1368,13 @@
+ 		return NULL;
+ 	}
+ 
++#ifdef __sun
++	gst_bin_add_many (GST_BIN (pipeline), obj->src, spider, audioconvert, audioscale, obj->sink, NULL);
++	gst_element_link_many (obj->src, spider, audioconvert, audioscale, obj->sink, NULL);
++#else
+ 	gst_bin_add_many (GST_BIN (pipeline), obj->src, spider, obj->sink, NULL);
+ 	gst_element_link_many (obj->src, spider, obj->sink, NULL);
++#endif
+ 
+ 	return obj;
+ }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-06-destroy-cache.diff	Tue Jun 15 21:08:09 2004 +0000
@@ -0,0 +1,10 @@
+--- gnome-media-2.6.1/gnome-cd/callbacks.c.orig	2004-06-07 14:11:16.279768000 -0700
++++ gnome-media-2.6.1/gnome-cd/callbacks.c	2004-06-08 10:23:20.746893000 -0700
+@@ -724,6 +724,7 @@ cd_status_changed_cb (GnomeCDRom *cdrom,
+ 		if (gcd->disc_info != NULL) {
+ 			cddb_free_disc_info (gcd->disc_info);
+ 			gcd->disc_info = NULL;
++                        destroy_cache_hashTable();
+ 		}
+ 		
+ 		gtk_widget_set_sensitive (gcd->trackeditor_b, FALSE);

--- a/patches/gnome-media-06-solaris.diff	Tue Jun 15 20:37:47 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
---- gnome-media-2.6.1/grecord/src/gsr-window.c-orig	Fri May 28 15:55:33 2004
-+++ gnome-media-2.6.1/grecord/src/gsr-window.c	Fri May 28 16:12:13 2004
-@@ -1316,6 +1316,10 @@
- 	GSRWindowPipeline *obj;
- 	GstElement *pipeline;
- 	guint32 id;
-+#ifdef __sun
-+	GstElement *audioconvert;
-+	GstElement *audioscale;
-+#endif
- 	GstElement *spider;
- 
- 	pipeline = gst_pipeline_new ("play-pipeline");
-@@ -1343,6 +1347,20 @@
- 		return NULL;
- 	}
- 	
-+#ifdef __sun
-+ 	audioconvert = gst_element_factory_make ("audioconvert", "audioconvert");
-+	if (!audioconvert) {
-+		g_error ("Could not find element audioconvert");
-+		return NULL;
-+	}
-+	
-+ 	audioscale = gst_element_factory_make ("audioscale", "audioscale");
-+	if (!audioscale) {
-+		g_error ("Could not find element audioscale");
-+		return NULL;
-+	}
-+#endif
-+	
- 	obj->sink = gst_gconf_get_default_audio_sink ();
- 	if (!obj->sink)
- 	{
-@@ -1350,8 +1368,13 @@
- 		return NULL;
- 	}
- 
-+#ifdef __sun
-+	gst_bin_add_many (GST_BIN (pipeline), obj->src, spider, audioconvert, audioscale, obj->sink, NULL);
-+	gst_element_link_many (obj->src, spider, audioconvert, audioscale, obj->sink, NULL);
-+#else
- 	gst_bin_add_many (GST_BIN (pipeline), obj->src, spider, obj->sink, NULL);
- 	gst_element_link_many (obj->src, spider, obj->sink, NULL);
-+#endif
- 
- 	return obj;
- }

--- a/patches/gnome-media-07-destroy-cache.diff	Tue Jun 15 20:37:47 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gnome-media-2.6.1/gnome-cd/callbacks.c.orig	2004-06-07 14:11:16.279768000 -0700
-+++ gnome-media-2.6.1/gnome-cd/callbacks.c	2004-06-08 10:23:20.746893000 -0700
-@@ -724,6 +724,7 @@ cd_status_changed_cb (GnomeCDRom *cdrom,
- 		if (gcd->disc_info != NULL) {
- 			cddb_free_disc_info (gcd->disc_info);
- 			gcd->disc_info = NULL;
-+                        destroy_cache_hashTable();
- 		}
- 		
- 		gtk_widget_set_sensitive (gcd->trackeditor_b, FALSE);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-07-set-audio-port.diff	Tue Jun 15 21:08:09 2004 +0000
@@ -0,0 +1,77 @@
+--- gnome-media-2.6.1/gnome-cd/solaris-cdrom.c	2004-01-06 04:12:49.000000000 +0000
++++ gnome-media-2.6.1-new/gnome-cd/solaris-cdrom.c	2004-05-27 12:16:46.119260000 +0100
+@@ -92,6 +92,55 @@ static gboolean solaris_cdrom_close_tray
+ 
+ static GnomeCDRomMSF blank_msf = { 0, 0, 0};
+ 
++static void
++set_audio_port ()
++{
++	int fd;
++	audio_info_t audio_info;
++	gchar        *audio_dev;
++
++	/* Retrieve AUDIODEV, if set */
++	if (g_getenv("AUDIODEV") != NULL) {
++		audio_dev = g_strdup (g_getenv("AUDIODEV"));
++	} else {
++		audio_dev = g_strdup ("/dev/audio");
++	}
++
++	/* Open the device */
++	if ((fd = open (audio_dev, O_WRONLY | O_NDELAY)) < 0) {
++		g_warning ("(set_audio_port): Opening of device failed %s",
++			   strerror (errno));
++	}
++
++	/* Retrieve info */
++	if (ioctl(fd, AUDIO_GETINFO, &audio_info) < 0) {
++		g_warning ("(set_audio_port): AUDIO_GETINFO ioctl failed %s",
++			   strerror (errno));
++        }
++
++	/* Check for AUDIO_CD */
++	if (audio_info.record.avail_ports & AUDIO_CD) {
++		/* Initialise */
++		AUDIO_INITINFO(&audio_info, sizeof (audio_info));
++
++		/* Set the port to AUDIO_CD */
++		audio_info.record.port = AUDIO_CD;
++
++		/* Set monitor gain */
++		audio_info.monitor_gain = AUDIO_MID_GAIN;
++
++		/* Apply */
++		if (ioctl(fd, AUDIO_SETINFO, &audio_info) < 0) {
++		g_warning ("(set_audio_port): AUDIO_SETINFO ioctl failed %s",
++			   strerror (errno));
++			perror ("AUDIO_SETINFO");
++		}
++	}
++
++	close (fd);
++	g_free (audio_dev);
++}
++
+ /* To determine whether the machine has a cdrom drive or not */
+ void
+ find_cdrom()
+@@ -862,6 +911,7 @@ solaris_cdrom_get_status (GnomeCDRom *cd
+ 	struct cdrom_subchnl subchnl;
+ 	struct cdrom_tocentry tocentry;
+ 	struct audio_info audioinfo;
++	static gboolean port_set = FALSE;
+ 	int vol_fd;
+ 	int cd_status;
+ 	int i, j;
+@@ -888,6 +938,10 @@ solaris_cdrom_get_status (GnomeCDRom *cd
+ 		return FALSE;
+ 	}
+ 
++	if (!port_set) {
++		set_audio_port ();
++		port_set = TRUE;
++	}
+ #if 0
+ 	cd_status = ioctl (cdrom->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
+ 	if (cd_status != -1) {

--- a/patches/gnome-media-08-set-audio-port.diff	Tue Jun 15 20:37:47 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
---- gnome-media-2.6.1/gnome-cd/solaris-cdrom.c	2004-01-06 04:12:49.000000000 +0000
-+++ gnome-media-2.6.1-new/gnome-cd/solaris-cdrom.c	2004-05-27 12:16:46.119260000 +0100
-@@ -92,6 +92,55 @@ static gboolean solaris_cdrom_close_tray
- 
- static GnomeCDRomMSF blank_msf = { 0, 0, 0};
- 
-+static void
-+set_audio_port ()
-+{
-+	int fd;
-+	audio_info_t audio_info;
-+	gchar        *audio_dev;
-+
-+	/* Retrieve AUDIODEV, if set */
-+	if (g_getenv("AUDIODEV") != NULL) {
-+		audio_dev = g_strdup (g_getenv("AUDIODEV"));
-+	} else {
-+		audio_dev = g_strdup ("/dev/audio");
-+	}
-+
-+	/* Open the device */
-+	if ((fd = open (audio_dev, O_WRONLY | O_NDELAY)) < 0) {
-+		g_warning ("(set_audio_port): Opening of device failed %s",
-+			   strerror (errno));
-+	}
-+
-+	/* Retrieve info */
-+	if (ioctl(fd, AUDIO_GETINFO, &audio_info) < 0) {
-+		g_warning ("(set_audio_port): AUDIO_GETINFO ioctl failed %s",
-+			   strerror (errno));
-+        }
-+
-+	/* Check for AUDIO_CD */
-+	if (audio_info.record.avail_ports & AUDIO_CD) {
-+		/* Initialise */
-+		AUDIO_INITINFO(&audio_info, sizeof (audio_info));
-+
-+		/* Set the port to AUDIO_CD */
-+		audio_info.record.port = AUDIO_CD;
-+
-+		/* Set monitor gain */
-+		audio_info.monitor_gain = AUDIO_MID_GAIN;
-+
-+		/* Apply */
-+		if (ioctl(fd, AUDIO_SETINFO, &audio_info) < 0) {
-+		g_warning ("(set_audio_port): AUDIO_SETINFO ioctl failed %s",
-+			   strerror (errno));
-+			perror ("AUDIO_SETINFO");
-+		}
-+	}
-+
-+	close (fd);
-+	g_free (audio_dev);
-+}
-+
- /* To determine whether the machine has a cdrom drive or not */
- void
- find_cdrom()
-@@ -862,6 +911,7 @@ solaris_cdrom_get_status (GnomeCDRom *cd
- 	struct cdrom_subchnl subchnl;
- 	struct cdrom_tocentry tocentry;
- 	struct audio_info audioinfo;
-+	static gboolean port_set = FALSE;
- 	int vol_fd;
- 	int cd_status;
- 	int i, j;
-@@ -888,6 +938,10 @@ solaris_cdrom_get_status (GnomeCDRom *cd
- 		return FALSE;
- 	}
- 
-+	if (!port_set) {
-+		set_audio_port ();
-+		port_set = TRUE;
-+	}
- #if 0
- 	cd_status = ioctl (cdrom->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
- 	if (cd_status != -1) {