From e30b4e371b587d80c3d3e9fa0ead714d2648711f Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 26 Jan 2015 14:55:45 +0000 Subject: [PATCH] Port to libmediaart-2.0 --- grilo-plugins-0.2.13-libmediaart-2.0.patch | 35 ++++++++++++++++++++++ grilo-plugins.spec | 11 ++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 grilo-plugins-0.2.13-libmediaart-2.0.patch diff --git a/grilo-plugins-0.2.13-libmediaart-2.0.patch b/grilo-plugins-0.2.13-libmediaart-2.0.patch new file mode 100644 index 0000000..29ad2ad --- /dev/null +++ b/grilo-plugins-0.2.13-libmediaart-2.0.patch @@ -0,0 +1,35 @@ +From cf0bc157f79e058d5e307641bbf0848cd5cfda48 Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti +Date: Tue, 20 Jan 2015 17:38:51 +0200 +Subject: local-metadata: Mechanically adjust for libmediaart-2.0 + + +diff --git a/configure.ac b/configure.ac +index 414872c..54ef31e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,7 +160,7 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, + + PKG_CHECK_MODULES(AVAHI, [avahi-gobject avahi-glib avahi-client], HAVE_AVAHI=yes, HAVE_AVAHI=no) + +-PKG_CHECK_MODULES(MEDIAART, [libmediaart-1.0], HAVE_MEDIAART=yes, HAVE_MEDIAART=no) ++PKG_CHECK_MODULES(MEDIAART, [libmediaart-2.0], HAVE_MEDIAART=yes, HAVE_MEDIAART=no) + + PKG_CHECK_MODULES(GOM, [gom-1.0 >= 0.2.1], HAVE_GOM=yes, HAVE_GOM=no) + +diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c +index 2fced68..5af7eb5 100644 +--- a/src/local-metadata/grl-local-metadata.c ++++ b/src/local-metadata/grl-local-metadata.c +@@ -776,7 +776,7 @@ resolve_album_art (GrlSource *source, + if (!artist || !album) + return TRUE; + +- media_art_get_path (artist, album, "album", NULL, &cache_uri, &thumbnail_uri); ++ media_art_get_path (artist, album, "album", &cache_uri); + + if (thumbnail_uri) + grl_media_set_thumbnail (rs->media, thumbnail_uri); +-- +cgit v0.10.1 + diff --git a/grilo-plugins.spec b/grilo-plugins.spec index a835246..7e23186 100644 --- a/grilo-plugins.spec +++ b/grilo-plugins.spec @@ -5,13 +5,15 @@ Name: grilo-plugins Version: 0.2.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugins for the Grilo framework Group: Applications/Multimedia License: LGPLv2+ Url: https://live.gnome.org/Grilo Source0: http://ftp.gnome.org/pub/GNOME/sources/grilo-plugins/%{release_version}/grilo-plugins-%{version}.tar.xz +# Port to libmediaart-2.0 until the next release. +Patch0: grilo-plugins-0.2.13-libmediaart-2.0.patch BuildRequires: avahi-gobject-devel BuildRequires: grilo-devel >= %{grilo_version} @@ -33,6 +35,8 @@ BuildRequires: tracker-devel BuildRequires: gmime-devel BuildRequires: libdmapsharing-devel BuildRequires: json-glib-devel +# Needed for autoreconf. +BuildRequires: autoconf automake gnome-common libtool Requires: grilo >= %{grilo_version} @@ -63,6 +67,8 @@ This package contains plugins to get information from theses sources: %prep %setup -q +%patch0 -p1 +autoreconf --force --install %build %configure \ @@ -111,6 +117,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/* %{_libdir}/grilo-%{release_version}/*.xml %changelog +* Mon Jan 26 2015 David King - 0.2.13-2 +- Port to libmediaart-2.0 + * Tue Aug 26 2014 Kalev Lember - 0.2.13-1 - Update to 0.2.13