rpms/rhythmbox/F-8 rb-disable-broken-daap-stream-playback.patch, NONE, 1.1 rhythmbox.spec, 1.144, 1.145

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20864

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-disable-broken-daap-stream-playback.patch 
Log Message:
* Fri Nov 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-3
- Try to fix DAAP playback (#382351)


rb-disable-broken-daap-stream-playback.patch:

--- NEW FILE rb-disable-broken-daap-stream-playback.patch ---
Index: rb-daap-source.c
===================================================================
--- rb-daap-source.c	(revision 5447)
+++ rb-daap-source.c	(working copy)
@@ -66,8 +66,9 @@
 static char * rb_daap_source_get_browser_key (RBSource *source);
 static char * rb_daap_source_get_paned_key (RBBrowserSource *source);
 static void rb_daap_source_get_status (RBSource *source, char **text, char **progress_text, float *progress);
+#if 0
 static char * rb_daap_source_get_playback_uri (RhythmDBEntry *entry, gpointer data);
-
+#endif
 #define CONF_STATE_SORTING CONF_PREFIX "/state/daap/sorting"
 #define CONF_STATE_PANED_POSITION CONF_PREFIX "/state/daap/paned_position"
 #define CONF_STATE_SHOW_BROWSER CONF_PREFIX "/state/daap/show_browser"
@@ -277,7 +278,9 @@
 	g_free (entry_type_name);
 	type->save_to_disk = FALSE;
 	type->category = RHYTHMDB_ENTRY_NORMAL;
+#if 0
 	type->get_playback_uri = (RhythmDBEntryStringFunc) rb_daap_source_get_playback_uri;
+#endif
 	g_object_unref (db);
 
 	icon = rb_daap_plugin_get_icon (RB_DAAP_PLUGIN (plugin), password_protected, FALSE);
@@ -740,6 +743,7 @@
 	RB_SOURCE_CLASS (rb_daap_source_parent_class)->impl_get_status (source, text, progress_text, progress);
 }
 
+#if 0
 static char *
 rb_daap_source_get_playback_uri (RhythmDBEntry *entry, gpointer data)
 {
@@ -752,4 +756,4 @@
 
 	return g_strdup (location);
 }
-
+#endif


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rhythmbox.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- rhythmbox.spec	14 Nov 2007 18:53:43 -0000	1.144
+++ rhythmbox.spec	16 Nov 2007 17:02:50 -0000	1.145
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -49,6 +49,7 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=346434
 Patch1: rb-delete-ipod-tracks.patch
+Patch2: rb-disable-broken-daap-stream-playback.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -80,6 +81,9 @@
 pushd plugins/ipod/
 %patch1 -p0 -b .ipod-trash
 popd
+pushd plugins/daap/
+%patch2 -p0 -b .broken-daap
+popd
 
 %build
 
@@ -190,6 +194,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri Nov 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-3
+- Try to fix DAAP playback (#382351)
+
 * Wed Nov 14 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-2
 - Add missing gstreamer-python run-time dependency (#382921)