diff --git a/audacious-2.2-coverart.patch b/audacious-2.2-coverart.patch new file mode 100644 index 0000000..22bce63 --- /dev/null +++ b/audacious-2.2-coverart.patch @@ -0,0 +1,51 @@ +diff -Nur audacious-2.2-orig/src/audacious/ui_albumart.c audacious-2.2/src/audacious/ui_albumart.c +--- audacious-2.2-orig/src/audacious/ui_albumart.c 2009-11-22 23:43:47.000000000 +0100 ++++ audacious-2.2/src/audacious/ui_albumart.c 2010-02-15 20:18:37.000000000 +0100 +@@ -123,6 +123,8 @@ + { + GDir *d; + ++ if (!path) ++ return NULL; + if (cfg.recurse_for_cover && depth > cfg.recurse_for_cover_depth) + return NULL; + +diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfo.c audacious-2.2/src/audacious/ui_fileinfo.c +--- audacious-2.2-orig/src/audacious/ui_fileinfo.c 2009-11-22 23:43:47.000000000 +0100 ++++ audacious-2.2/src/audacious/ui_fileinfo.c 2010-02-15 20:19:54.000000000 +0100 +@@ -790,7 +790,7 @@ + fileinfo_show_for_tuple(Tuple *tuple, gboolean updating_enabled) + { + gchar *tmp = NULL; +- GdkPixbuf *icon = NULL; ++ GdkPixbuf *icon = NULL, *localpath = NULL; + GtkTreeIter iter; + GtkListStore *store; + mowgli_dictionary_iteration_state_t state; +@@ -849,9 +849,11 @@ + g_object_unref(icon); + } + ++ localpath = g_filename_from_uri( tuple_get_string(tuple, FIELD_FILE_PATH, NULL), NULL, NULL ); + tmp = fileinfo_recursive_get_image( +- tuple_get_string(tuple, FIELD_FILE_PATH, NULL), ++ localpath, + tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0); ++ g_free(localpath); + + if (tmp) { + fileinfo_entry_set_image(image_artwork, tmp); +diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfopopup.c audacious-2.2/src/audacious/ui_fileinfopopup.c +--- audacious-2.2-orig/src/audacious/ui_fileinfopopup.c 2009-11-22 23:43:47.000000000 +0100 ++++ audacious-2.2/src/audacious/ui_fileinfopopup.c 2010-02-15 20:20:25.000000000 +0100 +@@ -408,7 +408,9 @@ + g_free(track_string); + + if (tuple_get_string(tuple, FIELD_FILE_NAME, NULL) && tuple_get_string(tuple, FIELD_FILE_PATH, NULL)) { +- tmp = fileinfo_recursive_get_image(tuple_get_string(tuple, FIELD_FILE_PATH, NULL), tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0); ++ gchar *localpath = g_filename_from_uri( tuple_get_string(tuple, FIELD_FILE_PATH, NULL), NULL, NULL ); ++ tmp = fileinfo_recursive_get_image( localpath, tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0); ++ g_free(localpath); + if (tmp) { // picture found + if (!last_artwork || strcmp(last_artwork, tmp)) { // new picture + filepopup_entry_set_image(filepopup_win, "image_artwork", tmp); diff --git a/audacious.spec b/audacious.spec index 850b7fb..1a7c039 100644 --- a/audacious.spec +++ b/audacious.spec @@ -5,7 +5,7 @@ Name: audacious Version: 2.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3 Summary: GTK2 based media player similar to XMMS @@ -27,6 +27,8 @@ Patch3: audacious-2.2-multiple-decoders-per-ext.patch Patch4: audacious-2.2-set_tuple_cb.patch # Patch5: audacious-2.2-libm.patch +# obsolete with version upgrade +Patch6: audacious-2.2-coverart.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,6 +93,7 @@ sed -i -e 's!\(build_stamp.*\)UNSUPPORTED VERSION!\1Fedora package!' src/audacio %patch3 -p1 -b .multiple-decoders %patch4 -p1 -b .set_tuple_cb %patch5 -p1 -b .libm +%patch6 -p1 -b .coverart # From .desktop files remove MIME types the base build of the # Fedora audacious-plugins package does not understand. @@ -206,6 +209,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Feb 15 2010 Michael Schwendt - 2.2-12 +- Fix album cover art image loader (which cannot handle vfs URIs). + * Sat Feb 13 2010 Michael Schwendt - 2.2-11 - Explicitly link with libm because of: http://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking