tags 677247 +patch
thanks
The upstream patch works for me and applies cleanly to the latest package.
Here's it in debian/patches form. I've adjusted build dependencies and written
a placeholder changelog entry, but I am not in Uploaders.
Note that I think bad things will happen if the package is built with
libmusicbrainz3-dev available. I suppose it should either Build-Conflicts
or patch out the autoconf bits which look for libmusicbrainz3?
diff -ruN rhythmbox-2.97~/debian/changelog rhythmbox-2.97/debian/changelog
--- rhythmbox-2.97~/debian/changelog 2012-06-10 17:11:39.000000000 +0100
+++ rhythmbox-2.97/debian/changelog 2012-06-18 22:35:11.438707000 +0100
@@ -1,3 +1,9 @@
+rhythmbox (2.97-2) unstable; urgency=low
+
+ * Update to use libmusicbrainz5. Closes: #677247.
+
+ -- Jon Dowland <j...@debian.org> Mon, 18 Jun 2012 22:17:51 +0100
+
rhythmbox (2.97-1) unstable; urgency=low
* New upstream release.
diff -ruN rhythmbox-2.97~/debian/control rhythmbox-2.97/debian/control
--- rhythmbox-2.97~/debian/control 2012-06-10 17:27:57.000000000 +0100
+++ rhythmbox-2.97/debian/control 2012-06-18 22:35:31.090801654 +0100
@@ -21,7 +21,7 @@
libgdk-pixbuf2.0-dev (>= 2.18.0),
libglib2.0-dev (>= 2.28.0),
libgpod-dev (>= 0.8.2-4),
- libmusicbrainz3-dev (>= 3.0.2),
+ libmusicbrainz5-dev (>= 5.0.0),
libneon27-dev | libneon27-gnutls-dev,
libdiscid0-dev,
libtotem-plparser-dev (>= 2.32.1),
diff -ruN rhythmbox-2.97~/debian/control.in rhythmbox-2.97/debian/control.in
--- rhythmbox-2.97~/debian/control.in 2012-06-10 16:02:42.000000000 +0100
+++ rhythmbox-2.97/debian/control.in 2012-06-18 22:34:39.238551912 +0100
@@ -16,7 +16,7 @@
libgdk-pixbuf2.0-dev (>= 2.18.0),
libglib2.0-dev (>= 2.28.0),
libgpod-dev (>= 0.8.2-4),
- libmusicbrainz3-dev (>= 3.0.2),
+ libmusicbrainz5-dev (>= 5.0.0),
libneon27-dev | libneon27-gnutls-dev,
libdiscid0-dev,
libtotem-plparser-dev (>= 2.32.1),
diff -ruN rhythmbox-2.97~/debian/patches/rb-mb5.patch rhythmbox-2.97/debian/patches/rb-mb5.patch
--- rhythmbox-2.97~/debian/patches/rb-mb5.patch 1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-2.97/debian/patches/rb-mb5.patch 2012-06-18 22:35:16.406730928 +0100
@@ -0,0 +1,823 @@
+From 33074fa366a502e9b2106e44754c8ae9e9d4881b Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.anc...@canonical.com>
+Date: Thu, 7 Jun 2012 15:18:32 +1200
+Subject: [PATCH] audiocd: Add support for musicbrainz5
+
+---
+ configure.ac | 17 +-
+ plugins/audiocd/Makefile.am | 8 +
+ plugins/audiocd/sj-metadata-getter.c | 6 +
+ plugins/audiocd/sj-metadata-musicbrainz5.c | 619 ++++++++++++++++++++++++++++
+ plugins/audiocd/sj-metadata-musicbrainz5.h | 56 +++
+ 5 files changed, 703 insertions(+), 3 deletions(-)
+ create mode 100644 plugins/audiocd/sj-metadata-musicbrainz5.c
+ create mode 100644 plugins/audiocd/sj-metadata-musicbrainz5.h
+
+diff --git a/configure.ac b/configure.ac
+index 33efca8..c68c629 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,6 +51,7 @@ GLIB_REQS=2.28.0
+ LIBGPOD_REQS=0.6
+ MUSICBRAINZ3_REQS=3.0.2
+ MUSICBRAINZ4_REQS=4.0.0
++MUSICBRAINZ5_REQS=5.0.0
+ TOTEM_PLPARSER_REQS=2.32.1
+ VALA_REQS=0.9.4
+ AVAHI_REQS=0.6
+@@ -355,10 +356,14 @@ if test x"$enable_musicbrainz" != "xno"; then
+ AC_SUBST(MUSICBRAINZ3_CFLAGS)
+ AC_SUBST(MUSICBRAINZ3_LIBS)
+
+- PKG_CHECK_MODULES(MUSICBRAINZ4, libmusicbrainz4 >= $MUSICBRAINZ4_REQS gconf-2.0, [have_musicbrainz4=yes], [have_musicbrainz4=no])
++ PKG_CHECK_MODULES(MUSICBRAINZ4, libmusicbrainz4 >= $MUSICBRAINZ4_REQS libdiscid gconf-2.0, [have_musicbrainz4=yes], [have_musicbrainz4=no])
+ AC_SUBST(MUSICBRAINZ4_CFLAGS)
+ AC_SUBST(MUSICBRAINZ4_LIBS)
+
++ PKG_CHECK_MODULES(MUSICBRAINZ5, libmusicbrainz5 >= $MUSICBRAINZ5_REQS libdiscid gconf-2.0, [have_musicbrainz5=yes], [have_musicbrainz5=no])
++ AC_SUBST(MUSICBRAINZ5_CFLAGS)
++ AC_SUBST(MUSICBRAINZ5_LIBS)
++
+ if test x"$have_musicbrainz3" = xyes; then
+ oldlibs=$LIBS
+ LIBS="$LIBS $MUSICBRAINZ3_LIBS"
+@@ -374,16 +379,22 @@ if test x"$enable_musicbrainz" != "xno"; then
+ have_sj_metadata_getter=yes
+ fi
+
++ if test x"$have_musicbrainz5" = xyes; then
++ AC_DEFINE([HAVE_MUSICBRAINZ5], 1, [Whether libmusicbrainz5 is available])
++ have_sj_metadata_getter=yes
++ fi
++
+ if test x"$have_sj_metadata_getter" = xyes; then
+ AC_DEFINE([HAVE_SJ_METADATA_GETTER], 1, [Whether to use the sound-juicer metadata getter code])
+ else
+ if test x"$enable_musicbrainz" = xyes; then
+- AC_MSG_ERROR([MusicBrainz requested, but neither libmusicbrainz3 nor libmusicbrainz4 are available])
++ AC_MSG_ERROR([MusicBrainz requested, but neither libmusicbrainz3, libmusicbrainz4 nor libmusicbrainz5 are available])
+ fi
+ fi
+ fi
+ AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "x$have_musicbrainz3" = "xyes"])
+ AM_CONDITIONAL([HAVE_MUSICBRAINZ4], [test "x$have_musicbrainz4" = "xyes"])
++AM_CONDITIONAL([HAVE_MUSICBRAINZ5], [test "x$have_musicbrainz5" = "xyes"])
+ AM_CONDITIONAL([HAVE_SJ_METADATA_GETTER], [test "x$have_sj_metadata_getter" = "xyes"])
+
+ AC_PATH_XTRA
+@@ -900,7 +911,7 @@ else
+ AC_MSG_NOTICE([** Multimedia keys support is enabled])
+ fi
+
+-if test x"$have_musicbrainz3" = "xyes"; then
++if test x"$have_sj_metadata_getter" = "xyes"; then
+ AC_MSG_NOTICE([** MusicBrainz support is enabled])
+ else
+ AC_MSG_NOTICE([ MusicBrainz support is disabled])
+diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
+index e757d2d..473b9d6 100644
+--- a/plugins/audiocd/Makefile.am
++++ b/plugins/audiocd/Makefile.am
+@@ -50,6 +50,10 @@ if HAVE_MUSICBRAINZ4
+ libaudiocd_la_LIBADD +=$(MUSICBRAINZ4_LIBS)
+ INCLUDES += $(MUSICBRAINZ4_CFLAGS)
+ endif
++if HAVE_MUSICBRAINZ5
++libaudiocd_la_LIBADD +=$(MUSICBRAINZ5_LIBS)
++INCLUDES += $(MUSICBRAINZ5_CFLAGS)
++endif
+
+ libaudiocd_la_LIBADD += $(NULL)
+
+@@ -77,6 +81,7 @@ SJ_FILES = \
+ sj-metadata-getter.c sj-metadata-getter.h \
+ sj-metadata-musicbrainz3.c sj-metadata-musicbrainz3.h \
+ sj-metadata-musicbrainz4.c sj-metadata-musicbrainz4.h \
++ sj-metadata-musicbrainz5.c sj-metadata-musicbrainz5.h \
+ sj-structures.c sj-structures.h \
+ sj-metadata-marshal.list
+
+@@ -101,6 +106,9 @@ endif
+ if HAVE_MUSICBRAINZ4
+ libaudiocd_la_SOURCES += sj-metadata-musicbrainz4.c sj-metadata-musicbrainz4.h
+ endif
++if HAVE_MUSICBRAINZ5
++libaudiocd_la_SOURCES += sj-metadata-musicbrainz5.c sj-metadata-musicbrainz5.h
++endif
+
+ MARSHALFILES += sj-metadata-marshal.h sj-metadata-marshal.c
+
+diff --git a/plugins/audiocd/sj-metadata-getter.c b/plugins/audiocd/sj-metadata-getter.c
+index cfc447d..80b4b0b 100644
+--- a/plugins/audiocd/sj-metadata-getter.c
++++ b/plugins/audiocd/sj-metadata-getter.c
+@@ -26,6 +26,9 @@
+ #include "sj-metadata-getter.h"
+ #include "sj-metadata-marshal.h"
+ #include "sj-metadata.h"
++#ifdef HAVE_MUSICBRAINZ5
++#include "sj-metadata-musicbrainz5.h"
++#endif /* HAVE_MUSICBRAINZ5 */
+ #ifdef HAVE_MUSICBRAINZ4
+ #include "sj-metadata-musicbrainz4.h"
+ #endif /* HAVE_MUSICBRAINZ4 */
+@@ -178,6 +181,9 @@ lookup_cd (SjMetadataGetter *mdg)
+ GError *error = NULL;
+ gboolean found = FALSE;
+ GType types[] = {
++#ifdef HAVE_MUSICBRAINZ5
++ SJ_TYPE_METADATA_MUSICBRAINZ5,
++#endif /* HAVE_MUSICBRAINZ5 */
+ #ifdef HAVE_MUSICBRAINZ4
+ SJ_TYPE_METADATA_MUSICBRAINZ4,
+ #endif /* HAVE_MUSICBRAINZ4 */
+diff --git a/plugins/audiocd/sj-metadata-musicbrainz5.c b/plugins/audiocd/sj-metadata-musicbrainz5.c
+new file mode 100644
+index 0000000..ab1fec7
+--- /dev/null
++++ b/plugins/audiocd/sj-metadata-musicbrainz5.c
+@@ -0,0 +1,619 @@
++/*
++ * sj-metadata-musicbrainz5.c
++ * Copyright (C) 2008 Ross Burton <r...@burtonini.com>
++ * Copyright (C) 2008 Bastien Nocera <had...@hadess.net>
++ * Copyright (C) 2011 Christophe Fergeau <cferg...@redhat.com>
++ * Copyright (C) 2012 Robert Ancell <robert.anc...@canonical.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H */
++
++#include <string.h>
++#include <stdlib.h>
++#include <glib.h>
++#include <glib-object.h>
++#include <gconf/gconf-client.h>
++#include <discid/discid.h>
++#include <musicbrainz5/mb5_c.h>
++
++#include "sj-metadata-musicbrainz5.h"
++#include "sj-structures.h"
++#include "sj-error.h"
++
++#define GET(field, function, obj) { \
++ function (obj, buffer, sizeof (buffer)); \
++ if (field) \
++ g_free (field); \
++ if (*buffer == '\0') \
++ field = NULL; \
++ else \
++ field = g_strdup (buffer); \
++}
++
++#define GCONF_MUSICBRAINZ_SERVER "/apps/sound-juicer/musicbrainz_server"
++#define GCONF_PROXY_USE_PROXY "/system/http_proxy/use_http_proxy"
++#define GCONF_PROXY_HOST "/system/http_proxy/host"
++#define GCONF_PROXY_PORT "/system/http_proxy/port"
++#define GCONF_PROXY_USE_AUTHENTICATION "/system/http_proxy/use_authentication"
++#define GCONF_PROXY_USERNAME "/system/http_proxy/authentication_user"
++#define GCONF_PROXY_PASSWORD "/system/http_proxy/authentication_password"
++#define SJ_MUSICBRAINZ_USER_AGENT "libjuicer-"VERSION
++
++typedef struct {
++ Mb5Query mb;
++ DiscId *disc;
++ char *cdrom;
++ /* Proxy */
++ char *http_proxy;
++ int http_proxy_port;
++} SjMetadataMusicbrainz5Private;
++
++#define GET_PRIVATE(o) \
++ (G_TYPE_INSTANCE_GET_PRIVATE ((o), SJ_TYPE_METADATA_MUSICBRAINZ5, SjMetadataMusicbrainz5Private))
++
++enum {
++ PROP_0,
++ PROP_DEVICE,
++ PROP_USE_PROXY,
++ PROP_PROXY_HOST,
++ PROP_PROXY_PORT,
++};
++
++static void metadata_interface_init (gpointer g_iface, gpointer iface_data);
++
++G_DEFINE_TYPE_WITH_CODE (SjMetadataMusicbrainz5,
++ sj_metadata_musicbrainz5,
++ G_TYPE_OBJECT,
++ G_IMPLEMENT_INTERFACE (SJ_TYPE_METADATA,
++ metadata_interface_init));
++
++
++/*
++ * Private methods
++ */
++#ifdef DUMP_DETAILS
++static void
++sj_mb5_album_details_dump (AlbumDetails *details)
++{
++ if (details->country)
++ g_print ("Country: %s\n", details->country);
++ if (details->type)
++ g_print ("Type: %s\n", details->type);
++ if (details->lyrics_url)
++ g_print ("Lyrics URL: %s\n", details->lyrics_url);
++}
++#else
++#define sj_mb5_album_details_dump(...)
++#endif
++
++static GList *
++get_artist_list (Mb5ArtistCredit credit)
++{
++ Mb5NameCreditList name_list;
++ GList *artists;
++ unsigned int i;
++ char buffer[512]; /* for the GET macro */
++
++ if (credit == NULL)
++ return NULL;
++
++ name_list = mb5_artistcredit_get_namecreditlist (credit);
++ if (name_list == NULL) {
++ return NULL;
++ }
++
++ artists = NULL;
++ for (i = 0; i < mb5_namecredit_list_size (name_list); i++) {
++ Mb5NameCredit name_credit;
++ Mb5Artist artist;
++ ArtistDetails *details;
++
++ name_credit = mb5_namecredit_list_item (name_list, i);
++ details = g_new0 (ArtistDetails, 1);
++ GET (details->joinphrase, mb5_namecredit_get_joinphrase, name_credit);
++ artists = g_list_prepend (artists, details);
++ artist = mb5_namecredit_get_artist (name_credit);
++ if (!artist) {
++ g_warning ("no Mb5Artist associated with Mb5NameCredit, falling back to Mb5NameCredit::name");
++ GET (details->name, mb5_namecredit_get_name, name_credit);
++ continue;
++ }
++
++ GET (details->id, mb5_artist_get_id, artist);
++ GET (details->name, mb5_artist_get_name, artist);
++ GET (details->sortname, mb5_artist_get_sortname, artist);
++ GET (details->disambiguation, mb5_artist_get_disambiguation, artist);
++ GET (details->gender, mb5_artist_get_gender, artist);
++ GET (details->country, mb5_artist_get_country, artist);
++ }
++
++ return g_list_reverse(artists);
++}
++
++static void
++get_artist_info (GList *artists, char **name, char **sortname, char **id)
++{
++ GString *artist_name;
++ GList *it;
++ unsigned int artist_count;
++
++ artist_name = g_string_new (NULL);
++ artist_count = 0;
++ for (it = artists; it != NULL; it = it->next) {
++ ArtistDetails *details = (ArtistDetails *)it->data;
++ artist_count++;
++ g_string_append (artist_name, details->name);
++ if (details->joinphrase != NULL)
++ g_string_append (artist_name, details->joinphrase);
++ }
++
++ if (artist_count != 1) {
++ g_warning ("multiple artists");
++ if (sortname != NULL)
++ *sortname = NULL;
++ if (id != NULL)
++ *id = NULL;
++ } else {
++ ArtistDetails *details = (ArtistDetails *)artists->data;
++ if (sortname != NULL)
++ *sortname = g_strdup (details->sortname);
++ if (id != NULL)
++ *id = g_strdup (details->id);
++ }
++
++ if (name != NULL)
++ *name = artist_name->str;
++
++ g_string_free (artist_name, FALSE);
++}
++
++
++static void
++fill_relations (Mb5RelationListList relations, AlbumDetails *album)
++{
++ unsigned int i, j;
++
++ for (i = 0; i < mb5_relationlist_list_size (relations); i++) {
++ Mb5RelationList list = mb5_relationlist_list_item (relations, i);
++ for (j = 0; j < mb5_relation_list_size (list); j++) {
++ Mb5Relation relation;
++ char buffer[512]; /* for the GET() macro */
++ char *type = NULL;
++
++ relation = mb5_relation_list_item (list, j);
++ if (relation == NULL)
++ continue;
++
++ GET (type, mb5_relation_get_type, relation);
++ if (type == NULL) {
++ continue;
++ }
++ if (g_str_equal (type, "wikipedia")) {
++ char *wikipedia = NULL;
++ GET (wikipedia, mb5_relation_get_target, relation);
++ if (wikipedia != NULL) {
++ g_free (album->wikipedia);
++ album->wikipedia = wikipedia;
++ }
++ } else if (g_str_equal (type, "discogs")) {
++ char *discogs = NULL;
++ GET (discogs, mb5_relation_get_target, relation);
++ if (discogs != NULL) {
++ g_free (album->discogs);
++ album->discogs = discogs;
++ }
++ } else if (g_str_equal (type, "lyrics")) {
++ char *lyrics = NULL;
++ GET (lyrics, mb5_relation_get_target, relation);
++ if (lyrics != NULL) {
++ g_free (album->lyrics_url);
++ album->lyrics_url = lyrics;
++ }
++ }
++ g_free (type);
++ }
++ }
++}
++
++static void
++fill_tracks_from_medium (Mb5Medium medium, AlbumDetails *album)
++{
++ Mb5TrackList track_list;
++ GList *tracks;
++ unsigned int i;
++ char buffer[512]; /* for the GET() macro */
++
++ track_list = mb5_medium_get_tracklist (medium);
++ if (!track_list)
++ return;
++
++ album->number = mb5_track_list_size (track_list);
++
++ tracks = NULL;
++
++ for (i = 0; i < mb5_track_list_size (track_list); i++) {
++ Mb5Track mbt;
++ Mb5ArtistCredit credit;
++ Mb5Recording recording;
++ TrackDetails *track;
++
++ mbt = mb5_track_list_item (track_list, i);
++ if (!mbt)
++ continue;
++
++ track = g_new0 (TrackDetails, 1);
++
++ track->album = album;
++
++ track->number = mb5_track_get_position (mbt);
++ recording = mb5_track_get_recording (mbt);
++ if (recording != NULL) {
++ GET (track->title, mb5_recording_get_title, recording);
++ GET (track->track_id, mb5_recording_get_id, recording);
++ track->duration = mb5_recording_get_length (recording) / 1000;
++ credit = mb5_recording_get_artistcredit (recording);
++ } else {
++ GET (track->title, mb5_track_get_title, mbt);
++ track->duration = mb5_track_get_length (mbt) / 1000;
++ credit = mb5_track_get_artistcredit (mbt);
++ }
++
++ if (credit) {
++ GList *artists;
++ artists = get_artist_list (credit);
++ if (artists) {
++ get_artist_info (artists, &track->artist,
++ &track->artist_sortname,
++ &track->artist_id);
++ }
++ track->artists = artists;
++ }
++ if (track->artist == NULL)
++ track->artist = g_strdup (album->artist);
++ if (track->artist_sortname == NULL)
++ track->artist_sortname = g_strdup (album->artist_sortname);
++ if (track->artist_id == NULL)
++ track->artist_id = g_strdup (album->artist_id);
++
++ tracks = g_list_prepend (tracks, track);
++ }
++ album->tracks = g_list_reverse (tracks);
++}
++
++static AlbumDetails *
++make_album_from_release (Mb5ReleaseGroup group,
++ Mb5Release release,
++ Mb5Medium medium)
++{
++ AlbumDetails *album;
++ Mb5ArtistCredit credit;
++ GList *artists;
++ char *date = NULL;
++ char buffer[512]; /* for the GET macro */
++
++ g_assert (release);
++ g_return_val_if_fail (medium != NULL, NULL);
++
++ album = g_new0 (AlbumDetails, 1);
++
++ GET (album->album_id, mb5_release_get_id, release);
++ GET (album->title, mb5_medium_get_title, medium);
++ if (album->title == NULL)
++ GET (album->title, mb5_release_get_title, release);
++
++ credit = mb5_release_get_artistcredit (release);
++
++ artists = get_artist_list (credit);
++ if (artists) {
++ get_artist_info (artists, &album->artist,
++ &album->artist_sortname,
++ &album->artist_id);
++ }
++ album->artists = artists;
++
++ GET (date, mb5_release_get_date, release);
++ album->release_date = sj_metadata_helper_scan_date (date);
++ g_free (date);
++
++ GET (album->asin, mb5_release_get_asin, release);
++ GET (album->country, mb5_release_get_country, release);
++ if (group) {
++ GET (album->type, mb5_releasegroup_get_primarytype, group);
++ if (g_str_has_suffix (album->type, "Spokenword")
++ || g_str_has_suffix (album->type, "Interview")
++ || g_str_has_suffix (album->type, "Audiobook")) {
++ album->is_spoken_word = TRUE;
++ }
++ fill_relations (mb5_releasegroup_get_relationlistlist(group), album);
++ }
++
++ album->disc_number = mb5_medium_get_position (medium);
++ fill_tracks_from_medium (medium, album);
++ fill_relations (mb5_release_get_relationlistlist (release), album);
++
++ sj_mb5_album_details_dump (album);
++ return album;
++}
++
++/*
++ * Virtual methods
++ */
++static GList *
++mb5_list_albums (SjMetadata *metadata, char **url, GError **error)
++{
++ SjMetadataMusicbrainz5Private *priv;
++ GList *albums = NULL;
++ Mb5ReleaseList releases;
++ Mb5Release release;
++ const char *discid = NULL;
++ char buffer[1025];
++ int i;
++ g_return_val_if_fail (SJ_IS_METADATA_MUSICBRAINZ5 (metadata), NULL);
++
++ priv = GET_PRIVATE (metadata);
++
++ if (sj_metadata_helper_check_media (priv->cdrom, error) == FALSE) {
++ return NULL;
++ }
++
++ priv->disc = discid_new ();
++ if (priv->disc == NULL)
++ return NULL;
++ if (discid_read (priv->disc, priv->cdrom) == 0)
++ return NULL;
++
++ if (url != NULL)
++ *url = g_strdup (discid_get_submission_url (priv->disc));
++
++ if (g_getenv("MUSICBRAINZ_FORCE_DISC_ID")) {
++ discid = g_getenv("MUSICBRAINZ_FORCE_DISC_ID");
++ } else {
++ discid = discid_get_id (priv->disc);
++ }
++
++ releases = mb5_query_lookup_discid(priv->mb, discid);
++
++ if (releases == NULL) {
++ return NULL;
++ }
++
++ if (mb5_release_list_size (releases) == 0) {
++ return NULL;
++ }
++
++ for (i = 0; i < mb5_release_list_size (releases); i++) {
++ AlbumDetails *album;
++
++ release = mb5_release_list_item (releases, i);
++ if (release) {
++ char *releaseid = NULL;
++ Mb5Release full_release;
++
++ releaseid = NULL;
++ GET(releaseid, mb5_release_get_id, release);
++
++ full_release = mb5_query_lookup_release (priv->mb, releaseid);
++ g_free (releaseid);
++ if (full_release) {
++ Mb5MediumList media;
++ Mb5Metadata metadata = NULL;
++ Mb5ReleaseGroup group;
++ unsigned int j;
++
++ group = mb5_release_get_releasegroup (full_release);
++ if (group) {
++ /* The release-group information we can extract from the
++ * lookup_release query doesn't have the url relations for the
++ * release-group, so run a separate query to get these urls
++ */
++ char *releasegroupid = NULL;
++ char *params_names[] = { "inc" };
++ char *params_values[] = { "artists url-rels" };
++
++ GET (releasegroupid, mb5_releasegroup_get_id, group);
++ metadata = mb5_query_query (priv->mb, "release-group", releasegroupid, "",
++ 1, params_names, params_values);
++ g_free (releasegroupid);
++ }
++
++ if (metadata && mb5_metadata_get_releasegroup (metadata))
++ group = mb5_metadata_get_releasegroup (metadata);
++
++ media = mb5_release_media_matching_discid (full_release, discid);
++ for (j = 0; j < mb5_medium_list_size (media); j++) {
++ Mb5Medium medium;
++ medium = mb5_medium_list_item (media, j);
++ if (medium) {
++ album = make_album_from_release (group, full_release, medium);
++ album->metadata_source = SOURCE_MUSICBRAINZ;
++ albums = g_list_append (albums, album);
++ }
++ }
++ mb5_metadata_delete (metadata);
++ mb5_medium_list_delete (media);
++ mb5_release_delete (full_release);
++ }
++ }
++ }
++ mb5_release_list_delete (releases);
++ return albums;
++}
++
++/*
++ * GObject methods
++ */
++
++static void
++metadata_interface_init (gpointer g_iface, gpointer iface_data)
++{
++ SjMetadataClass *klass = (SjMetadataClass*)g_iface;
++
++ klass->list_albums = mb5_list_albums;
++}
++
++static void
++sj_metadata_musicbrainz5_init (SjMetadataMusicbrainz5 *self)
++{
++ GConfClient *gconf_client;
++ gchar *server_name;
++
++ SjMetadataMusicbrainz5Private *priv;
++
++ priv = GET_PRIVATE (self);
++
++ gconf_client = gconf_client_get_default ();
++
++ server_name = gconf_client_get_string (gconf_client, GCONF_MUSICBRAINZ_SERVER, NULL);
++
++ if (server_name && (*server_name == '\0')) {
++ g_free (server_name);
++ server_name = NULL;
++ }
++
++ priv->mb = mb5_query_new (SJ_MUSICBRAINZ_USER_AGENT, server_name, 0);
++ g_free (server_name);
++
++
++ /* Set the HTTP proxy */
++ if (gconf_client_get_bool (gconf_client, GCONF_PROXY_USE_PROXY, NULL)) {
++ char *proxy_host;
++ int port;
++
++ proxy_host = gconf_client_get_string (gconf_client, GCONF_PROXY_HOST, NULL);
++ mb5_query_set_proxyhost (priv->mb, proxy_host);
++ g_free (proxy_host);
++
++ port = gconf_client_get_int (gconf_client, GCONF_PROXY_PORT, NULL);
++ mb5_query_set_proxyport (priv->mb, port);
++
++ if (gconf_client_get_bool (gconf_client, GCONF_PROXY_USE_AUTHENTICATION, NULL)) {
++ char *username, *password;
++
++ username = gconf_client_get_string (gconf_client, GCONF_PROXY_USERNAME, NULL);
++ mb5_query_set_proxyusername (priv->mb, username);
++ g_free (username);
++
++ password = gconf_client_get_string (gconf_client, GCONF_PROXY_PASSWORD, NULL);
++ mb5_query_set_proxypassword (priv->mb, password);
++ g_free (password);
++ }
++ }
++
++ g_object_unref (gconf_client);
++}
++
++static void
++sj_metadata_musicbrainz5_get_property (GObject *object, guint property_id,
++ GValue *value, GParamSpec *pspec)
++{
++ SjMetadataMusicbrainz5Private *priv = GET_PRIVATE (object);
++ g_assert (priv);
++
++ switch (property_id) {
++ case PROP_DEVICE:
++ g_value_set_string (value, priv->cdrom);
++ break;
++ case PROP_PROXY_HOST:
++ g_value_set_string (value, priv->http_proxy);
++ break;
++ case PROP_PROXY_PORT:
++ g_value_set_int (value, priv->http_proxy_port);
++ break;
++ default:
++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++ }
++}
++
++static void
++sj_metadata_musicbrainz5_set_property (GObject *object, guint property_id,
++ const GValue *value, GParamSpec *pspec)
++{
++ SjMetadataMusicbrainz5Private *priv = GET_PRIVATE (object);
++ g_assert (priv);
++
++ switch (property_id) {
++ case PROP_DEVICE:
++ if (priv->cdrom)
++ g_free (priv->cdrom);
++ priv->cdrom = g_value_dup_string (value);
++ break;
++ case PROP_PROXY_HOST:
++ if (priv->http_proxy) {
++ g_free (priv->http_proxy);
++ }
++ priv->http_proxy = g_value_dup_string (value);
++ /* TODO: check this unsets the proxy if NULL, or should we pass "" ? */
++ mb5_query_set_proxyhost (priv->mb, priv->http_proxy);
++ break;
++ case PROP_PROXY_PORT:
++ priv->http_proxy_port = g_value_get_int (value);
++ mb5_query_set_proxyport (priv->mb, priv->http_proxy_port);
++ break;
++ default:
++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++ }
++}
++
++static void
++sj_metadata_musicbrainz5_finalize (GObject *object)
++{
++ SjMetadataMusicbrainz5Private *priv;
++
++ priv = GET_PRIVATE (object);
++
++ if (priv->mb != NULL) {
++ mb5_query_delete (priv->mb);
++ priv->mb = NULL;
++ }
++ if (priv->disc != NULL) {
++ discid_free (priv->disc);
++ priv->disc = NULL;
++ }
++ g_free (priv->cdrom);
++
++ G_OBJECT_CLASS (sj_metadata_musicbrainz5_parent_class)->finalize (object);
++}
++
++static void
++sj_metadata_musicbrainz5_class_init (SjMetadataMusicbrainz5Class *class)
++{
++ GObjectClass *object_class = (GObjectClass*)class;
++
++ g_type_class_add_private (class, sizeof (SjMetadataMusicbrainz5Private));
++
++ object_class->get_property = sj_metadata_musicbrainz5_get_property;
++ object_class->set_property = sj_metadata_musicbrainz5_set_property;
++ object_class->finalize = sj_metadata_musicbrainz5_finalize;
++
++ g_object_class_override_property (object_class, PROP_DEVICE, "device");
++ g_object_class_override_property (object_class, PROP_PROXY_HOST, "proxy-host");
++ g_object_class_override_property (object_class, PROP_PROXY_PORT, "proxy-port");
++}
++
++
++/*
++ * Public methods.
++ */
++
++GObject *
++sj_metadata_musicbrainz5_new (void)
++{
++ return g_object_new (SJ_TYPE_METADATA_MUSICBRAINZ5, NULL);
++}
+diff --git a/plugins/audiocd/sj-metadata-musicbrainz5.h b/plugins/audiocd/sj-metadata-musicbrainz5.h
+new file mode 100644
+index 0000000..3cd4c42
+--- /dev/null
++++ b/plugins/audiocd/sj-metadata-musicbrainz5.h
+@@ -0,0 +1,56 @@
++/*
++ * sj-metadata-musicbrainz5.h
++ * Copyright (C) 2008 Ross Burton <r...@burtonini.com>
++ * Copyright (C) 2008 Bastien Nocera <had...@hadess.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef SJ_METADATA_MUSICBRAINZ5_H
++#define SJ_METADATA_MUSICBRAINZ5_H
++
++#include <glib-object.h>
++#include "sj-metadata.h"
++
++G_BEGIN_DECLS
++
++#define SJ_TYPE_METADATA_MUSICBRAINZ5 (sj_metadata_musicbrainz5_get_type ())
++#define SJ_METADATA_MUSICBRAINZ5(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SJ_TYPE_METADATA_MUSICBRAINZ5, SjMetadataMusicbrainz5))
++#define SJ_METADATA_MUSICBRAINZ5_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), SJ_TYPE_METADATA_MUSICBRAINZ5, SjMetadataMusicbrainz5Class))
++#define SJ_IS_METADATA_MUSICBRAINZ5(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SJ_TYPE_METADATA_MUSICBRAINZ5))
++#define SJ_IS_METADATA_MUSICBRAINZ5_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), SJ_TYPE_METADATA_MUSICBRAINZ5))
++#define SJ_METADATA_MUSICBRAINZ5_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SJ_TYPE_METADATA_MUSICBRAINZ5, SjMetadataMusicbrainz5Class))
++
++typedef struct _SjMetadataMusicbrainz5 SjMetadataMusicbrainz5;
++typedef struct _SjMetadataMusicbrainz5Class SjMetadataMusicbrainz5Class;
++
++struct _SjMetadataMusicbrainz5
++{
++ GObject parent;
++};
++
++struct _SjMetadataMusicbrainz5Class
++{
++ GObjectClass parent;
++};
++
++GType sj_metadata_musicbrainz5_get_type (void);
++
++GObject *sj_metadata_musicbrainz5_new (void);
++
++G_END_DECLS
++
++#endif /* SJ_METADATA_MUSICBRAINZ5_H */
+--
+1.7.10
+
diff -ruN rhythmbox-2.97~/debian/patches/series rhythmbox-2.97/debian/patches/series
--- rhythmbox-2.97~/debian/patches/series 2012-06-09 12:26:23.000000000 +0100
+++ rhythmbox-2.97/debian/patches/series 2012-06-18 22:35:16.406730928 +0100
@@ -0,0 +1 @@
+rb-mb5.patch
