Version bump with optical media support and lots of bugfixes; slot to allow parallel installation of 0.2.x and 0.1.x; disable USE=debug (it only adds debugging CFLAGS). Drop old.

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

7 files changed, 106 insertions, 119 deletions

diff --git a/media-plugins/grilo-plugins/ChangeLog b/media-plugins/grilo-plugins/ChangeLog
index efac36a5b0ef..16c35d7b804c 100644
--- a/media-plugins/grilo-plugins/ChangeLog
+++ b/media-plugins/grilo-plugins/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-plugins/grilo-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.8 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.9 2012/09/16 02:50:33 tetromino Exp $
+
+*grilo-plugins-0.2.0 (16 Sep 2012)
+*grilo-plugins-0.1.20 (16 Sep 2012)
+
+  16 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -grilo-plugins-0.1.17-r2.ebuild,
+  -files/grilo-plugins-0.1.17-apple-trailers-fix.patch,
+  -files/grilo-plugins-0.1.17-tracker-0.12.patch,
+  -files/grilo-plugins-0.1.17-upnp-filter-containers.patch,
+  grilo-plugins-0.1.18.ebuild, +grilo-plugins-0.1.20.ebuild,
+  +grilo-plugins-0.2.0.ebuild:
+  Version bump with optical media support and lots of bugfixes; slot to allow
+  parallel installation of 0.2.x and 0.1.x; disable USE=debug (it only adds
+  debugging CFLAGS). Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   grilo-plugins-0.1.17-r2.ebuild, grilo-plugins-0.1.18.ebuild:
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch
deleted file mode 100644
index 5cfec86afc86..000000000000
--- a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a68da37a138c6dfa4af73bec94a628988f79f3a0 Mon Sep 17 00:00:00 2001
-From: Juan A. Suarez Romero <jasuarez@igalia.com>
-Date: Wed, 07 Sep 2011 18:08:22 +0000
-Subject: apple-trailers: set mime-type
-
-Mime-type is set to "video/mp4".
-
-From the webpage, seems the .mov files have this mimetype.
-
-And .m4v has usually this mimetype too.
-
-Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
----
-diff --git a/src/media/apple-trailers/grl-apple-trailers.c b/src/media/apple-trailers/grl-apple-trailers.c
-index 949f188..9977094 100644
---- a/src/media/apple-trailers/grl-apple-trailers.c
-+++ b/src/media/apple-trailers/grl-apple-trailers.c
-@@ -361,6 +361,8 @@ build_media_from_movie (xmlNodePtr node, gboolean xlarge)
-   grl_media_set_certificate (media, movie_rating);
-   grl_media_set_studio (media, movie_studio);
- 
-+  grl_media_set_mime (media, "video/mp4");
-+
-   /* FIXME: Translation */
-   grl_media_set_license (media, movie_copyright);
- 
---
-cgit v0.9.0.2
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
deleted file mode 100644
index dbe099f79c3c..000000000000
--- a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-tracker-0.12.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 8f5e5c924006..000000000000
--- a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-upnp-filter-containers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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.18.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
index 3e4c996da43a..54917d6b7353 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 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.18.ebuild,v 1.2 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild,v 1.3 2012/09/16 02:50:33 tetromino Exp $
 
 EAPI="4"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
@@ -11,13 +12,13 @@ DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="tracker upnp +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.26:2
-	=media-libs/grilo-${PV}[network]
+	~media-libs/grilo-${PV}:${SLOT}[network]
 
 	dev-libs/gmime:2.6
 	dev-libs/libxml2:2
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
index 3a438de26d0e..f89489cf8585 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.1.17-r2.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2012 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.2 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild,v 1.1 2012/09/16 02:50:33 tetromino Exp $
 
 EAPI="4"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="tracker upnp +vimeo +youtube"
+IUSE="+dvd tracker upnp +vimeo +youtube"
 
 RDEPEND="
-	>=dev-libs/glib-2.26:2
-	=media-libs/grilo-${PV}[network]
+	>=dev-libs/glib-2.28:2
+	~media-libs/grilo-${PV}:${SLOT}[network]
 
 	dev-libs/gmime:2.6
 	dev-libs/libxml2:2
 	dev-db/sqlite:3
 
+	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
 	tracker? ( >=app-misc/tracker-0.10.5 )
 	youtube? ( >=dev-libs/libgdata-0.7
-		>=media-libs/libquvi-0.2.15 )
+		>=media-libs/libquvi-0.4 )
 	upnp? ( >=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
 	vimeo? ( net-libs/libsoup:2.4
@@ -40,7 +42,6 @@ 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"
@@ -60,6 +61,7 @@ pkg_setup() {
 		--enable-podcasts
 		--disable-bliptv
 		--disable-shoutcast
+		$(use_enable dvd optical-media)
 		$(use_enable tracker)
 		$(use_enable upnp)
 		$(use_enable vimeo)
@@ -69,12 +71,5 @@ pkg_setup() {
 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/grilo-plugins-0.2.0.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild
new file mode 100644
index 000000000000..de371786cf88
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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.2.0.ebuild,v 1.1 2012/09/16 02:50:33 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://live.gnome.org/Grilo"
+
+LICENSE="LGPL-2.1"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dvd tracker upnp +vimeo +youtube"
+
+# TODO: Blip.TV (requires librest)
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	~media-libs/grilo-${PV}:${SLOT}[network]
+
+	dev-libs/gmime:2.6
+	dev-libs/libxml2:2
+	dev-db/sqlite:3
+
+	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
+	tracker? ( >=app-misc/tracker-0.10.5 )
+	youtube? ( >=dev-libs/libgdata-0.7
+		>=media-libs/libquvi-0.4.0 )
+	upnp? ( >=net-libs/gupnp-0.13
+		>=net-libs/gupnp-av-0.5 )
+	vimeo? ( net-libs/libsoup:2.4
+		dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# `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-static
+		--disable-debug
+		--disable-uninstalled"
+
+	# Plugins
+	# TODO: Enable Blip.TV support (requires librest)
+	# shoutcast seems to be broken
+	G2CONF="${G2CONF}
+		--disable-bliptv
+		--enable-apple-trailers
+		--enable-bookmarks
+		--enable-filesystem
+		--enable-flickr
+		--enable-gravatar
+		--enable-jamendo
+		--enable-lastfm-albumart
+		--enable-localmetadata
+		--enable-metadata-store
+		--enable-podcasts
+		--disable-shoutcast
+		$(use_enable dvd optical-media)
+		$(use_enable tracker)
+		$(use_enable upnp)
+		$(use_enable vimeo)
+		$(use_enable youtube)"
+}
+
+src_prepare() {
+	sed -i -e 's/^\(SUBDIRS .*\)test/\1/g' Makefile.*
+
+	gnome2_src_prepare
+}