diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-07 00:39:33 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-07 00:39:33 +0000 |
commit | ec36636e1063ee6d4e61ecea08fd8890be52efed (patch) | |
tree | 3c70f300bfb2fd0a46306dc0f0ad368446522227 /media-plugins | |
parent | Marking roxterm-2.2.2 ppc for bug 389583 (diff) | |
download | gentoo-2-ec36636e1063ee6d4e61ecea08fd8890be52efed.tar.gz gentoo-2-ec36636e1063ee6d4e61ecea08fd8890be52efed.tar.bz2 gentoo-2-ec36636e1063ee6d4e61ecea08fd8890be52efed.zip |
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.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
5 files changed, 168 insertions, 3 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/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> |