Add patches for tracker-0.12 compatibility and for fixing upnp search. Enable optional tracker support. Let the eclass take care of maintainer mode. Fix gmime dependency to 2.6 (automagic choice between slots is inappropriate). Alphabetize a bit.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

6 files changed, 176 insertions, 8 deletions

diff --git a/media-plugins/grilo-plugins/ChangeLog b/media-plugins/grilo-plugins/ChangeLog
index 6ef9cb87df8a..117d565cc243 100644
--- a/media-plugins/grilo-plugins/ChangeLog
+++ b/media-plugins/grilo-plugins/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-plugins/grilo-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.5 2011/10/19 21:52:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.6 2011/11/07 00:39:33 tetromino Exp $
+
+*grilo-plugins-0.1.17-r2 (07 Nov 2011)
+
+  07 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +grilo-plugins-0.1.17-r2.ebuild,
+  +files/grilo-plugins-0.1.17-tracker-0.12.patch,
+  +files/grilo-plugins-0.1.17-upnp-filter-containers.patch, metadata.xml:
+  Add patches for tracker-0.12 compatibility and for fixing upnp search. Enable
+  optional tracker support. Let the eclass take care of maintainer mode. Fix
+  gmime dependency to 2.6 (automagic choice between slots is inappropriate).
+  Alphabetize a bit.
 
 *grilo-plugins-0.1.17-r1 (19 Oct 2011)
 
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index d10463b50418..1b4d2872f48c 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -7,17 +7,20 @@ AUX grilo-plugins-0.1.16-youtube-libgdata-0.9.patch 7594 RMD160 32bf5c0b3a1afd15
 AUX grilo-plugins-0.1.16-youtube-missing-case.patch 675 RMD160 47fc101f2d1da763be0a416c2fda2d22f28413ad SHA1 87b68e25d73d2badb64de8bae1708bdb2e7732f8 SHA256 2f01381b9819fff8776adf8ca75e1e34c065c71ab585f45b62eba3f9d00df9cf
 AUX grilo-plugins-0.1.16-youtube-variable-shadowing.patch 975 RMD160 45384db143019ac44b2f30e8537b93f1036dfb8a SHA1 20e4bada9ef0299672b37adcf1b933474a2c030b SHA256 52ec21d08e7c227cac0f1a8c7da9cd78d8999ab5454863219ee96baf17047f65
 AUX grilo-plugins-0.1.17-apple-trailers-fix.patch 961 RMD160 0c2130b6e77881ddf09934f26e7658dd2fc9298d SHA1 d267e10f709d92ca254cd2cde98abe177889a45f SHA256 0679729aa53a1545dd49f3e055d5bc01364464ac4a749164e26904ab83959d05
+AUX grilo-plugins-0.1.17-tracker-0.12.patch 1764 RMD160 8f17ffb77d71e00988f994924591cb034ae53959 SHA1 4645ddd08d3631631f59776cc1ad9ce34e1eb8a2 SHA256 c0ff0d0aa691519d93ddf61e685186cd5d8da99c4cebdc3e179f40068d88f065
+AUX grilo-plugins-0.1.17-upnp-filter-containers.patch 1132 RMD160 4761721df1a78456b7b7a915b175154ecef0b71d SHA1 b4bd27993e32d9b801c2aadc5b62c834384d3a33 SHA256 5b254304adf0fc000756a27e85c9e23a1210c5193e5e3fb17c39b94ef0e250cd
 DIST grilo-plugins-0.1.16.tar.xz 355300 RMD160 32e05fc643054e254909e28b019b65f625b10b19 SHA1 3542560351371f49d48ca6d87f47730ec9e503f4 SHA256 d37c5f49cd9655cabff425588214a67eb0c4643c7b87dadf492ad37ba69ab8d8
 DIST grilo-plugins-0.1.17.tar.xz 374436 RMD160 cd1d84573ebc8c7e0e7bf25947dd8522c5d155a0 SHA1 2b6ae8200e306626e74561e3cbc1d3b902f5182e SHA256 c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a
 EBUILD grilo-plugins-0.1.16.ebuild 1964 RMD160 a583461ed51728d6bfe7ed514d952df19ff82a04 SHA1 e1714e69f3eee36cea428b6ce95b2d3f21b26fba SHA256 74bc82f8cc1d262e6ce25e3e78ec2e39bcf05e3b32f13f74f844895eb85381cb
 EBUILD grilo-plugins-0.1.17-r1.ebuild 1832 RMD160 a68dc570db417ba109a09aa166bd3cccc6a2afdb SHA1 2eb5107ab68e2462fbf356053057ac14b25f371e SHA256 a994f9cd11998852db9d7d91c6272677f1de32f2b112dcae3ae80ca7441e9092
+EBUILD grilo-plugins-0.1.17-r2.ebuild 1969 RMD160 8d6652d93a594ec2c2613676d01d164665f6d89d SHA1 93d0c037ad2db57cdcb93fd9b8afe21b53b27d11 SHA256 691e0d5549f281c3bf8d6079d634facf84c2804b43b966c24f5fa640ce263aef
 EBUILD grilo-plugins-0.1.17.ebuild 1825 RMD160 e0731b60d757bad16f46406c05800e5367b58870 SHA1 8a27e0b03ae41ca5b14bce11ef85a6e90c6680f8 SHA256 4a50be7cddf825ecb299e4db570d7e20dd9e71d4cc5d6b4a803b30f7912eedfe
-MISC ChangeLog 1455 RMD160 8291f36d2d8cbd9e70bb56d52f14104c4a272342 SHA1 658121c01dca5e2623a9206b4268e57dd148bf5b SHA256 a31a5d048e29a80839f3efe526aad463ee2fcb222ea3108370ed677d0705d567
-MISC metadata.xml 482 RMD160 cf4f1aefbd86ec1e60bca9701f030c85ee5e7d05 SHA1 5278ef0a538f5fa911f2f985bdaafa503f16dba6 SHA256 af37eba5ca44b4d9f6ae5f081c962c6469ddcbff09c78b63b6ed1e5a477c6deb
+MISC ChangeLog 1969 RMD160 eeeedf1859b94ddf3b728d4a756c5f2f9be69f6a SHA1 e1cc47a3b7c72ab5874d66681711355576fe81ca SHA256 4ca382796fc64df44c0c542f2ee32a7fd12dc0bec622079dcec84f04f5c28afc
+MISC metadata.xml 597 RMD160 90c12670b9e2e44e266cf617c510d21db40f20fa SHA1 9652456944b72246ed22bb5deab95643dfe21f2e SHA256 08381bc5aff817c6df37d929646c19b3d5a4ed51a832bbc7d088a5bdd58ba653
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6fRo4ACgkQdjK8w9WeBnCSKwD/cVseWozhS7jhFHMbGd3x/o44
-EynbicUzTIuTz7DlfCgBAJkEpzy4S50vERTRhN9dPieTY3xKYaPXjYeiZCqiWuaG
-=aTnE
+iF4EAREIAAYFAk63KMoACgkQdjK8w9WeBnB7VgD/Tg5aW506oBg1oZp8njr+Wg6N
+K5r74mRE8QhMNkV/f5cA/37ofkldHud075PZtnedkb+RGz0fFVNETaxUFxm3hMYL
+=VIUJ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-tracker-0.12.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-tracker-0.12.patch
new file mode 100644
index 000000000000..dbe099f79c3c
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-tracker-0.12.patch
@@ -0,0 +1,41 @@
+From 43c1e5e7555de086e69e0944fd91b62903653aaa Mon Sep 17 00:00:00 2001
+From: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date: Wed, 07 Sep 2011 17:21:15 +0000
+Subject: tracker: Add support for Tracker 0.12
+
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=658448
+
+Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 13993e1..96e7c25 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,11 +133,21 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6,
+                                                    HAVE_GMIME=yes,
+                                                    HAVE_GMIME=no)])
+ 
+-PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
++PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
+                                   HAVE_TRACKER_SPARQL=yes,
+-                                  [PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10 >= 0.10.5,
+-                                                                     HAVE_TRACKER_SPARQL=yes,
+-                                                                     HAVE_TRACKER_SPARQL=no)])
++                                  HAVE_TRACKER_SPARQL=no)
++
++if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
++   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
++                                     HAVE_TRACKER_SPARQL=yes,
++                                     HAVE_TRACKER_SPARQL=no)
++fi
++
++if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
++   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10 >= 0.10.5,
++                                     HAVE_TRACKER_SPARQL=yes,
++                                     HAVE_TRACKER_SPARQL=no)
++fi
+ 
+ PKG_CHECK_MODULES(GLIB_2_26, glib-2.0 >= 2.26.0,
+                              HAVE_GLIB_2_26=yes,
+--
+cgit v0.9.0.2
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-upnp-filter-containers.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-upnp-filter-containers.patch
new file mode 100644
index 000000000000..8f5e5c924006
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-upnp-filter-containers.patch
@@ -0,0 +1,31 @@
+From 094154f32eb99545435a4a14d295bc02bebe5676 Mon Sep 17 00:00:00 2001
+From: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date: Wed, 28 Sep 2011 13:59:48 +0000
+Subject: upnp: filter containers from search
+
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=653759
+
+Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+---
+diff --git a/src/media/upnp/grl-upnp.c b/src/media/upnp/grl-upnp.c
+index ba9f638..7aa9b9a 100644
+--- a/src/media/upnp/grl-upnp.c
++++ b/src/media/upnp/grl-upnp.c
+@@ -57,10 +57,11 @@ GRL_LOG_DOMAIN_STATIC(upnp_log_domain);
+ #define CONTENT_DIR_SERVICE "urn:schemas-upnp-org:service:ContentDirectory"
+ #endif
+ 
+-#define UPNP_SEARCH_SPEC				\
+-  "dc:title contains \"%s\" or "			\
+-  "upnp:album contains \"%s\" or "			\
+-  "upnp:artist contains \"%s\""
++#define UPNP_SEARCH_SPEC                        \
++  "upnp:class derivedfrom \"object.item\" and " \
++  "(dc:title contains \"%s\" or "               \
++  "upnp:album contains \"%s\" or "              \
++  "upnp:artist contains \"%s\")"
+ 
+ #define UPNP_SEARCH_ALL                         \
+   "upnp:class derivedfrom \"object.item\""
+--
+cgit v0.9.0.2
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild
new file mode 100644
index 000000000000..67844dbaf7c8
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild,v 1.1 2011/11/07 00:39:33 tetromino Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://live.gnome.org/Grilo"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tracker upnp +vimeo +youtube"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	=media-libs/grilo-${PV}[network]
+
+	dev-libs/gmime:2.6
+	dev-libs/libxml2:2
+	dev-db/sqlite:3
+
+	tracker? ( >=app-misc/tracker-0.10.5 )
+	youtube? ( >=dev-libs/libgdata-0.7
+		>=media-libs/libquvi-0.2.15 )
+	upnp? ( >=net-libs/gupnp-0.13
+		>=net-libs/gupnp-av-0.5 )
+	vimeo? ( net-libs/libsoup:2.4
+		dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+# `make check` doesn't do anything, and ${S}/test/test fails without all plugins
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS NEWS README"
+	# --enable-debug only changes CFLAGS, useless for us
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-static
+		--disable-debug
+		--disable-uninstalled"
+
+	# Plugins
+	# TODO: Enable Blip.TV support (requires librest)
+	G2CONF="${G2CONF}
+		--enable-apple-trailers
+		--enable-bookmarks
+		--enable-filesystem
+		--enable-flickr
+		--enable-gravatar
+		--enable-jamendo
+		--enable-lastfm-albumart
+		--enable-localmetadata
+		--enable-metadata-store
+		--enable-podcasts
+		--disable-bliptv
+		--disable-shoutcast
+		$(use_enable tracker)
+		$(use_enable upnp)
+		$(use_enable vimeo)
+		$(use_enable youtube)"
+}
+
+src_prepare() {
+	sed -i -e 's/^\(SUBDIRS .*\)test/\1/g' Makefile.*
+
+	# Upstream patches, will be in next release
+	epatch "${FILESDIR}/${P}-apple-trailers-fix.patch"
+	epatch "${FILESDIR}/${P}-tracker-0.12.patch" # requires eautoreconf
+	epatch "${FILESDIR}/${P}-upnp-filter-containers.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/media-plugins/grilo-plugins/metadata.xml b/media-plugins/grilo-plugins/metadata.xml
index ed5f53db17db..3189930168f8 100644
--- a/media-plugins/grilo-plugins/metadata.xml
+++ b/media-plugins/grilo-plugins/metadata.xml
@@ -2,11 +2,13 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="youtube">Build support for YouTube content discovery using
-			<pkg>dev-libs/libgdata</pkg></flag>
+		<flag name="tracker">Build support for content discovery using the
+			<pkg>app-misc/tracker</pkg> indexer</flag>
 		<flag name="upnp">Build support for UPnP devices using
 			<pkg>net-libs/gupnp</pkg> and <pkg>net-libs/gupnp-av</pkg></flag>
 		<flag name="vimeo">Build support for Vimeo content discovery using
 			<pkg>net-libs/libsoup</pkg> and <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="youtube">Build support for YouTube content discovery using
+			<pkg>dev-libs/libgdata</pkg></flag>
 	</use>
 </pkgmetadata>