--- a/ChangeLog	Wed Sep 15 12:13:58 2004 +0000
+++ b/ChangeLog	Wed Sep 15 12:56:48 2004 +0000
@@ -1,3 +1,9 @@
+2004-09-15  Balamurali Viswanathan  <[email protected]>
+
+	* gnome-media.spec: Update
+	* patches/gnome-media-11-enable-lineout.diff: Add patch so that
+	Line out is enabled through gnome-cd. Fixes bug #5088435
+
 2004-09-15  Damien Carbery <[email protected]>
 
 	* gok.spec: Integrate updated docs tarball from [email protected].

--- a/gnome-media.spec	Wed Sep 15 12:13:58 2004 +0000
+++ b/gnome-media.spec	Wed Sep 15 12:56:48 2004 +0000
@@ -2,7 +2,7 @@
 Summary:      GNOME Multimedia
 Group:        System/GUI/GNOME
 Version:      2.6.1
-Release:      22
+Release:      23
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 License:      GPL
@@ -23,6 +23,7 @@
 Patch8:       gnome-media-08-g11n-configure.diff
 Patch9:       gnome-media-09-cdda.diff
 Patch10:      gnome-media-10-l10n-online-help.diff
+Patch11:      gnome-media-11-enable-lineout.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -63,6 +64,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 bzcat %SOURCE1 | tar xf -
 bzcat %SOURCE2 | tar xf -
@@ -196,6 +198,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 15 2004 - [email protected]
+- Add patch gnome-media-11-enable-lineout.diff to enable lineout 
+
 * Thu Sep 02 2004 - [email protected]
 - Remove patch gnome-media-10-disable-solaris-record.diff to enable record 
   button is Solaris. Since now we have source element for Solaris

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-11-enable-lineout.diff	Wed Sep 15 12:56:48 2004 +0000
@@ -0,0 +1,30 @@
+--- gnome-media-2.6.1/gnome-cd/solaris-cdrom.c	2004-09-09 11:35:34.000000000 +0600
++++ gnome-media-2.6.1-new/gnome-cd/solaris-cdrom.c	2004-09-09 10:44:21.662339000 +0600
+@@ -105,6 +105,7 @@ set_audio_port ()
+ 	int fd;
+ 	audio_info_t audio_info;
+ 	gchar        *audio_dev;
++	gint ports;
+ 
+ 	/* Retrieve AUDIODEV, if set */
+ 	if (g_getenv("AUDIODEV") != NULL) {
+@@ -127,12 +128,18 @@ set_audio_port ()
+ 
+ 	/* Check for AUDIO_CD */
+ 	if (audio_info.record.avail_ports & AUDIO_CD) {
++
++		ports = audio_info.play.port;
++		if (!(ports & AUDIO_LINE_OUT) && (audio_info.play.avail_ports & AUDIO_LINE_OUT)) {
++			ports = ports | AUDIO_LINE_OUT;
++		}
+ 		/* Initialise */
+-		AUDIO_INITINFO(&audio_info, sizeof (audio_info));
++		AUDIO_INITINFO(&audio_info);
+ 
+ 		/* Set the port to AUDIO_CD */
+ 		audio_info.record.port = AUDIO_CD;
+ 
++		audio_info.play.port = ports;
+ 		/* Set monitor gain */
+ 		audio_info.monitor_gain = AUDIO_MID_GAIN;
+