grilo: Update to 0.3.11

Needed for several newer GNOME package updates.

5 files changed, 125 insertions, 188 deletions

diff --git a/net/grilo-plugins/DESCR b/net/grilo-plugins/DESCR
index cdd2d19ee31..c2488654ade 100644
--- a/net/grilo-plugins/DESCR
+++ b/net/grilo-plugins/DESCR
@@ -1,2 +1,2 @@
-It is a collection of plugins for Grilo implementing Grilo's API for various
+A collection of plugins for Grilo implementing Grilo's API for various
 multimedia content providers.
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 2cbef2a27aa..41465533127 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.30 2019/04/03 00:32:57 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.31 2020/01/20 01:32:17 nia Exp $
 
-DISTNAME=	grilo-plugins-0.2.9
-PKGREVISION=	16
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.gnome.org/pub/gnome/sources/grilo-plugins/0.2/
+DISTNAME=	grilo-plugins-0.3.10
+CATEGORIES=	net gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/grilo-plugins/0.3/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://www.gnome.org/
+HOMEPAGE=	https://wiki.gnome.org/Projects/Grilo
 COMMENT=	Plugins for grilo media browser
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool xgettext
+USE_TOOLS+=	pkg-config xgettext
 
-CONFIGURE_ARGS+=	--disable-bliptv
+PYTHON_FOR_BUILD_ONLY=	tool
 
-.include "../../devel/glib2/buildlink3.mk"
+PKGCONFIG_OVERRIDE+=	grilo-plugins-0.3.pc.in
+
+.include "../../devel/meson/build.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../lang/lua53/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../net/grilo/buildlink3.mk"
-.include "../../net/gupnp/buildlink3.mk"
-.include "../../net/gupnp-av/buildlink3.mk"
-.include "../../multimedia/totem-pl-parser/buildlink3.mk"
+.include "../../net/libgdata/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/grilo-plugins/PLIST b/net/grilo-plugins/PLIST
index 512bd930ae5..196e8269c2b 100644
--- a/net/grilo-plugins/PLIST
+++ b/net/grilo-plugins/PLIST
@@ -1,31 +1,104 @@
-@comment $NetBSD: PLIST,v 1.6 2018/07/31 14:27:35 jperkin Exp $
-lib/grilo-0.2/grl-apple-trailers.xml
-lib/grilo-0.2/grl-bookmarks.xml
-lib/grilo-0.2/grl-filesystem.xml
-lib/grilo-0.2/grl-gravatar.xml
-lib/grilo-0.2/grl-jamendo.xml
-lib/grilo-0.2/grl-lastfm-albumart.xml
-lib/grilo-0.2/grl-local-metadata.xml
-lib/grilo-0.2/grl-magnatune.xml
-lib/grilo-0.2/grl-metadata-store.xml
-lib/grilo-0.2/grl-optical-media.xml
-lib/grilo-0.2/grl-podcasts.xml
-lib/grilo-0.2/grl-raitv.xml
-lib/grilo-0.2/grl-shoutcast.xml
-lib/grilo-0.2/grl-upnp.xml
-lib/grilo-0.2/grl-vimeo.xml
-lib/grilo-0.2/libgrlappletrailers.la
-lib/grilo-0.2/libgrlbookmarks.la
-lib/grilo-0.2/libgrlfilesystem.la
-lib/grilo-0.2/libgrlgravatar.la
-lib/grilo-0.2/libgrljamendo.la
-lib/grilo-0.2/libgrllastfm-albumart.la
-lib/grilo-0.2/libgrllocalmetadata.la
-lib/grilo-0.2/libgrlmagnatune.la
-lib/grilo-0.2/libgrlmetadatastore.la
-lib/grilo-0.2/libgrloptical-media.la
-lib/grilo-0.2/libgrlpodcasts.la
-lib/grilo-0.2/libgrlraitv.la
-lib/grilo-0.2/libgrlshoutcast.la
-lib/grilo-0.2/libgrlupnp.la
-lib/grilo-0.2/libgrlvimeo.la
+@comment $NetBSD: PLIST,v 1.7 2020/01/20 01:32:17 nia Exp $
+lib/grilo-0.3/libgrlchromaprint.so
+lib/grilo-0.3/libgrldleyna.so
+lib/grilo-0.3/libgrlfilesystem.so
+lib/grilo-0.3/libgrlflickr.so
+lib/grilo-0.3/libgrlgravatar.so
+lib/grilo-0.3/libgrljamendo.so
+lib/grilo-0.3/libgrlluafactory.so
+lib/grilo-0.3/libgrlmagnatune.so
+lib/grilo-0.3/libgrlmetadatastore.so
+lib/grilo-0.3/libgrlopensubtitles.so
+lib/grilo-0.3/libgrlopticalmedia.so
+lib/grilo-0.3/libgrlpodcasts.so
+lib/grilo-0.3/libgrlraitv.so
+lib/grilo-0.3/libgrlshoutcast.so
+lib/grilo-0.3/libgrltmdb.so
+lib/grilo-0.3/libgrlvimeo.so
+lib/grilo-0.3/libgrlyoutube.so
+lib/pkgconfig/grilo-plugins-0.3.pc
+share/grilo-plugins/grl-lua-factory/grl-acoustid.lua
+share/grilo-plugins/grl-lua-factory/grl-appletrailers.gresource
+share/grilo-plugins/grl-lua-factory/grl-appletrailers.lua
+share/grilo-plugins/grl-lua-factory/grl-euronews.gresource
+share/grilo-plugins/grl-lua-factory/grl-euronews.lua
+share/grilo-plugins/grl-lua-factory/grl-guardianvideos.gresource
+share/grilo-plugins/grl-lua-factory/grl-guardianvideos.lua
+share/grilo-plugins/grl-lua-factory/grl-itunes-podcast.gresource
+share/grilo-plugins/grl-lua-factory/grl-itunes-podcast.lua
+share/grilo-plugins/grl-lua-factory/grl-lastfm-cover.lua
+share/grilo-plugins/grl-lua-factory/grl-musicbrainz-coverart.lua
+share/grilo-plugins/grl-lua-factory/grl-radiofrance.gresource
+share/grilo-plugins/grl-lua-factory/grl-radiofrance.lua
+share/grilo-plugins/grl-lua-factory/grl-spotify-cover.lua
+share/grilo-plugins/grl-lua-factory/grl-steam-store.lua
+share/grilo-plugins/grl-lua-factory/grl-theaudiodb-cover.lua
+share/grilo-plugins/grl-lua-factory/grl-thegamesdb.lua
+share/grilo-plugins/grl-lua-factory/grl-video-title-parsing.lua
+share/help/C/examples/example-tmdb.c
+share/help/C/grilo-plugins/grilo-plugins.xml
+share/help/C/grilo-plugins/legal.xml
+share/help/cs/examples/example-tmdb.c
+share/help/cs/grilo-plugins/grilo-plugins.xml
+share/help/cs/grilo-plugins/legal.xml
+share/help/de/examples/example-tmdb.c
+share/help/de/grilo-plugins/grilo-plugins.xml
+share/help/de/grilo-plugins/legal.xml
+share/help/es/examples/example-tmdb.c
+share/help/es/grilo-plugins/grilo-plugins.xml
+share/help/es/grilo-plugins/legal.xml
+share/help/pl/examples/example-tmdb.c
+share/help/pl/grilo-plugins/grilo-plugins.xml
+share/help/pl/grilo-plugins/legal.xml
+share/help/pt_BR/examples/example-tmdb.c
+share/help/pt_BR/grilo-plugins/grilo-plugins.xml
+share/help/pt_BR/grilo-plugins/legal.xml
+share/help/sv/examples/example-tmdb.c
+share/help/sv/grilo-plugins/grilo-plugins.xml
+share/help/sv/grilo-plugins/legal.xml
+share/locale/as/LC_MESSAGES/grilo-plugins.mo
+share/locale/bg/LC_MESSAGES/grilo-plugins.mo
+share/locale/bs/LC_MESSAGES/grilo-plugins.mo
+share/locale/ca/LC_MESSAGES/grilo-plugins.mo
+share/locale/ca@valencia/LC_MESSAGES/grilo-plugins.mo
+share/locale/cs/LC_MESSAGES/grilo-plugins.mo
+share/locale/da/LC_MESSAGES/grilo-plugins.mo
+share/locale/de/LC_MESSAGES/grilo-plugins.mo
+share/locale/el/LC_MESSAGES/grilo-plugins.mo
+share/locale/en_GB/LC_MESSAGES/grilo-plugins.mo
+share/locale/eo/LC_MESSAGES/grilo-plugins.mo
+share/locale/es/LC_MESSAGES/grilo-plugins.mo
+share/locale/eu/LC_MESSAGES/grilo-plugins.mo
+share/locale/fi/LC_MESSAGES/grilo-plugins.mo
+share/locale/fr/LC_MESSAGES/grilo-plugins.mo
+share/locale/fur/LC_MESSAGES/grilo-plugins.mo
+share/locale/gl/LC_MESSAGES/grilo-plugins.mo
+share/locale/he/LC_MESSAGES/grilo-plugins.mo
+share/locale/hr/LC_MESSAGES/grilo-plugins.mo
+share/locale/hu/LC_MESSAGES/grilo-plugins.mo
+share/locale/id/LC_MESSAGES/grilo-plugins.mo
+share/locale/it/LC_MESSAGES/grilo-plugins.mo
+share/locale/ja/LC_MESSAGES/grilo-plugins.mo
+share/locale/ko/LC_MESSAGES/grilo-plugins.mo
+share/locale/lt/LC_MESSAGES/grilo-plugins.mo
+share/locale/lv/LC_MESSAGES/grilo-plugins.mo
+share/locale/ml/LC_MESSAGES/grilo-plugins.mo
+share/locale/nb/LC_MESSAGES/grilo-plugins.mo
+share/locale/ne/LC_MESSAGES/grilo-plugins.mo
+share/locale/nl/LC_MESSAGES/grilo-plugins.mo
+share/locale/oc/LC_MESSAGES/grilo-plugins.mo
+share/locale/pl/LC_MESSAGES/grilo-plugins.mo
+share/locale/pt/LC_MESSAGES/grilo-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/grilo-plugins.mo
+share/locale/ro/LC_MESSAGES/grilo-plugins.mo
+share/locale/ru/LC_MESSAGES/grilo-plugins.mo
+share/locale/sk/LC_MESSAGES/grilo-plugins.mo
+share/locale/sl/LC_MESSAGES/grilo-plugins.mo
+share/locale/sr/LC_MESSAGES/grilo-plugins.mo
+share/locale/sr@latin/LC_MESSAGES/grilo-plugins.mo
+share/locale/sv/LC_MESSAGES/grilo-plugins.mo
+share/locale/tr/LC_MESSAGES/grilo-plugins.mo
+share/locale/uk/LC_MESSAGES/grilo-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/grilo-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/grilo-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/grilo-plugins.mo
diff --git a/net/grilo-plugins/distinfo b/net/grilo-plugins/distinfo
index 8da30436ee1..c6607a1a80b 100644
--- a/net/grilo-plugins/distinfo
+++ b/net/grilo-plugins/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2018/07/31 14:27:35 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2020/01/20 01:32:17 nia Exp $
 
-SHA1 (grilo-plugins-0.2.9.tar.xz) = 4e16f3db4273ab8029642edb83de4abb08515205
-RMD160 (grilo-plugins-0.2.9.tar.xz) = 76338353548e4bdaa0c29e5eca873f0cc49cabca
-SHA512 (grilo-plugins-0.2.9.tar.xz) = 0fa558c5650ebbe963b6553b93efd03319c21c7b4d410a5186d3f5e25cd195fd2cd531b6142272d09ad4fcf996dd070be34d06910cfeb8484b5e9d7a8157669f
-Size (grilo-plugins-0.2.9.tar.xz) = 595308 bytes
-SHA1 (patch-src_jamendo_grl-jamendo.c) = 501719b611db7b146dfb4a265ce955a7f4e55ade
+SHA1 (grilo-plugins-0.3.10.tar.xz) = 2e0a0dd13d57dde9178c0f6af0f2630a9c76119b
+RMD160 (grilo-plugins-0.3.10.tar.xz) = d4a2970d8cb8140936ee2b38e1b8c41cbaf5818b
+SHA512 (grilo-plugins-0.3.10.tar.xz) = 93d4fcc7d6fd1b43925e286c8856c90d240cf9244d04a8b034df85781b1a6bffcb5c635576e37717325f82a0be567a7087715ff6d680b3c5aca133c6deb43ed2
+Size (grilo-plugins-0.3.10.tar.xz) = 1447368 bytes
diff --git a/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c b/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c
deleted file mode 100644
index 91b16ac8fde..00000000000
--- a/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c
+++ /dev/null
@@ -1,135 +0,0 @@
-$NetBSD: patch-src_jamendo_grl-jamendo.c,v 1.1 2018/07/31 14:27:35 jperkin Exp $
-
-Apply upstream "format not a string literal" fixes.
-
---- src/jamendo/grl-jamendo.c.orig	2018-07-31 14:15:42.805159862 +0000
-+++ src/jamendo/grl-jamendo.c
-@@ -141,10 +141,12 @@ typedef struct {
-   gboolean cancelled;
- } XmlParseEntries;
- 
-+/* Note: you'll also need to update
-+ * grl_jamendo_source_browse() */
- struct Feeds {
-   gchar *name;
-   JamendoCategory cat;
--  gchar *url;
-+  const gchar *url;
- } feeds[] = {
-   { N_("Albums of the week"), JAMENDO_ALBUM_CAT,
-     JAMENDO_GET_ALBUMS "&order=ratingweek_desc", },
-@@ -1170,10 +1172,46 @@ grl_jamendo_source_browse (GrlSource *so
- 
-         feed_id = atoi (container_split[1]);
-         jamendo_keys = get_jamendo_keys (feeds[feed_id].cat);
--        url = g_strdup_printf (feeds[feed_id].url,
--                               jamendo_keys,
--                               page_size,
--                               page_number);
-+        switch (feed_id) {
-+        case 0:
-+          url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=ratingweek_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        case 1:
-+          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=ratingweek_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        case 2:
-+          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=releasedate_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        case 3:
-+          url = g_strdup_printf (JAMENDO_GET_ARTISTS "&order=rating_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        case 4:
-+          url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=rating_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        case 5:
-+          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=rating_desc",
-+                                 jamendo_keys,
-+                                 page_size,
-+                                 page_number);
-+          break;
-+        default:
-+          g_assert_not_reached ();
-+        }
-         g_free (jamendo_keys);
-       } else {
-         send_feeds (bs);
-@@ -1232,7 +1270,6 @@ grl_jamendo_source_query (GrlSource *sou
-   gchar *term = NULL;
-   gchar *url;
-   gchar *jamendo_keys = NULL;
--  gchar *query = NULL;
-   XmlParseEntries *xpe = NULL;
-   guint page_size;
-   guint page_number;
-@@ -1250,33 +1287,40 @@ grl_jamendo_source_query (GrlSource *sou
-     goto send_error;
-   }
- 
-+  grl_paging_translate (skip,
-+                        count,
-+                        0,
-+                        &page_size,
-+                        &page_number,
-+                        &page_offset);
-+
-   jamendo_keys = get_jamendo_keys (category);
-   switch (category) {
-   case JAMENDO_ARTIST_CAT:
--    query = JAMENDO_SEARCH_ARTIST;
-+    url = g_strdup_printf (JAMENDO_SEARCH_ARTIST,
-+                           jamendo_keys,
-+                           page_size,
-+                           page_number,
-+                           term);
-     break;
-   case JAMENDO_ALBUM_CAT:
--    query = JAMENDO_SEARCH_ALBUM;
-+    url = g_strdup_printf (JAMENDO_SEARCH_ALBUM,
-+                           jamendo_keys,
-+                           page_size,
-+                           page_number,
-+                           term);
-     break;
-   case JAMENDO_TRACK_CAT:
--    query = JAMENDO_SEARCH_TRACK;
-+    url = g_strdup_printf (JAMENDO_SEARCH_TRACK,
-+                           jamendo_keys,
-+                           page_size,
-+                           page_number,
-+                           term);
-     break;
-   default:
-     g_return_if_reached ();
-   }
- 
--  grl_paging_translate (skip,
--                        count,
--                        0,
--                        &page_size,
--                        &page_number,
--                        &page_offset);
--
--  url = g_strdup_printf (query,
--                         jamendo_keys,
--                         page_size,
--                         page_number,
--                         term);
-   g_free (term);
-   g_free (jamendo_keys);
-