diff --git a/.cvsignore b/.cvsignore index d47d816..701fd39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rhythmbox-0.11.6.tar.bz2 +rhythmbox-0.11.6-r5956.tar.gz diff --git a/icon-names.patch b/icon-names.patch deleted file mode 100644 index 9db8adf..0000000 --- a/icon-names.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up rhythmbox-0.11.6/lib/rb-stock-icons.c.icon-names rhythmbox-0.11.6/lib/rb-stock-icons.c ---- rhythmbox-0.11.6/lib/rb-stock-icons.c.icon-names 2008-07-26 21:37:10.000000000 -0400 -+++ rhythmbox-0.11.6/lib/rb-stock-icons.c 2008-07-26 21:38:20.000000000 -0400 -@@ -62,8 +62,8 @@ const char RB_STOCK_PLAYLIST[] = "playli - const char RB_STOCK_PLAYLIST_NEW[] = "playlist-new"; - const char RB_STOCK_AUTO_PLAYLIST[] = "playlist-automatic"; - const char RB_STOCK_AUTO_PLAYLIST_NEW[] = "playlist-automatic-new"; --const char GNOME_MEDIA_SHUFFLE[] = "stock_shuffle"; --const char GNOME_MEDIA_REPEAT[] = "stock_repeat"; -+const char GNOME_MEDIA_SHUFFLE[] = "media-playlist-shuffle"; -+const char GNOME_MEDIA_REPEAT[] = "media-playlist-repeat"; - const char GNOME_MEDIA_EJECT[] = "media-eject"; - - static RBInlineIconData inline_icons[] = { -diff -up rhythmbox-0.11.6/widgets/rb-entry-view.c.icon-names rhythmbox-0.11.6/widgets/rb-entry-view.c ---- rhythmbox-0.11.6/widgets/rb-entry-view.c.icon-names 2008-07-26 21:42:41.000000000 -0400 -+++ rhythmbox-0.11.6/widgets/rb-entry-view.c 2008-07-26 21:44:50.000000000 -0400 -@@ -521,17 +521,17 @@ rb_entry_view_init (RBEntryView *view) - icon_theme = gtk_icon_theme_get_default (); - - view->priv->playing_pixbuf = gtk_icon_theme_load_icon (icon_theme, -- "stock_media-play", -+ "media-playback-start", - 16, - 0, - NULL); - view->priv->paused_pixbuf = gtk_icon_theme_load_icon (icon_theme, -- "stock_media-pause", -+ "media-playback-pause", - 16, - 0, - NULL); - view->priv->error_pixbuf = gtk_icon_theme_load_icon (icon_theme, -- "stock_dialog-error", -+ "dialog-error", - 16, - 0, - NULL); -@@ -1803,7 +1803,7 @@ rb_entry_view_constructor (GType type, - view, - NULL); - -- image_widget = gtk_image_new_from_icon_name ("stock_volume-max", GTK_ICON_SIZE_MENU); -+ image_widget = gtk_image_new_from_icon_name ("audio-volume-high", GTK_ICON_SIZE_MENU); - gtk_tree_view_column_set_widget (column, image_widget); - gtk_widget_show (image_widget); - diff --git a/rb-default-lirc-setup.patch b/rb-default-lirc-setup.patch deleted file mode 100644 index 3731612..0000000 --- a/rb-default-lirc-setup.patch +++ /dev/null @@ -1,211 +0,0 @@ -Index: lib/rb-util.h -=================================================================== ---- lib/rb-util.h (revision 5858) -+++ lib/rb-util.h (working copy) -@@ -38,6 +38,10 @@ - - G_BEGIN_DECLS - -+/* Offsets for seeking forward, and rewinding in seconds */ -+#define FFWD_OFFSET 20 -+#define RWD_OFFSET 10 -+ - gboolean rb_true_function (gpointer dummy); - gboolean rb_false_function (gpointer dummy); - gpointer rb_null_function (gpointer dummy); -Index: plugins/lirc/rhythmbox_lirc_default -=================================================================== ---- plugins/lirc/rhythmbox_lirc_default (revision 0) -+++ plugins/lirc/rhythmbox_lirc_default (revision 0) -@@ -0,0 +1,116 @@ -+# edit the "button =" part for each entry according to your remote, and stick -+# this stuff in ~/.lircrc -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_PLAY -+ repeat = 1 -+ config = play -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_PAUSE -+ repeat = 0 -+ config = pause -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_PLAYPAUSE -+ repeat = 1 -+ config = playpause -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_STOP -+ repeat = 1 -+ config = stop -+end -+ -+#FIXME -+#begin -+# prog = Rhythmbox -+# remote = * -+# button = -+# repeat = 1 -+# config = shuffle -+#end -+ -+#FIXME -+#begin -+# prog = Rhythmbox -+# remote = * -+# button = -+# repeat = 1 -+# config = repeat -+#end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_NEXT -+ repeat = 1 -+ config = next -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = previous -+ repeat = 1 -+ config = KEY_PREVIOUS -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_FASTFORWARD -+ repeat = 1 -+ config = seek_forward -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_REWIND -+ repeat = 1 -+ config = seek_backward -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_VOLUMEUP -+ repeat = 1 -+ config = volume_up -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_VOLUMEDOWN -+ repeat = 1 -+ config = volume_down -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_MUTE -+ repeat = 1 -+ config = mute -+end -+ -+begin -+ prog = Rhythmbox -+ remote = * -+ button = KEY_EXIT -+ repeat = 1 -+ config = quit -+end -Index: plugins/lirc/rb-lirc-plugin.c -=================================================================== ---- plugins/lirc/rb-lirc-plugin.c (revision 5858) -+++ plugins/lirc/rb-lirc-plugin.c (working copy) -@@ -42,6 +42,7 @@ - #include "rb-plugin.h" - #include "rb-shell.h" - #include "rb-debug.h" -+#include "rb-util.h" - #include "rb-shell-player.h" - - #define RB_TYPE_LIRC_PLUGIN (rb_lirc_plugin_get_type ()) -@@ -162,9 +163,9 @@ - } else if (strcmp (str, RB_IR_COMMAND_PREVIOUS) == 0) { - rb_shell_player_do_previous (plugin->shell_player, NULL); - } else if (strcmp (str, RB_IR_COMMAND_SEEK_FORWARD) == 0) { -- rb_shell_player_seek (plugin->shell_player, 10); -+ rb_shell_player_seek (plugin->shell_player, FFWD_OFFSET); - } else if (strcmp (str, RB_IR_COMMAND_SEEK_BACKWARD) == 0) { -- rb_shell_player_seek (plugin->shell_player, -10); -+ rb_shell_player_seek (plugin->shell_player, -RWD_OFFSET); - } else if (strcmp (str, RB_IR_COMMAND_VOLUME_UP) == 0) { - rb_shell_player_set_volume_relative (plugin->shell_player, 0.1, NULL); - } else if (strcmp (str, RB_IR_COMMAND_VOLUME_DOWN) == 0) { -@@ -191,6 +192,7 @@ - RBShell *shell) - { - int fd; -+ char *path; - RBLircPlugin *plugin = RB_LIRC_PLUGIN (rbplugin); - - plugin->shell = g_object_ref (shell); -@@ -205,12 +207,18 @@ - return; - } - -- if (lirc_readconfig (NULL, &plugin->lirc_config, NULL) == -1) { -+ /* Load the default Rhythmbox setup */ -+ path = rb_plugin_find_file (rbplugin, "rhythmbox_lirc_default"); -+ if (path == NULL || lirc_readconfig (path, &plugin->lirc_config, NULL) == -1) { -+ g_free (path); - close (fd); - rb_debug ("Couldn't read lirc configuration"); - return; - } -+ g_free (path); - -+ lirc_readconfig (NULL, &plugin->lirc_config, NULL); -+ - plugin->lirc_channel = g_io_channel_unix_new (fd); - g_io_channel_set_encoding (plugin->lirc_channel, NULL, NULL); - g_io_channel_set_buffered (plugin->lirc_channel, FALSE); -Index: plugins/lirc/Makefile.am -=================================================================== ---- plugins/lirc/Makefile.am (revision 5858) -+++ plugins/lirc/Makefile.am (working copy) -@@ -6,6 +6,9 @@ - - librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client - -+configdir = $(PLUGINDIR)/lirc -+config_DATA = rhythmbox_lirc_default -+ - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_LOG_DOMAIN=\"Rhythmbox\" \ -@@ -32,7 +35,7 @@ - - plugin_DATA = $(plugin_in_files:.rb-plugin.in=.rb-plugin) - --EXTRA_DIST = $(plugin_in_files) -+EXTRA_DIST = $(plugin_in_files) $(config_DATA) - - CLEANFILES = $(plugin_DATA) - DISTCLEANFILES = $(plugin_DATA) diff --git a/rhythmbox-0.11.5-ipod-vfat.patch b/rhythmbox-0.11.5-ipod-vfat.patch deleted file mode 100644 index 03adff3..0000000 --- a/rhythmbox-0.11.5-ipod-vfat.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: plugins/ipod/rb-ipod-source.c -=================================================================== ---- plugins/ipod/rb-ipod-source.c (révision 4727) -+++ plugins/ipod/rb-ipod-source.c (copie de travail) -@@ -1176,6 +1176,8 @@ - pc_filename = utf8_to_ascii (tmp); - g_free (tmp); - -+ g_strdelimit (pc_filename, "\"", '\''); -+ g_strdelimit (pc_filename, ":/|<>*?\\", '_'); - g_assert (g_utf8_validate (pc_filename, -1, NULL)); - /* Now we have a valid UTF-8 filename, try to find out where to put - * it on the iPod diff --git a/rhythmbox-0.11.5-xfade-buffering.patch b/rhythmbox-0.11.5-xfade-buffering.patch deleted file mode 100644 index a51169e..0000000 --- a/rhythmbox-0.11.5-xfade-buffering.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- trunk/backends/gstreamer/rb-player-gst-xfade.c 2008/06/14 01:10:29 5745 -+++ trunk/backends/gstreamer/rb-player-gst-xfade.c 2008/07/18 23:50:01 5813 -@@ -1777,8 +1777,8 @@ - } else { - progress = 99; - } -- rb_debug ("current network buffer level: %u; threshold %u - %u%%", -- level, stream->queue_threshold, progress); -+ rb_debug ("%s: buffer level: %u; threshold %u - %u%%", -+ stream->uri, level, stream->queue_threshold, progress); - - post_buffering_message (stream, progress); - -@@ -1790,7 +1790,7 @@ - { - GstPad *sinkpad; - -- rb_debug ("queue running - removing pad probe, running signal handler"); -+ rb_debug ("%s: queue running", stream->uri); - - /* detach pad probe */ - sinkpad = gst_element_get_pad (stream->queue, "sink"); -@@ -1811,7 +1811,7 @@ - static void - stream_queue_underrun_cb (GstElement *queue, RBXFadeStream *stream) - { -- rb_debug ("queue underrun - attaching pad probe, running signal handler"); -+ rb_debug ("%s: queue underrun", stream->uri); - GstPad *sinkpad; - - g_object_set (stream->queue, "min-threshold-bytes", stream->queue_threshold, NULL); -@@ -2454,13 +2454,30 @@ - get_times_and_stream (RBPlayerGstXFade *player, RBXFadeStream **pstream, gint64 *pos, gint64 *duration) - { - gboolean got_time = FALSE; -+ gboolean buffering = FALSE; - RBXFadeStream *stream; - - if (player->priv->pipeline == NULL) - return FALSE; - - g_static_rec_mutex_lock (&player->priv->stream_list_lock); -- stream = find_stream_by_state (player, FADING_IN | PLAYING | FADING_OUT_PAUSED | PAUSED | PENDING_REMOVE); -+ -+ /* first look for a network stream that is buffering during preroll */ -+ stream = find_stream_by_state (player, PREROLLING | PREROLL_PLAY); -+ if (stream != NULL) { -+ if (stream->emitted_fake_playing == FALSE) { -+ g_object_unref (stream); -+ stream = NULL; -+ } else { -+ rb_debug ("found buffering stream %s as current", stream->uri); -+ buffering = TRUE; -+ } -+ } -+ -+ /* otherwise, the stream that is playing */ -+ if (stream == NULL) { -+ stream = find_stream_by_state (player, FADING_IN | PLAYING | FADING_OUT_PAUSED | PAUSED | PENDING_REMOVE); -+ } - g_static_rec_mutex_unlock (&player->priv->stream_list_lock); - - if (stream != NULL) { -@@ -2469,7 +2486,9 @@ - } - - if (pos != NULL) { -- if (stream->state == PAUSED) { -+ if (buffering) { -+ *pos = 0; -+ } else if (stream->state == PAUSED) { - GstFormat format = GST_FORMAT_TIME; - *pos = -1; - diff --git a/rhythmbox-0.11.6-libmtp-0.3.patch b/rhythmbox-0.11.6-libmtp-0.3.patch deleted file mode 100644 index 608f06d..0000000 --- a/rhythmbox-0.11.6-libmtp-0.3.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c -index e699e58..84346d4 100644 ---- a/plugins/mtpdevice/rb-mtp-source.c -+++ b/plugins/mtpdevice/rb-mtp-source.c -@@ -329,6 +329,27 @@ add_mtp_track_to_db (RBMtpSource *source, - g_value_unset (&value); - } - -+ /* Set playcount */ -+ if (track->usecount != 0) { -+ GValue value = {0, }; -+ g_value_init (&value, G_TYPE_ULONG); -+ g_value_set_ulong (&value, track->usecount); -+ rhythmdb_entry_set (RHYTHMDB (db), entry, -+ RHYTHMDB_PROP_PLAY_COUNT, -+ &value); -+ g_value_unset (&value); -+ } -+ /* Set rating */ -+ if (track->rating != 0) { -+ GValue value = {0, }; -+ g_value_init (&value, G_TYPE_DOUBLE); -+ g_value_set_double (&value, track->rating/20); -+ rhythmdb_entry_set (RHYTHMDB (db), entry, -+ RHYTHMDB_PROP_RATING, -+ &value); -+ g_value_unset (&value); -+ } -+ - /* Set title */ - entry_set_string_prop (RHYTHMDB (db), entry, RHYTHMDB_PROP_TITLE, track->title); - -@@ -663,6 +684,8 @@ transfer_track (RBMtpSource *source, - } - trackmeta->tracknumber = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_TRACK_NUMBER); - trackmeta->duration = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DURATION) * 1000; -+ trackmeta->rating = rhythmdb_entry_get_double (entry, RHYTHMDB_PROP_RATING) * 20; -+ trackmeta->usecount = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_PLAY_COUNT); - trackmeta->filesize = filesize; - if (mimetype == NULL) { - trackmeta->filetype = mimetype_to_filetype (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MIMETYPE)); -diff -ur a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c ---- a/plugins/mtpdevice/rb-mtp-source.c -+++ b/plugins/mtpdevice/rb-mtp-source.c -@@ -670,7 +693,11 @@ transfer_track (RBMtpSource *source, - trackmeta->filetype = mimetype_to_filetype (mimetype); - } - -+#ifdef HAVE_LIBMTP_030 -+ if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL) != 0) { -+#else - if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0) != 0) { -+#endif - LIBMTP_destroy_track_t (trackmeta); - rb_debug ("Tracktransfer failed\n"); - return NULL; ---- trunk/configure.ac 2008/07/29 13:17:53 5825 -+++ trunk/configure.ac 2008/08/09 02:19:14 5844 -@@ -154,6 +154,11 @@ - fi - if test "x$enable_hal" = xyes; then - use_mtp=yes -+ dnl Check for libmtp 0.3.0+ -+ PKG_CHECK_EXISTS(libmtp >= 0.3.0, found_libmtp_030_pkg=yes, found_libmtp_030_pkg=no) -+ if test x"$found_libmtp_030_pkg" = "xyes" ; then -+ AC_DEFINE([HAVE_LIBMTP_030], 1, [indicates whether libmtp 0.3.0 is installed]) -+ fi - fi - AC_SUBST(MTP_CFLAGS) - AC_SUBST(MTP_LIBS) diff --git a/rhythmbox.spec b/rhythmbox.spec index dc8ad09..210a00e 100644 --- a/rhythmbox.spec +++ b/rhythmbox.spec @@ -3,11 +3,12 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.6 -Release: 8%{?dist} +Release: r5956%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ -Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2 +#Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}-r5956.tar.gz Source1: rhythmbox-iradio-initial.pls # http://bugzilla.gnome.org/show_bug.cgi?id=524079 Source2: rhythmbox.png @@ -47,27 +48,11 @@ BuildRequires: lirc-devel BuildRequires: libmtp-devel BuildRequires: gstreamer-python BuildRequires: perl(XML::Parser) intltool -BuildRequires: xulrunner-devel - -BuildRequires: automake autoconf libtool ExcludeArch: s390 s390x # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=374078 -# https://bugzilla.redhat.com/show_bug.cgi?id=440668 -Patch1: rhythmbox-0.11.5-ipod-vfat.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=546962 -# https://bugzilla.redhat.com/show_bug.cgi?id=458388 -Patch2: rhythmbox-0.11.6-libmtp-0.3.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=545555 -Patch3: rb-default-lirc-setup.patch - -Patch10: rhythmbox-0.11.5-xfade-buffering.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=544917 -Patch23: icon-names.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -97,16 +82,9 @@ UPnP/DLNA network devices. %setup -q %patch0 -p0 -b .dont-disable-suspend -%patch1 -p0 -b .ipod-vfat -%patch2 -p1 -b .mtp -%patch3 -p0 -b .lirc -%patch10 -p1 -b .xfade -%patch23 -p1 -b .icon-names %build -autoreconf - # work around a gstreamer bug /usr/bin/gst-inspect-0.10 --print-all >& /dev/null || : @@ -219,6 +197,11 @@ fi %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Wed Oct 01 2008 - Bastien Nocera 0.11.6-r5956 +- Update to latest trunk version, with GIO support and very many + bug fixes +- Remove obsoleted patches, autotools and xulrunner-devel BRs + * Wed Sep 3 2008 Tom "spot" Callaway 0.11.6-8 - fix license tag diff --git a/sources b/sources index 5678336..5cde3f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b827e047d13954ba956c3c4ea940935e rhythmbox-0.11.6.tar.bz2 +546e41c00cf73370b58c75f8cd0fcd8f rhythmbox-0.11.6-r5956.tar.gz