update to 0.12.1

changes:
* Removal of libgnome dependency when building with gtk+ 2.14+
* Greatly reduced memory usage when accessing Jamendo catalog
* Cover art improvements:
  - Provide cover art for all songs transferred to iPods
  - Support for transferring cover art to MTP devices
  - Cover art image widget is better behaved when resized
* Switched to decodebin2, notably allowing playback of chained ogg streams
* Better support for lossless encoded files in the UI
* Compatibility with the DeviceKit-disks gvfs volume monitor
* Some support for 'album sortname' tags
* Allow configuration of the audioscrobbler handshake URL (libre.fm)
* Improved network buffering in the crossfading player backend

5 files changed, 15 insertions, 55 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 103dd44d55a..ff2c4d4999c 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2009/04/17 17:51:00 drochner Exp $
+# $NetBSD: Makefile,v 1.63 2009/05/26 18:15:20 drochner Exp $
 #
 
-DISTNAME=	rhythmbox-0.12.0
+DISTNAME=	rhythmbox-0.12.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--without-hal
 
 GCONF_SCHEMAS=		rhythmbox.schemas
 
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.14.0
 BUILDLINK_API_DEPENDS.musicbrainz+=	musicbrainz>=2.1.0
 BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
 
@@ -57,7 +57,6 @@ BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
@@ -73,4 +72,5 @@ BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index 0cd429cea99..fbe41758fb2 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/04/17 17:51:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/05/26 18:15:20 drochner Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 lib/librhythmbox-core.la
@@ -439,12 +439,14 @@ share/locale/id/LC_MESSAGES/rhythmbox.mo
 share/locale/is/LC_MESSAGES/rhythmbox.mo
 share/locale/it/LC_MESSAGES/rhythmbox.mo
 share/locale/ja/LC_MESSAGES/rhythmbox.mo
+share/locale/kn/LC_MESSAGES/rhythmbox.mo
 share/locale/ko/LC_MESSAGES/rhythmbox.mo
 share/locale/lt/LC_MESSAGES/rhythmbox.mo
 share/locale/lv/LC_MESSAGES/rhythmbox.mo
 share/locale/mk/LC_MESSAGES/rhythmbox.mo
 share/locale/ml/LC_MESSAGES/rhythmbox.mo
 share/locale/mn/LC_MESSAGES/rhythmbox.mo
+share/locale/mr/LC_MESSAGES/rhythmbox.mo
 share/locale/ms/LC_MESSAGES/rhythmbox.mo
 share/locale/nb/LC_MESSAGES/rhythmbox.mo
 share/locale/ne/LC_MESSAGES/rhythmbox.mo
@@ -493,7 +495,6 @@ share/rhythmbox/glade/podcast-properties.glade
 share/rhythmbox/glade/song-info-multiple.glade
 share/rhythmbox/glade/song-info.glade
 share/rhythmbox/glade/uri-new.glade
-share/rhythmbox/glade/uri.glade
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-duplicate.png
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-duplicate.svg
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-new.png
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index c4febca4a00..6c2ba54e1ab 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.25 2009/04/17 17:51:00 drochner Exp $
+$NetBSD: distinfo,v 1.26 2009/05/26 18:15:20 drochner Exp $
 
-SHA1 (rhythmbox-0.12.0.tar.bz2) = b9c478099d9a1dc3a201d5d217d0b08b111f81b9
-RMD160 (rhythmbox-0.12.0.tar.bz2) = d7bbf03b44d6b2ac22e4fb466122471e6368762e
-Size (rhythmbox-0.12.0.tar.bz2) = 4925468 bytes
+SHA1 (rhythmbox-0.12.1.tar.bz2) = e4360e67aad41adb2dbad0a13c508638de4dfa6c
+RMD160 (rhythmbox-0.12.1.tar.bz2) = 72964294d2bd8353c86a0f57bde7d7f37db88f41
+Size (rhythmbox-0.12.1.tar.bz2) = 4859015 bytes
 SHA1 (patch-aa) = fa82e1d8176f4ee0b82e8fc307d506444ae22600
 SHA1 (patch-ac) = c2cad1c4b074910797a21117f6809d8e00d12f30
-SHA1 (patch-ad) = db302f38ca3d4455b4088d80bda80f5653b5d8da
-SHA1 (patch-af) = 03129bac59d0a2cd40a2d342907afb48be39c8f6
+SHA1 (patch-ad) = 1b9b61448c5e72d5be9cba158a15d983b73c4b8f
diff --git a/audio/rhythmbox/patches/patch-ad b/audio/rhythmbox/patches/patch-ad
index abd3dea9f4a..5e1356a2cfe 100644
--- a/audio/rhythmbox/patches/patch-ad
+++ b/audio/rhythmbox/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2009/04/17 17:51:01 drochner Exp $
+$NetBSD: patch-ad,v 1.5 2009/05/26 18:15:20 drochner Exp $
 
---- configure.orig	2009-03-19 10:02:53.000000000 +0100
+--- configure.orig	2009-04-28 09:40:11.000000000 +0200
 +++ configure
-@@ -14206,7 +14206,7 @@ $as_echo "$as_me: error: HAL support exp
+@@ -20242,7 +20242,7 @@ $as_echo "$as_me: error: HAL support exp
     { (exit 1); exit 1; }; }
    fi
  
@@ -11,20 +11,3 @@ $NetBSD: patch-ad,v 1.4 2009/04/17 17:51:01 drochner Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL 1
-@@ -20058,6 +20058,7 @@ if test "x$have_python" != "xno"; then
- 
- 
- 
-+if false; then
- 
- 		{ $as_echo "$as_me:$LINENO: checking whether we can build a shared library depending on libpython" >&5
- $as_echo_n "checking whether we can build a shared library depending on libpython... " >&6; }
-@@ -20095,6 +20096,8 @@ $as_echo "$as_me: WARNING: Disabling pyt
- $as_echo "$result" >&6; }
- fi
- 
-+fi
-+
- if test "x$have_python" != "xno"; then
- 	PYGTK_REQUIRED=2.8.0
- 	GST_PYTHON_REQUIRED=0.10.1
diff --git a/audio/rhythmbox/patches/patch-af b/audio/rhythmbox/patches/patch-af
deleted file mode 100644
index d7d36c37e30..00000000000
--- a/audio/rhythmbox/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.5 2009/04/17 17:51:01 drochner Exp $
-
---- rhythmdb/rhythmdb.c.orig	2009-03-28 19:22:05.000000000 +0100
-+++ rhythmdb/rhythmdb.c
-@@ -2997,8 +2997,9 @@ rhythmdb_add_to_stat_list (RhythmDB *db,
- 	/* do we really need to check for duplicate requests here?  .. nah. */
- 	result->uri = rb_refstring_new (uri);
- 	db->priv->stat_list = g_list_prepend (db->priv->stat_list, result);
--
-+#if 0
- 	g_mutex_unlock (db->priv->stat_mutex);
-+#endif
- }
- 
- 
-@@ -3052,6 +3053,7 @@ rhythmdb_add_uri_with_types (RhythmDB *d
- 
- 		entry = rhythmdb_entry_lookup_by_location (db, uri);
- 		rhythmdb_add_to_stat_list (db, uri, entry, type, ignore_type, error_type);
-+		g_mutex_unlock (db->priv->stat_mutex);
- 	}
- }
-