diff --git a/.gitignore b/.gitignore index 9b2ab12..fcdf23e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/grilo-0.2.12.tar.xz +SOURCES/grilo-0.3.3.tar.xz diff --git a/.grilo.metadata b/.grilo.metadata index d9270c6..092d07a 100644 --- a/.grilo.metadata +++ b/.grilo.metadata @@ -1 +1 @@ -d84e58363c1b64d4b8fcd0d901ec74f07dfba951 SOURCES/grilo-0.2.12.tar.xz +796095aa253d2a8001ee5a0a9e57450abeaebc9d SOURCES/grilo-0.3.3.tar.xz diff --git a/SOURCES/grilo-0.2.12-pre.patch b/SOURCES/grilo-0.2.12-pre.patch deleted file mode 100644 index 7e201d4..0000000 --- a/SOURCES/grilo-0.2.12-pre.patch +++ /dev/null @@ -1,1108 +0,0 @@ -From ee8d5558bf5d5a2b07e88afe7928df79b36f45da Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 5 Mar 2015 14:15:08 +0100 -Subject: [PATCH 1/5] core: Fix warning when unloading a plugin that failed to - load - -This warning is normal: -(totem:17205): Grilo-WARNING **: [registry] grl-registry.c:1130: Failed to open module: libicui18n.so.52: cannot open shared object file: No such file or directory - -This one isn't: -(totem:8432): GModule-CRITICAL **: g_module_close: assertion 'module != NULL' failed - -This patch fixes the latter. - -https://bugzilla.gnome.org/show_bug.cgi?id=745676 ---- - src/grl-registry.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/grl-registry.c b/src/grl-registry.c -index fb41f78..8421ac4 100644 ---- a/src/grl-registry.c -+++ b/src/grl-registry.c -@@ -558,8 +558,7 @@ activate_plugin (GrlRegistry *registry, - GRL_CORE_ERROR, - GRL_CORE_ERROR_LOAD_PLUGIN_FAILED, - _("Failed to initialize plugin from %s"), grl_plugin_get_filename (plugin)); -- g_module_close (grl_plugin_get_module (plugin)); -- grl_plugin_set_module (plugin, NULL); -+ shutdown_plugin (plugin); - return FALSE; - } - --- -2.4.0 - - -From a520247a16fec863ea04ac839fd9aa9105ebd481 Mon Sep 17 00:00:00 2001 -From: Samir Ribic -Date: Fri, 13 Mar 2015 21:01:32 +0000 -Subject: [PATCH 2/5] Added Bosnian translation - ---- - po/LINGUAS | 1 + - po/bs.po | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 193 insertions(+) - create mode 100644 po/bs.po - -diff --git a/po/LINGUAS b/po/LINGUAS -index d8585a8..bc7bd9e 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -1,4 +1,5 @@ - as -+bs - ca - ca@valencia - cs -diff --git a/po/bs.po b/po/bs.po -new file mode 100644 -index 0000000..8f2f79f ---- /dev/null -+++ b/po/bs.po -@@ -0,0 +1,192 @@ -+# Bosnian translation for bosnianuniversetranslation -+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -+# This file is distributed under the same license as the bosnianuniversetranslation package. -+# FIRST AUTHOR , 2014. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: bosnianuniversetranslation\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=grilo&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2015-02-26 21:35+0000\n" -+"PO-Revision-Date: 2014-01-08 15:57+0000\n" -+"Last-Translator: Almir Husic \n" -+"Language-Team: Bosnian \n" -+"Language: bs\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Launchpad-Export-Date: 2014-10-23 07:21+0000\n" -+"X-Generator: Launchpad (build 17203)\n" -+ -+#: ../libs/net/grl-net-mock.c:86 -+msgid "No mock definition found" -+msgstr "Nema pronađene lažne def." -+ -+#: ../libs/net/grl-net-mock.c:98 -+#, c-format -+msgid "Could not find mock content %s" -+msgstr "Ne mogu naći lažni sadržaj %s" -+ -+#: ../libs/net/grl-net-mock.c:118 -+msgid "Could not access mock content" -+msgstr "Ne mogu pristupiti lažnom sadržaju" -+ -+#: ../libs/net/grl-net-wc.c:467 -+msgid "Cannot connect to the server" -+msgstr "Ne mogu se spojiti na server" -+ -+#: ../libs/net/grl-net-wc.c:473 -+msgid "Cannot connect to the proxy server" -+msgstr "Ne mogu se spojiti na proxy server" -+ -+#: ../libs/net/grl-net-wc.c:480 -+#, c-format -+msgid "Invalid request URI or header: %s" -+msgstr "Nevažeći zahtjev URL ili zaglavlje: %s" -+ -+#: ../libs/net/grl-net-wc.c:487 -+#, c-format -+msgid "Authentication required: %s" -+msgstr "Potrebna autentifikacija: %s" -+ -+#: ../libs/net/grl-net-wc.c:492 -+#, c-format -+msgid "The requested resource was not found: %s" -+msgstr "Zahtjevani resurs nije pronađen: %s" -+ -+#: ../libs/net/grl-net-wc.c:499 -+#, c-format -+msgid "The entry has been modified since it was downloaded: %s" -+msgstr "Unos je modificiran otkako je preuzet: %s" -+ -+#: ../libs/net/grl-net-wc.c:505 ../libs/net/grl-net-wc.c:614 -+#: ../libs/pls/grl-pls.c:490 ../src/grl-source.c:1822 ../src/grl-source.c:1922 -+#: ../src/grl-source.c:2069 ../src/grl-source.c:2310 ../src/grl-source.c:2430 -+#, c-format -+msgid "Operation was cancelled" -+msgstr "Operacija je prekinuta" -+ -+#: ../libs/net/grl-net-wc.c:508 -+#, c-format -+msgid "Unhandled status: %s" -+msgstr "Nepodržan status: %s" -+ -+#: ../libs/net/grl-net-wc.c:618 ../libs/net/grl-net-wc.c:659 -+msgid "Data not available" -+msgstr "Podaci nisu dostupni" -+ -+#: ../libs/net/grl-net-wc.c:712 -+#, c-format -+msgid "Invalid URL %s" -+msgstr "Nevažeći URL %s" -+ -+#: ../src/grilo.c:228 -+msgid "Semicolon-separated paths containing Grilo plugins" -+msgstr "Semikolone-razdvojene putevima sadrže Grilo puginove" -+ -+#: ../src/grilo.c:230 -+msgid "Colon-separated paths containing Grilo plugins" -+msgstr "Kolone-razdojene putevima sadrže Grilo pluginove" -+ -+#: ../src/grilo.c:233 -+msgid "Colon-separated list of Grilo plugins to use" -+msgstr "Lista razdvojenih kolona Grilo pruginova za upotrebu" -+ -+#: ../src/grilo.c:238 -+msgid "Grilo Options" -+msgstr "Grilo Opcije" -+ -+#: ../src/grilo.c:239 -+msgid "Show Grilo Options" -+msgstr "Prikaži Grilo Opcije" -+ -+#: ../src/grl-multiple.c:130 -+#, c-format -+msgid "No searchable sources available" -+msgstr "Nemadostupnih pretraživih izvora" -+ -+#: ../src/grl-multiple.c:487 -+#, c-format -+msgid "Could not resolve media for URI '%s'" -+msgstr "Ne mogu riješiti medij za URL '%s'" -+ -+#: ../src/grl-registry.c:536 ../src/grl-registry.c:1368 -+#, c-format -+msgid "Plugin '%s' is already loaded" -+msgstr "Plugin '%s' je već učitan" -+ -+#: ../src/grl-registry.c:560 -+#, c-format -+msgid "Failed to initialize plugin from %s" -+msgstr "Neuspjelo inicijaliziranje plugina iz %s" -+ -+#: ../src/grl-registry.c:747 -+#, c-format -+msgid "Metadata key '%s' cannot be registered" -+msgstr "Ključ metapodataka '%s' ne može biti registriran" -+ -+#: ../src/grl-registry.c:1084 -+#, c-format -+msgid "Source with id '%s' was not found" -+msgstr "Izvor sa id '%s' nije pronađen" -+ -+#: ../src/grl-registry.c:1135 -+#, c-format -+msgid "Failed to load plugin from %s" -+msgstr "Neuspjelo učitavanje plugina iz %s" -+ -+#: ../src/grl-registry.c:1144 -+#, c-format -+msgid "Invalid plugin file %s" -+msgstr "Neispravan plugin fajl %s" -+ -+#: ../src/grl-registry.c:1155 -+#, c-format -+msgid "'%s' is not a valid plugin file" -+msgstr "'%s' nije validan plugin fajl" -+ -+#: ../src/grl-registry.c:1174 -+#, c-format -+msgid "Unable to load plugin '%s'" -+msgstr "Nije moguće učitavanje plugina '%s'" -+ -+#: ../src/grl-registry.c:1185 -+#, c-format -+msgid "Plugin '%s' already exists" -+msgstr "Plugin '%s' već postoji" -+ -+#: ../src/grl-registry.c:1310 -+#, c-format -+msgid "All configured plugin paths are invalid" -+msgstr "Svi konfigurisani plugin putevi su nevažeći" -+ -+#: ../src/grl-registry.c:1357 -+#, c-format -+msgid "Plugin '%s' not available" -+msgstr "Plugin '%s' nije dostupan" -+ -+#: ../src/grl-registry.c:1585 -+#, c-format -+msgid "Plugin not found: '%s'" -+msgstr "Plugin nije pronađen: '%s'" -+ -+#: ../src/grl-registry.c:1934 -+#, c-format -+msgid "Plugin configuration does not contain 'plugin-id' reference" -+msgstr "Plugin konfiguracija ne sadrži 'plugin-id' referencu" -+ -+#: ../src/grl-source.c:2759 -+#, c-format -+msgid "Some keys could not be written" -+msgstr "Neki ključevi ne mogu biti zapisani" -+ -+#: ../src/grl-source.c:2832 -+#, c-format -+msgid "None of the specified keys are writable" -+msgstr "Nijedan od specificiranih ključeva nije upisiv" -+ -+#: ../src/grl-source.c:4175 -+#, c-format -+msgid "Media has no 'id', cannot remove" -+msgstr "Medij nema 'id', ne mogu ukloniti" --- -2.4.0 - - -From 47f8ac3212ca114ab686129887c19625e6a3f343 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C5=ABdolfs=20Mazurs?= -Date: Fri, 3 Apr 2015 19:53:52 +0300 -Subject: [PATCH 3/5] Updated Latvian translation - ---- - po/lv.po | 681 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 566 insertions(+), 115 deletions(-) - -diff --git a/po/lv.po b/po/lv.po -index ab7ccb2..43a059a 100644 ---- a/po/lv.po -+++ b/po/lv.po -@@ -1,14 +1,14 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the PACKAGE package. - # --# Rūdolfs Mazurs , 2013. -+# Rūdolfs Mazurs , 2013, 2014, 2015. - msgid "" - msgstr "" - "Project-Id-Version: \n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=grilo&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2013-09-10 20:01+0000\n" --"PO-Revision-Date: 2013-09-12 21:06+0300\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=grilo-" -+"plugins&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2015-02-17 17:06+0000\n" -+"PO-Revision-Date: 2015-04-03 19:53+0300\n" - "Last-Translator: Rūdolfs Mazurs \n" - "Language-Team: Latvian \n" - "Language: lv\n" -@@ -19,175 +19,626 @@ msgstr "" - "2);\n" - "X-Generator: Lokalize 1.5\n" - --#: ../libs/net/grl-net-mock.c:85 --msgid "No mock definition found" --msgstr "Nav atrastu uzmetumu definīciju" -+#: ../src/apple-trailers/grl-apple-trailers.c:55 -+msgid "Apple Movie Trailers" -+msgstr "Apple filmu reklāmkadri" -+ -+#: ../src/apple-trailers/grl-apple-trailers.c:56 -+msgid "A plugin for browsing Apple Movie Trailers" -+msgstr "Spraudnis Apple filmu reklāmkadru pārlūkošanai" -+ -+#: ../src/apple-trailers/grl-apple-trailers.c:469 -+#: ../src/jamendo/grl-jamendo.c:339 ../src/jamendo/grl-jamendo.c:700 -+#: ../src/shoutcast/grl-shoutcast.c:410 ../src/shoutcast/grl-shoutcast.c:464 -+msgid "Failed to parse response" -+msgstr "Neizdevās saprast atbildi" -+ -+#: ../src/apple-trailers/grl-apple-trailers.c:477 -+#: ../src/jamendo/grl-jamendo.c:347 ../src/jamendo/grl-jamendo.c:354 -+#: ../src/podcasts/grl-podcasts.c:1361 ../src/shoutcast/grl-shoutcast.c:418 -+msgid "Empty response" -+msgstr "Tukša atbilde" -+ -+#: ../src/apple-trailers/grl-apple-trailers.c:532 -+#: ../src/jamendo/grl-jamendo.c:669 -+#: ../src/lastfm-albumart/grl-lastfm-albumart.c:252 -+#: ../src/shoutcast/grl-shoutcast.c:552 -+#, c-format -+msgid "Failed to connect: %s" -+msgstr "Neizdevās savienoties: %s" -+ -+#: ../src/bliptv/grl-bliptv.c:60 -+msgid "A source for browsing and searching Blip.tv videos" -+msgstr "Avots Blip.tv video pārlūkošanai un meklēšanai" -+ -+#: ../src/bookmarks/grl-bookmarks.c:67 -+msgid "Bookmarks" -+msgstr "Grāmatzīmes" -+ -+#: ../src/bookmarks/grl-bookmarks.c:68 -+msgid "A source for organizing media bookmarks" -+msgstr "Datu nesēju grāmatzīmju organizēšanas avots" - --#: ../libs/net/grl-net-mock.c:97 -+#: ../src/bookmarks/grl-bookmarks.c:428 -+msgid "Failed to get bookmark metadata" -+msgstr "Neizdevās saņemt grāmatzīmju metadatus" -+ -+#: ../src/bookmarks/grl-bookmarks.c:458 ../src/bookmarks/grl-bookmarks.c:475 - #, c-format --msgid "Could not find mock content %s" --msgstr "Nevarēja atrast %s uzmetuma saturu" -+msgid "Failed to find bookmarks: %s" -+msgstr "Neizdevās atrast grāmatzīmes — %s" - --#: ../libs/net/grl-net-mock.c:117 --msgid "Could not access mock content" --msgstr "Nevarēja piekļūt uzmetuma saturam" -+#: ../src/bookmarks/grl-bookmarks.c:627 ../src/podcasts/grl-podcasts.c:821 -+#: ../src/podcasts/grl-podcasts.c:853 ../src/podcasts/grl-podcasts.c:885 -+#, c-format -+msgid "Failed to remove: %s" -+msgstr "Neizdevās izņemt: %s" - --#: ../libs/net/grl-net-wc.c:468 --msgid "Cannot connect to the server" --msgstr "Nevar savienoties ar serveri" -+#: ../src/bookmarks/grl-bookmarks.c:767 ../src/podcasts/grl-podcasts.c:926 -+#: ../src/podcasts/grl-podcasts.c:959 ../src/podcasts/grl-podcasts.c:1804 -+#, c-format -+msgid "Failed to store: %s" -+msgstr "Neizdevās saglabāt: %s" -+ -+#: ../src/bookmarks/grl-bookmarks.c:841 ../src/bookmarks/grl-bookmarks.c:876 -+#: ../src/bookmarks/grl-bookmarks.c:907 ../src/bookmarks/grl-bookmarks.c:965 -+#: ../src/metadata-store/grl-metadata-store.c:849 -+#: ../src/podcasts/grl-podcasts.c:1660 ../src/podcasts/grl-podcasts.c:1704 -+#: ../src/podcasts/grl-podcasts.c:1738 ../src/podcasts/grl-podcasts.c:1773 -+msgid "No database connection" -+msgstr "Nav datubāžu savienojama" -+ -+#: ../src/dleyna/grl-dleyna-source.c:34 -+#, c-format -+msgid "A source for browsing the DLNA server '%s'" -+msgstr "DLNA servera “%s” pārlūkošanas avots" - --#: ../libs/net/grl-net-wc.c:474 --msgid "Cannot connect to the proxy server" --msgstr "Nevar savienoties ar starpniekserveri" -+#: ../src/dleyna/grl-dleyna-source.c:278 -+msgid "Upload failed, target source destroyed" -+msgstr "Augšupielāde neizdevās, mērķa avots ir iznīcināts" - --#: ../libs/net/grl-net-wc.c:481 -+#: ../src/dleyna/grl-dleyna-source.c:380 - #, c-format --msgid "Invalid request URI or header: %s" --msgstr "Nederīgs pieprasījuma URI vai galvene: %s" -+msgid "Upload failed, '%s', transferred %lu of %lu bytes" -+msgstr "Augšupielāde neizdevās, “%s”, pārsūtīti %lu no %lu baitiem" - --#: ../libs/net/grl-net-wc.c:488 -+#: ../src/dleyna/grl-dleyna-source.c:880 - #, c-format --msgid "Authentication required: %s" --msgstr "Nepieciešama autentifikācija — %s" -+msgid "Failed to retrieve item properties (BrowseObjects error %d: %s)" -+msgstr "Neizdevās saņemt vienumu īpašības (BrowseObjects kļūda %d: %s)" - --#: ../libs/net/grl-net-wc.c:493 -+#: ../src/dleyna/grl-dleyna-source.c:1519 - #, c-format --msgid "The requested resource was not found: %s" --msgstr "Pieprasītais resurs netika atrasts — %s" -+msgid "Upload failed, URL missing on the media object to be transferred" -+msgstr "Augšupielāde neizdevās, trūkst pārsūtāmā mediju objekta URL " - --#: ../libs/net/grl-net-wc.c:500 -+#: ../src/dmap/grl-dmap.c:51 - #, c-format --msgid "The entry has been modified since it was downloaded: %s" --msgstr "Ieraksts ir mainījies kopš tas tika lejupielādēts — %s" -+msgid "A source for browsing the DMAP server '%s'" -+msgstr "DMAP servera “%s” pārlūkošanas avots" -+ -+#: ../src/dmap/simple-dmap-db.c:62 ../src/jamendo/grl-jamendo.c:787 -+#: ../src/magnatune/grl-magnatune.c:121 -+msgid "Albums" -+msgstr "Albumi" -+ -+#: ../src/dmap/simple-dmap-db.c:64 ../src/jamendo/grl-jamendo.c:776 -+#: ../src/magnatune/grl-magnatune.c:120 -+msgid "Artists" -+msgstr "Mākslinieki" - --#: ../libs/net/grl-net-wc.c:506 ../libs/net/grl-net-wc.c:614 --#: ../src/grl-source.c:1710 ../src/grl-source.c:1805 ../src/grl-source.c:1948 --#: ../src/grl-source.c:2184 ../src/grl-source.c:2304 -+#: ../src/dmap/simple-dmap-db.c:293 ../src/jamendo/grl-jamendo.c:1114 -+#: ../src/jamendo/grl-jamendo.c:1189 ../src/magnatune/grl-magnatune.c:834 - #, c-format --msgid "Operation was cancelled" --msgstr "Darbība tika atcelta" -+msgid "Invalid container identifier %s" -+msgstr "Nederīgs konteinera identifikators %s" - --#: ../libs/net/grl-net-wc.c:509 -+#: ../src/filesystem/grl-filesystem.c:60 -+msgid "Filesystem" -+msgstr "Datņu sistēma" -+ -+#: ../src/filesystem/grl-filesystem.c:61 -+msgid "A source for browsing the filesystem" -+msgstr "Datņu sistēmas pārlūkošanas avots" -+ -+#: ../src/filesystem/grl-filesystem.c:1148 - #, c-format --msgid "Unhandled status: %s" --msgstr "Neapstrādāts statuss — “%s”" -+msgid "File %s does not exist" -+msgstr "Datne “%s” neeksistē" - --#: ../libs/net/grl-net-wc.c:618 ../libs/net/grl-net-wc.c:659 --msgid "Data not available" --msgstr "Dati nav pieejami" -+#: ../src/filesystem/grl-filesystem.c:1226 ../src/youtube/grl-youtube.c:1591 -+#, c-format -+msgid "Cannot get media from %s" -+msgstr "Nevar saņemt datus no %s" - --#: ../libs/net/grl-net-wc.c:712 -+#: ../src/flickr/grl-flickr.c:63 -+msgid "A source for browsing and searching Flickr photos" -+msgstr "Avots Flickr fotogrāfiju pārlūkošanai un meklēšanai" -+ -+#. "%s" is a full user name, like "John Doe" -+#: ../src/flickr/grl-flickr.c:67 -+#, c-format -+msgid "%s's Flickr" -+msgstr "%s Flickr" -+ -+#. "%s" is a full user name, like "John Doe" -+#: ../src/flickr/grl-flickr.c:69 - #, c-format --msgid "Invalid URL %s" --msgstr "Nederīgs URL %s" -+msgid "A source for browsing and searching %s's flickr photos" -+msgstr "Avots %s flickr fotogrāfiju pārlūkošanai un meklēšanai" -+ -+#: ../src/freebox/grl-freebox.c:50 -+msgid "Freebox TV" -+msgstr "Freebox TV" -+ -+#: ../src/freebox/grl-freebox.c:51 -+msgid "A source for browsing Freebox TV channels" -+msgstr "Avots Freebox TV kanālu pārlūkošanai" -+ -+#: ../src/freebox/grl-freebox.c:54 -+#| msgid "Freebox TV" -+msgid "Freebox Radio" -+msgstr "Freebox Radio" -+ -+#: ../src/freebox/grl-freebox.c:55 -+#| msgid "A source for browsing Freebox TV channels" -+msgid "A source for browsing Freebox radio channels" -+msgstr "Avots Freebox radio kanālu pārlūkošanai" -+ -+#: ../src/gravatar/grl-gravatar.c:48 -+msgid "Avatar provider from Gravatar" -+msgstr "Avatar sniedzējs no Gravatar" -+ -+#: ../src/gravatar/grl-gravatar.c:49 -+msgid "A plugin to get avatars for artist and author fields" -+msgstr "Spraudnis, lai saņemtu avatarus no mākslinieku un autoru laukiem" -+ -+#: ../src/jamendo/grl-jamendo.c:93 -+msgid "A source for browsing and searching Jamendo music" -+msgstr "Avots Jamendo mūzikas pārlūkošanai un meklēšanai" -+ -+#: ../src/jamendo/grl-jamendo.c:149 -+msgid "Albums of the week" -+msgstr "Nedēļas albumi" -+ -+#: ../src/jamendo/grl-jamendo.c:151 -+msgid "Tracks of the week" -+msgstr "Nedēļas celiņi" - --#: ../src/grilo.c:181 --msgid "Semicolon-separated paths containing Grilo plugins" --msgstr "Ar semikoliem atdalīti ceļi, kas satur Grilo spraudņus" -+#: ../src/jamendo/grl-jamendo.c:153 -+msgid "New releases" -+msgstr "Jaunie izdevumi" - --#: ../src/grilo.c:183 --msgid "Colon-separated paths containing Grilo plugins" --msgstr "Ar koliem atdalīti ceļi, kas satur Grilo spraudņus" -+#: ../src/jamendo/grl-jamendo.c:155 -+msgid "Top artists" -+msgstr "Topa izpildītāji" - --#: ../src/grilo.c:186 --msgid "Colon-separated list of Grilo plugins to use" --msgstr "Ar koliem atdalīti saraksti ar Grilo spraudņiem, ko izmantot" -+#: ../src/jamendo/grl-jamendo.c:157 -+msgid "Top albums" -+msgstr "Topa albumi" - --#: ../src/grilo.c:191 --msgid "Grilo Options" --msgstr "Grilo opcijas" -+#: ../src/jamendo/grl-jamendo.c:159 -+msgid "Top tracks" -+msgstr "Topa celiņi" - --#: ../src/grilo.c:192 --msgid "Show Grilo Options" --msgstr "Rādīt Grilo opcijas" -+#: ../src/jamendo/grl-jamendo.c:798 -+msgid "Feeds" -+msgstr "Plūsmas" - --#: ../src/grl-multiple.c:130 -+#: ../src/jamendo/grl-jamendo.c:982 ../src/jamendo/grl-jamendo.c:1027 -+#: ../src/jamendo/grl-jamendo.c:1054 - #, c-format --msgid "No searchable sources available" --msgstr "Nav pieejamu meklējamu avotu" -+msgid "Invalid identifier %s" -+msgstr "Nederīgs identifikators %s" - --#: ../src/grl-multiple.c:485 -+#: ../src/jamendo/grl-jamendo.c:1041 ../src/youtube/grl-youtube.c:1189 -+#: ../src/youtube/grl-youtube.c:1320 ../src/youtube/grl-youtube.c:1528 - #, c-format --msgid "Could not resolve media for URI '%s'" --msgstr "Nevarēja atpazīt URI “%s” datu nesēju" -+msgid "Invalid category identifier %s" -+msgstr "Nederīgs kategorijas identifikators %s" - --#: ../src/grl-registry.c:328 ../src/grl-registry.c:1002 -+#: ../src/jamendo/grl-jamendo.c:1184 - #, c-format --msgid "Plugin '%s' is already loaded" --msgstr "Jau ir ielādēts spraudnis “%s”" -+msgid "Failed to browse: %s is a track" -+msgstr "Neizdevās pārlūkot: %s ir celiņš" - --#: ../src/grl-registry.c:340 -+#: ../src/jamendo/grl-jamendo.c:1244 - #, c-format --msgid "Failed to initialize plugin from %s" --msgstr "Neizdevās inicializēt spraudni no %s" -+msgid "Malformed query \"%s\"" -+msgstr "Slikti noformēts vaicājums “%s”" - --#: ../src/grl-registry.c:734 -+#: ../src/lastfm-albumart/grl-lastfm-albumart.c:60 -+msgid "Album art Provider from Last.FM" -+msgstr "Albumu vāciņu nodrošinātās no Last.FM" -+ -+#: ../src/lastfm-albumart/grl-lastfm-albumart.c:61 -+msgid "A plugin for getting album arts using Last.FM as backend" -+msgstr "Spraudnis, lai saņemtu albumu vāciņus, izmantojot Last.FM aizmuguri" -+ -+#: ../src/local-metadata/grl-local-metadata.c:44 -+msgid "Local Metadata Provider" -+msgstr "Lokālais metadatu piegādātājs" -+ -+#: ../src/local-metadata/grl-local-metadata.c:45 -+msgid "A source providing locally available metadata" -+msgstr "Avots, kas nodrošina lokāli pieejamus metadatus" -+ -+#: ../src/local-metadata/grl-local-metadata.c:609 -+#: ../src/metadata-store/grl-metadata-store.c:759 ../src/raitv/grl-raitv.c:868 -+#: ../src/tracker/grl-tracker-source-api.c:527 - #, c-format --msgid "Source with id '%s' was not found" --msgstr "Netika atrasts avots ar id “%s”" -+msgid "Failed to resolve: %s" -+msgstr "Neizdevās uzmeklēt — %s" -+ -+#: ../src/local-metadata/grl-local-metadata.c:1033 -+msgid "Cannot resolve any of the given keys" -+msgstr "Nevar uzmeklēt nevienu no dotajām atslēgām" -+ -+#: ../src/local-metadata/grl-local-metadata.c:1037 -+msgid "A GIO supported URL for images is required" -+msgstr "Ir nepieciešams GIO atbalstīts URL attēliem" -+ -+#: ../src/magnatune/grl-magnatune.c:122 -+msgid "Genres" -+msgstr "Žanri" - --#: ../src/grl-registry.c:797 -+#: ../src/magnatune/grl-magnatune.c:130 -+msgid "A source for browsing music" -+msgstr "Avots mūzikas pārlūkošanai" -+ -+#: ../src/magnatune/grl-magnatune.c:411 - #, c-format --msgid "Failed to load plugin from %s" --msgstr "Neizdevās ielādēt spraudni no %s" -+msgid "Failed to get database from magnatune: %s" -+msgstr "Neizdevās saņemt datubāzi no magnatune: %s" - --#: ../src/grl-registry.c:806 -+#: ../src/magnatune/grl-magnatune.c:441 - #, c-format --msgid "Invalid plugin file %s" --msgstr "Nederīga spraudņa datne %s" -+msgid "Failed to save database from magnatune - '%s'" -+msgstr "Neizdevās saglabāt datubāzi no magnatune — “%s”" - --#: ../src/grl-registry.c:817 -+#: ../src/magnatune/grl-magnatune.c:689 - #, c-format --msgid "'%s' is not a valid plugin file" --msgstr "“%s” nav derīga spraudņa datne" -+msgid "Failed to get table from magnatune db: %s" -+msgstr "Neizdevās saņemt tabulu no magnatune datubāzes: %s" - --#: ../src/grl-registry.c:836 -+#: ../src/magnatune/grl-magnatune.c:705 - #, c-format --msgid "Unable to load plugin '%s'" --msgstr "Nevar ielādēt spraudni “%s”" -+msgid "Fail before returning media to user: %s" -+msgstr "Neveiksme pirms lietotājs saņēmis datus — %s" -+ -+#: ../src/metadata-store/grl-metadata-store.c:47 -+msgid "Metadata Store" -+msgstr "Metadatu krātuve" -+ -+#: ../src/metadata-store/grl-metadata-store.c:48 -+msgid "A plugin for storing extra metadata information" -+msgstr "Spraudnis papildu metadatu informācijas glabāšanai" - --#: ../src/grl-registry.c:847 -+#: ../src/metadata-store/grl-metadata-store.c:573 -+#: ../src/metadata-store/grl-metadata-store.c:592 -+#: ../src/metadata-store/grl-metadata-store.c:804 -+#: ../src/tracker/grl-tracker-source-api.c:637 - #, c-format --msgid "Plugin '%s' already exists" --msgstr "Jau eksistē spraudnis “%s”" -+msgid "Failed to update metadata: %s" -+msgstr "Neizdevās atjaunināt metadatus — %s" -+ -+#: ../src/metadata-store/grl-metadata-store.c:574 -+msgid "specified keys are not writable" -+msgstr "norādītās atslēgas nav rakstāmas" -+ -+#: ../src/metadata-store/grl-metadata-store.c:614 -+msgid "Failed to update metadata" -+msgstr "Neizdevās atjaunināt metadatus" -+ -+#: ../src/metadata-store/grl-metadata-store.c:760 -+#: ../src/metadata-store/grl-metadata-store.c:805 -+msgid "\"source-id\" not available" -+msgstr "“source-id” nav pieejams" - --#: ../src/grl-registry.c:944 -+#: ../src/metadata-store/grl-metadata-store.c:780 -+msgid "Failed to resolve" -+msgstr "Neizdevās uzmeklēt" -+ -+#: ../src/metadata-store/grl-metadata-store.c:917 -+#: ../src/metadata-store/grl-metadata-store.c:954 ../src/raitv/grl-raitv.c:426 -+#: ../src/shoutcast/grl-shoutcast.c:750 ../src/vimeo/grl-vimeo.c:546 - #, c-format --msgid "All configured plugin paths are invalid" --msgstr "Visi konfigurētie spraudņa ceļi ir nederīgi" -+msgid "Failed to search: %s" -+msgstr "Neizdevās meklēt — %s" -+ -+#: ../src/opensubtitles/grl-opensubtitles.c:42 -+msgid "OpenSubtitles Provider" -+msgstr "OpenSubtitles piegādātājs" -+ -+#: ../src/opensubtitles/grl-opensubtitles.c:43 -+msgid "A source providing a list of subtitles for a video" -+msgstr "Video subtitru saraksta avots" -+ -+#: ../src/optical-media/grl-optical-media.c:46 -+msgid "Optical Media" -+msgstr "Optiskais datu nesējs" -+ -+#: ../src/optical-media/grl-optical-media.c:47 -+msgid "A source for browsing optical media" -+msgstr "Avots optisko datu nesēju pārlūkošanai" -+ -+#: ../src/pocket/grl-pocket.c:47 -+msgid "Pocket" -+msgstr "Pocket" - --#: ../src/grl-registry.c:991 -+#: ../src/pocket/grl-pocket.c:48 -+msgid "A source for browsing Pocket videos" -+msgstr "Avots Pocket video pārlūkošanai" -+ -+#: ../src/podcasts/grl-podcasts.c:155 -+msgid "A source for browsing podcasts" -+msgstr "Avots podraižu pārlūkošanai" -+ -+#: ../src/podcasts/grl-podcasts.c:757 ../src/podcasts/grl-podcasts.c:777 - #, c-format --msgid "Plugin '%s' not available" --msgstr "Nav pieejams spraudnis “%s”" -+msgid "Failed to get podcast streams: %s" -+msgstr "Neizdevās saņemt podraižu straumes — %s" -+ -+#: ../src/podcasts/grl-podcasts.c:1243 ../src/podcasts/grl-podcasts.c:1252 -+#: ../src/podcasts/grl-podcasts.c:1262 -+msgid "Failed to parse content" -+msgstr "Neizdevās analizēt saturu" - --#: ../src/grl-registry.c:1212 -+#: ../src/podcasts/grl-podcasts.c:1295 -+msgid "Failed to parse podcast contents" -+msgstr "Neizdevās analizēt podraižu saturu" -+ -+#: ../src/podcasts/grl-podcasts.c:1450 -+msgid "Failed to get podcast information" -+msgstr "Neizdevās saņemt informāciju par podraidēm" -+ -+#: ../src/podcasts/grl-podcasts.c:1490 ../src/podcasts/grl-podcasts.c:1510 - #, c-format --msgid "Plugin not found: '%s'" --msgstr "Spraudnis nav atrasts — “%s”" -+msgid "Failed to get podcasts list: %s" -+msgstr "Neizdevās saņemt grāmatzīmju sarakstu: %s" -+ -+#: ../src/podcasts/grl-podcasts.c:1563 ../src/podcasts/grl-podcasts.c:1578 -+msgid "Failed to get podcast stream metadata" -+msgstr "Neizdevās saņemt podraižu straumes metadatus" - --#: ../src/grl-registry.c:1294 -+#: ../src/podcasts/grl-podcasts.c:1616 -+msgid "Failed to get podcast metadata" -+msgstr "Neizdevās saņemt podraižu metadatus" -+ -+#: ../src/podcasts/grl-podcasts.c:1800 -+msgid "Cannot create containers. Only feeds are accepted" -+msgstr "Nevar izveidot konteinerus. Tiek pieņemtas tikai plūsmas" -+ -+#: ../src/podcasts/grl-podcasts.c:1805 -+msgid "URL required" -+msgstr "Nepieciešams URL" -+ -+#: ../src/raitv/grl-raitv.c:49 ../src/youtube/grl-youtube.c:78 -+msgid "Most Popular" -+msgstr "Vispopulārākais" -+ -+#: ../src/raitv/grl-raitv.c:52 -+msgid "Recent" -+msgstr "Nesenās" -+ -+#: ../src/raitv/grl-raitv.c:95 -+msgid "A source for browsing and searching Rai.tv videos" -+msgstr "Avots Rai.tv video pārlūkošanai un meklēšanai" -+ -+#: ../src/raitv/grl-raitv.c:173 -+msgid "All" -+msgstr "Visi" -+ -+#: ../src/raitv/grl-raitv.c:174 -+msgid "Black and White" -+msgstr "Melns un balts" -+ -+#: ../src/raitv/grl-raitv.c:175 -+msgid "Cinema" -+msgstr "Kinoteātra" -+ -+#: ../src/raitv/grl-raitv.c:176 -+msgid "Comedians" -+msgstr "Komiķi" -+ -+#: ../src/raitv/grl-raitv.c:177 -+msgid "Chronicle" -+msgstr "Hronikas" -+ -+#: ../src/raitv/grl-raitv.c:178 -+msgid "Culture" -+msgstr "Kultūra" -+ -+#: ../src/raitv/grl-raitv.c:179 -+msgid "Economy" -+msgstr "Ekonomika" -+ -+#: ../src/raitv/grl-raitv.c:180 -+msgid "Fiction" -+msgstr "Daiļliteratūra" -+ -+#: ../src/raitv/grl-raitv.c:181 -+msgid "Junior" -+msgstr "Bērniem" -+ -+#: ../src/raitv/grl-raitv.c:182 -+msgid "Investigations" -+msgstr "Izmeklēšanas" -+ -+#: ../src/raitv/grl-raitv.c:183 -+msgid "Interviews" -+msgstr "Intervijas" -+ -+#: ../src/raitv/grl-raitv.c:184 -+msgid "Music" -+msgstr "Mūzika" -+ -+#: ../src/raitv/grl-raitv.c:185 -+msgid "News" -+msgstr "Ziņas" -+ -+#: ../src/raitv/grl-raitv.c:186 -+msgid "Health" -+msgstr "Veselība" -+ -+#: ../src/raitv/grl-raitv.c:187 -+msgid "Satire" -+msgstr "Satīra" -+ -+#: ../src/raitv/grl-raitv.c:189 -+msgid "Society" -+msgstr "Sabiedrība" -+ -+#: ../src/raitv/grl-raitv.c:190 -+msgid "Show" -+msgstr "Rādīt" -+ -+#: ../src/raitv/grl-raitv.c:191 -+msgid "Sport" -+msgstr "Sports" -+ -+#: ../src/raitv/grl-raitv.c:192 -+msgid "History" -+msgstr "Vēsture" -+ -+#: ../src/raitv/grl-raitv.c:193 -+msgid "Politics" -+msgstr "Politika" -+ -+#: ../src/raitv/grl-raitv.c:194 -+msgid "Leisure" -+msgstr "Brīvais brīdis" -+ -+#: ../src/raitv/grl-raitv.c:195 -+msgid "Travel" -+msgstr "Ceļošana" -+ -+#: ../src/raitv/grl-raitv.c:619 - #, c-format --msgid "Metadata key '%s' cannot be registered" --msgstr "Nevar reģistrēt metadatu atslēgu “%s”" -+msgid "Failed to browse: %s" -+msgstr "Neizdevās pārlūkot: %s" -+ -+#: ../src/shoutcast/grl-shoutcast.c:67 -+msgid "A source for browsing SHOUTcast radios" -+msgstr "Avots mūzikas pārlūkošanai SHOUTcast radio" - --#: ../src/grl-registry.c:1587 -+#: ../src/shoutcast/grl-shoutcast.c:456 - #, c-format --msgid "Plugin configuration does not contain 'plugin-id' reference" --msgstr "Spraudņa konfigurācija nesatur norādi “plugin-id”" -+msgid "Cannot find media %s" -+msgstr "Nevar atrast datu nesējus %s" -+ -+#: ../src/shoutcast/grl-shoutcast.c:751 ../src/vimeo/grl-vimeo.c:547 -+msgid "non-NULL search text is required" -+msgstr "Nepieciešams ne NULL meklēšanas teksts" -+ -+#: ../src/thetvdb/grl-thetvdb.c:97 -+msgid "A source for fetching metadata of television shows" -+msgstr "Avots televīzijas šovu metadatu saņemšanai" -+ -+#: ../src/tmdb/grl-tmdb.c:996 -+msgid "Remote data does not contain valid identifier" -+msgstr "Attālinātie dati nesatur derīgu identifikatoru" -+ -+#. I can haz templatze ?? -+#. Only emit this last one if more result than expected -+#. Schedule the next line to parse -+#: ../src/tracker/grl-tracker-source-api.c:398 -+#: ../src/tracker/grl-tracker-source-api.c:481 -+#, c-format -+msgid "Failed to query: %s" -+msgstr "Neizdevās vaicāt: %s" - --#: ../src/grl-source.c:2633 -+#: ../src/tracker/grl-tracker-source-api.c:582 - #, c-format --msgid "Some keys could not be written" --msgstr "Nevarēja rakstīt dažas atslēgas" -+msgid "Failed to get media from uri: %s" -+msgstr "Neizdevās saņemt mediju no uri — %s" -+ -+#: ../src/tracker/grl-tracker-source-api.c:802 -+msgid "Empty query" -+msgstr "Tukšs vaicājums" -+ -+#: ../src/tracker/grl-tracker-source-priv.h:44 -+msgid "A plugin for searching multimedia content using Tracker" -+msgstr "Spraudnis, lai meklētu multimediju saturu, izmantojot Tracker" - --#: ../src/grl-source.c:2705 -+#: ../src/tracker/grl-tracker-utils.c:635 - #, c-format --msgid "None of the specified keys are writable" --msgstr "Ne visas norādītās atslēgas ir rakstāmas" -+msgid "Removable - %s" -+msgstr "Noņemams — %s" -+ -+#: ../src/tracker/grl-tracker-utils.c:647 -+msgid "Local files" -+msgstr "Vietējās datnes" -+ -+#: ../src/vimeo/grl-vimeo.c:58 -+msgid "A source for browsing and searching Vimeo videos" -+msgstr "Avots Vimeo video pārlūkošanai un meklēšanai" -+ -+#: ../src/youtube/grl-youtube.c:60 -+msgid "Standard feeds" -+msgstr "Standarta plūsmas" -+ -+#: ../src/youtube/grl-youtube.c:63 -+msgid "Categories" -+msgstr "Kategorijas" -+ -+#: ../src/youtube/grl-youtube.c:69 -+msgid "Top Rated" -+msgstr "Augstāk novērtētie" -+ -+#: ../src/youtube/grl-youtube.c:72 -+msgid "Top Favorites" -+msgstr "Topa iecienītie" - --#: ../src/grl-source.c:3997 -+#: ../src/youtube/grl-youtube.c:75 -+msgid "Most Viewed" -+msgstr "Visvairāk skatītie" -+ -+#: ../src/youtube/grl-youtube.c:81 -+msgid "Most Recent" -+msgstr "Visnesenākie" -+ -+#: ../src/youtube/grl-youtube.c:84 -+msgid "Most Discussed" -+msgstr "Visvairāk apspriestie" -+ -+#: ../src/youtube/grl-youtube.c:87 -+msgid "Most Linked" -+msgstr "Ar visvairāk saitēm" -+ -+#: ../src/youtube/grl-youtube.c:90 -+msgid "Most Responded" -+msgstr "Visvairāk atbildes" -+ -+#: ../src/youtube/grl-youtube.c:93 -+msgid "Recently Featured" -+msgstr "Nesen parādījušies" -+ -+#: ../src/youtube/grl-youtube.c:96 -+msgid "Watch On Mobile" -+msgstr "Skatīt mobilajā" -+ -+#: ../src/youtube/grl-youtube.c:117 -+msgid "A source for browsing and searching YouTube videos" -+msgstr "Avots YouTube video pārlūkošanai un meklēšanai" -+ -+#: ../src/youtube/grl-youtube.c:950 -+msgid "Failed to get feed" -+msgstr "Neizdevās saņemt plūsmu" -+ -+#: ../src/youtube/grl-youtube.c:1127 ../src/youtube/grl-youtube.c:1508 - #, c-format --msgid "Media has no 'id', cannot remove" --msgstr "Datu nesējam nav “id”, nevar izņemt" -+msgid "Invalid feed identifier %s" -+msgstr "Nederīgs plūsmas identifikators %s" -+ -+#~ msgid "A source for browsing the UPnP server '%s'" -+#~ msgstr "UPnP servera “%s” pārlūkošanas avots" -+ -+#~ msgid "Failed to browse" -+#~ msgstr "Neizdevās pārlūkot" -+ -+#~ msgid "Failed to query" -+#~ msgstr "Neizdevās vaicāt" - -+#~ msgid "Unable to listen for changes in %s" -+#~ msgstr "Neizdevās sekot līdzi %s izmaiņām" --- -2.4.0 - - -From eca9fb193d8f22b99b76f84f6171fd46e308738c Mon Sep 17 00:00:00 2001 -From: Mathieu Duponchelle -Date: Wed, 15 Apr 2015 18:13:57 +0200 -Subject: [PATCH 4/5] doc: add grl_operation_options_[set|get]_resolution_flags - to - -the sections. ---- - doc/grilo/grilo-sections.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/doc/grilo/grilo-sections.txt b/doc/grilo/grilo-sections.txt -index 68629d6..24ebf4c 100644 ---- a/doc/grilo/grilo-sections.txt -+++ b/doc/grilo/grilo-sections.txt -@@ -158,6 +158,7 @@ grl_operation_options_new - grl_operation_options_copy - grl_operation_options_get_count - grl_operation_options_get_flags -+grl_operation_options_get_resolution_flags - grl_operation_options_get_key_filter - grl_operation_options_get_key_filter_list - grl_operation_options_get_key_range_filter -@@ -167,6 +168,7 @@ grl_operation_options_get_type_filter - grl_operation_options_obey_caps - grl_operation_options_set_count - grl_operation_options_set_flags -+grl_operation_options_set_resolution_flags - grl_operation_options_set_key_filter_dictionary - grl_operation_options_set_key_filter_value - grl_operation_options_set_key_filters --- -2.4.0 - - -From 4c02c33218fe54ef6ba34b4852fca32a21d7483a Mon Sep 17 00:00:00 2001 -From: George Sedov -Date: Wed, 4 Mar 2015 17:56:32 +0300 -Subject: [PATCH 5/5] core: Add GRL_CORE_ERROR_AUTHENTICATION_TOKEN - -Add an error type for problems with authentication tokens -that require user attention, such as a VK oauth token that -requires re-login. - -https://bugzilla.gnome.org/show_bug.cgi?id=744238 ---- - src/grl-error.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/grl-error.h b/src/grl-error.h -index 8c48625..13ea3d9 100644 ---- a/src/grl-error.h -+++ b/src/grl-error.h -@@ -49,6 +49,7 @@ - * @GRL_CORE_ERROR_REGISTER_METADATA_KEY_FAILED: Failed to register metadata key - * @GRL_CORE_ERROR_NOTIFY_CHANGED_FAILED: Failed to start changed notifications - * @GRL_CORE_ERROR_OPERATION_CANCELLED: The operation was cancelled -+ * @GRL_CORE_ERROR_AUTHENTICATION_TOKEN: Invalid authentication token - * - * These constants identify all the available core errors - */ -@@ -70,7 +71,8 @@ typedef enum { - GRL_CORE_ERROR_UNLOAD_PLUGIN_FAILED, - GRL_CORE_ERROR_REGISTER_METADATA_KEY_FAILED, - GRL_CORE_ERROR_NOTIFY_CHANGED_FAILED, -- GRL_CORE_ERROR_OPERATION_CANCELLED -+ GRL_CORE_ERROR_OPERATION_CANCELLED, -+ GRL_CORE_ERROR_AUTHENTICATION_TOKEN - } GrlCoreError; - - #endif /* _GRL_ERROR_H_ */ --- -2.4.0 - diff --git a/SOURCES/grilo-0.2.12-vala-revert.patch b/SOURCES/grilo-0.2.12-vala-revert.patch deleted file mode 100644 index 09f8cfd..0000000 --- a/SOURCES/grilo-0.2.12-vala-revert.patch +++ /dev/null @@ -1,706 +0,0 @@ -From c9127ac6218c997ff2ddf250dbf5a6d5af9fd12d Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 15:45:47 +0200 -Subject: [PATCH 1/7] Revert "vala: Add some missing definitions" - -This reverts commit 78d4690dabd4fe1822ab8d610a76faa385d2e3e3. ---- - bindings/vala/grilo-0.2-custom.vala | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/bindings/vala/grilo-0.2-custom.vala b/bindings/vala/grilo-0.2-custom.vala -index d045526..4e075e9 100644 ---- a/bindings/vala/grilo-0.2-custom.vala -+++ b/bindings/vala/grilo-0.2-custom.vala -@@ -112,12 +112,6 @@ namespace Grl { - [CCode (cname ="GRL_METADATA_KEY_AUDIO_TRACK")] - public static Grl.KeyID AUDIO_TRACK; - -- [CCode (cname ="GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN")] -- public static uint CHILDCOUNT_UNKNOWN; -- -- [CCode (cname ="GRL_SOURCE_REMAINING_UNKNOWN")] -- public static uint REMAINING_UNKNOWN; -- - public static GLib.List list_new (Grl.KeyID p, ...); - } - } --- -2.4.0 - - -From 62845c257f736472c7bba9043e6ad04c435f4f32 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 15:46:56 +0200 -Subject: [PATCH 2/7] Revert "build: fix distcheck for Vala" - -This reverts commit 76eafa8194c4563190cbfe6cd058c02576e8c7f4. ---- - bindings/vala/Makefile.am | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am -index acb859c..bb494be 100644 ---- a/bindings/vala/Makefile.am -+++ b/bindings/vala/Makefile.am -@@ -1,5 +1,4 @@ - EXTRA_DIST = --CLEANFILES = - - if ENABLE_VAPIGEN - -include $(VAPIGEN_MAKEFILE) -@@ -12,7 +11,7 @@ grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 - grilo_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) - grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir - --EXTRA_DIST += Grl-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo-@GRL_MAJORMINOR@-custom.vala -+EXTRA_DIST += grilo-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo-@GRL_MAJORMINOR@-custom.vala - - grilo-net-@GRL_MAJORMINOR@.vapi: $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir grilo-net-@GRL_MAJORMINOR@-custom.vala grilo-net-@GRL_MAJORMINOR@.deps GrlNet-@GRL_MAJORMINOR@.metadata - -@@ -25,8 +24,6 @@ EXTRA_DIST += GrlNet-@GRL_MAJORMINOR@.metadata grilo-net-@GRL_MAJORMINOR@.deps g - vapidir = $(datadir)/vala/vapi - vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) - --CLEANFILES += $(vapi_DATA) -- - endif - - -include $(top_srcdir)/git.mk --- -2.4.0 - - -From d58512af408ad8e1de508b4c22a57a00f0d36bd7 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 15:48:30 +0200 -Subject: [PATCH 3/7] Revert "build: Add vapigen.m4 file" - -This reverts commit 7a7ccfc43d558e5b6f425498fd8be9d2664eabd0. ---- - m4/vapigen.m4 | 101 ---------------------------------------------------------- - 1 file changed, 101 deletions(-) - delete mode 100644 m4/vapigen.m4 - -diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 -deleted file mode 100644 -index 2c435e7..0000000 ---- a/m4/vapigen.m4 -+++ /dev/null -@@ -1,101 +0,0 @@ --dnl vapigen.m4 --dnl --dnl Copyright 2012 Evan Nemerson --dnl --dnl This library is free software; you can redistribute it and/or --dnl modify it under the terms of the GNU Lesser General Public --dnl License as published by the Free Software Foundation; either --dnl version 2.1 of the License, or (at your option) any later version. --dnl --dnl This library is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY; without even the implied warranty of --dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --dnl Lesser General Public License for more details. --dnl --dnl You should have received a copy of the GNU Lesser General Public --dnl License along with this library; if not, write to the Free Software --dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -- --# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT]) --# -------------------------------------- --# Check vapigen existence and version --# --# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation --AC_DEFUN([VAPIGEN_CHECK], --[ -- AS_IF([test "x$3" != "xyes"], [ -- m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [ -- m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [ -- AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]]) -- ]) -- ]) -- ]) -- -- AC_ARG_ENABLE([vala], -- [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ -- AS_IF([test "x$4" = "x"], [ -- enable_vala=auto -- ], [ -- enable_vala=$4 -- ]) -- ]) -- -- AS_CASE([$enable_vala], [no], [enable_vala=no], -- [yes], [ -- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ -- AC_MSG_ERROR([Vala bindings require GObject Introspection]) -- ]) -- ], [auto], [ -- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ -- enable_vala=no -- ]) -- ], [ -- AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) -- ]) -- -- AS_IF([test "x$2" = "x"], [ -- vapigen_pkg_name=vapigen -- ], [ -- vapigen_pkg_name=vapigen-$2 -- ]) -- AS_IF([test "x$1" = "x"], [ -- vapigen_pkg="$vapigen_pkg_name" -- ], [ -- vapigen_pkg="$vapigen_pkg_name >= $1" -- ]) -- -- PKG_PROG_PKG_CONFIG -- -- PKG_CHECK_EXISTS([$vapigen_pkg], [ -- AS_IF([test "$enable_vala" = "auto"], [ -- enable_vala=yes -- ]) -- ], [ -- AS_CASE([$enable_vala], [yes], [ -- AC_MSG_ERROR([$vapigen_pkg not found]) -- ], [auto], [ -- enable_vala=no -- ]) -- ]) -- -- AC_MSG_CHECKING([for vapigen]) -- -- AS_CASE([$enable_vala], -- [yes], [ -- VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` -- VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen -- AS_IF([test "x$2" = "x"], [ -- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` -- ], [ -- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` -- ]) -- ]) -- -- AC_MSG_RESULT([$enable_vala]) -- -- AC_SUBST([VAPIGEN]) -- AC_SUBST([VAPIGEN_VAPIDIR]) -- AC_SUBST([VAPIGEN_MAKEFILE]) -- -- AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") --]) --- -2.4.0 - - -From 010af674f7e32d22aed070e78fe84c5f7f4c5510 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 15:49:21 +0200 -Subject: [PATCH 4/7] Revert "build-sys: fix out-of-tree build of vapi" - -This reverts commit 8a583607a59395958169dbd2230ab39b90d59e81. ---- - bindings/vala/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am -index bb494be..abcef6b 100644 ---- a/bindings/vala/Makefile.am -+++ b/bindings/vala/Makefile.am -@@ -9,7 +9,7 @@ grilo-@GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir grilo- - - grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 - grilo_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) --grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir -+grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir - - EXTRA_DIST += grilo-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo-@GRL_MAJORMINOR@-custom.vala - -@@ -17,7 +17,7 @@ grilo-net-@GRL_MAJORMINOR@.vapi: $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINO - - grilo_net_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 - grilo_net_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) --grilo_net_@GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-net-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir -+grilo_net_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-net-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir - - EXTRA_DIST += GrlNet-@GRL_MAJORMINOR@.metadata grilo-net-@GRL_MAJORMINOR@.deps grilo-net-@GRL_MAJORMINOR@-custom.vala - --- -2.4.0 - - -From f5375ed920981265477b6034b7fcdda43846c9f3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 15:50:58 +0200 -Subject: [PATCH 5/7] Revert "build-sys: fix gio-2.0 gir bindings errors" - -This reverts commit c760d284acad86bb6f60af711af7d079052832f7. ---- - bindings/vala/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am -index abcef6b..77947ac 100644 ---- a/bindings/vala/Makefile.am -+++ b/bindings/vala/Makefile.am -@@ -7,7 +7,7 @@ VAPIGEN_VAPIS = grilo-@GRL_MAJORMINOR@.vapi grilo-net-@GRL_MAJORMINOR@.vapi - - grilo-@GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir grilo-@GRL_MAJORMINOR@-custom.vala grilo-@GRL_MAJORMINOR@.deps Grl-@GRL_MAJORMINOR@.metadata - --grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 -+grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = - grilo_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) - grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir - -@@ -15,7 +15,7 @@ EXTRA_DIST += grilo-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo- - - grilo-net-@GRL_MAJORMINOR@.vapi: $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir grilo-net-@GRL_MAJORMINOR@-custom.vala grilo-net-@GRL_MAJORMINOR@.deps GrlNet-@GRL_MAJORMINOR@.metadata - --grilo_net_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 -+grilo_net_@GRL_MAJORMINOR_NORM@_vapi_DEPS = - grilo_net_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) - grilo_net_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-net-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir - --- -2.4.0 - - -From 7d34bd88a20b90a6eca14743eddae3ff9f689625 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 16:18:21 +0200 -Subject: [PATCH 6/7] Revert "build: Require vala 0.27" - -This reverts commit f48941d8e38cace3f709c78a2609c30d2693d998. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a7e45a1..7c845e0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -258,7 +258,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9]) - # VALA BINDINGS - # ---------------------------------------------------------- - --VAPIGEN_CHECK([0.27]) -+VAPIGEN_CHECK([0.26]) - - # ---------------------------------------------------------- - # GETTEXT/INTLTOOL --- -2.4.0 - - -From 98b94d97697bc63bdb16a64ed74da0d1f95bfc26 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 4 May 2015 16:18:29 +0200 -Subject: [PATCH 7/7] Revert "vala: modernize bindings generation" - -This reverts commit 689bf702cb3d264cca9b1a689d6237f611ad3407. ---- - bindings/Makefile.am | 6 +- - bindings/vala/Grl-0.2.metadata | 15 ----- - bindings/vala/GrlNet-0.2.metadata | 3 - - bindings/vala/Makefile.am | 83 +++++++++++++++++++----- - bindings/vala/grilo-0.2-custom.vala | 17 ++++- - bindings/vala/grilo-0.2.metadata | 58 +++++++++++++++++ - bindings/vala/grilo-net-0.2.metadata | 6 ++ - bindings/vala/grilo-net-uninstalled.files.in | 2 + - bindings/vala/grilo-net-uninstalled.namespace.in | 1 + - bindings/vala/grilo-uninstalled.defines | 1 + - bindings/vala/grilo-uninstalled.files.in | 13 ++++ - bindings/vala/grilo-uninstalled.namespace.in | 1 + - configure.ac | 49 ++++++++++++-- - 13 files changed, 211 insertions(+), 44 deletions(-) - delete mode 100644 bindings/vala/Grl-0.2.metadata - delete mode 100644 bindings/vala/GrlNet-0.2.metadata - create mode 100644 bindings/vala/grilo-0.2.metadata - create mode 100644 bindings/vala/grilo-net-0.2.metadata - create mode 100644 bindings/vala/grilo-net-uninstalled.files.in - create mode 100644 bindings/vala/grilo-net-uninstalled.namespace.in - create mode 100644 bindings/vala/grilo-uninstalled.defines - create mode 100644 bindings/vala/grilo-uninstalled.files.in - create mode 100644 bindings/vala/grilo-uninstalled.namespace.in - -diff --git a/bindings/Makefile.am b/bindings/Makefile.am -index 86de8f0..50c92aa 100644 ---- a/bindings/Makefile.am -+++ b/bindings/Makefile.am -@@ -1,3 +1,7 @@ --SUBDIRS = vala -+SUBDIRS = -+ -+if HAVE_VALA -+SUBDIRS += vala -+endif - - -include $(top_srcdir)/git.mk -diff --git a/bindings/vala/Grl-0.2.metadata b/bindings/vala/Grl-0.2.metadata -deleted file mode 100644 -index c59ffd8..0000000 ---- a/bindings/vala/Grl-0.2.metadata -+++ /dev/null -@@ -1,15 +0,0 @@ --// vapigen has issues with the callbacks --PluginDescriptor skip=true -- --Source.browse#method name="do_browse" --Source.query#method name="do_query" --Source.remove#method name="do_remove" --Source.resolve#method name="do_resolve" --Source.search#method name="do_search" --Source.store#method name="do_store" --Source.store_metadata#method name="do_store_metadata" --Source.supported_operations#method name="get_supported_operations" --*.callback delegate_target_cname="user_data" -- -- --SourceStoreSpec.user_data type="string" -\ No newline at end of file -diff --git a/bindings/vala/GrlNet-0.2.metadata b/bindings/vala/GrlNet-0.2.metadata -deleted file mode 100644 -index 73465ad..0000000 ---- a/bindings/vala/GrlNet-0.2.metadata -+++ /dev/null -@@ -1,3 +0,0 @@ --Wc.request_with_headers_hash_async finish_name="grl_net_wc_request_finish" --Wc.request_with_headers_async skip=false --Wc.request_with_headers_async finish_name="grl_net_wc_request_finish" -diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am -index 77947ac..8c0fffe 100644 ---- a/bindings/vala/Makefile.am -+++ b/bindings/vala/Makefile.am -@@ -1,29 +1,78 @@ --EXTRA_DIST = -+# This Makefile is a tad convoluted. I've tried to make it so that the vapi -+# can be built at the same time as the library in the hope that this will make -+# it easier to keep it up-to-date. -+# -+# The vapi is generated in 2 steps: -+# -+# vala-gen-introspect looks at headers and libs and generates a gidl for the -+# library. It takes a .files file containing paths to these. It also takes a -+# .namespace file containing the Vala namespace corresponding to this -+# library. Both these files are expected to be in the directory where you run -+# vala-gen-introspect. -+# -+# vapigen takes the gidl, a .deps file containing the list of libs needed -+# to link this library, and a .metadata file containing annotations to the -+# gidl (e.g. foo() is the free function for object X). -+# -+# vala-gen-introspect runs with the -uninstalled .pc file. The .files is -+# generated so that it has links to the headers and libraries from the source -+# and build trees. The .namespace file is generated, though it doesn't need -+# to be, so that it exists in the build tree where vala-gen-introspect is run -+# (because this may not be the same as the source tree). Since we're working -+# with the -uninstalled files, and vala-gen-introspect assumes filenames are -+# named as ., all the associated file names have an -+# -uninstalled suffix. -+# -+# Running vapigen is simpler. It generates a the .vapi file using the gidl -+# file from vala-gen-introspect. Since we want the final files to be in the -+# form -.*, we use the same convention for naming the files -+# associated with this step (contrast with the -uninstalled suffix for the -+# vala-gen-introspect step). The only file implicitly used by vapigen is the -+# .deps file, so to make the build independent of a split source/build tree, -+# I've put the deps on the vapigen command-line (it's redundant, but helps -+# with distcheck). -+# - --if ENABLE_VAPIGEN ---include $(VAPIGEN_MAKEFILE) -+targets = grilo-@GRL_MAJORMINOR@ - --VAPIGEN_VAPIS = grilo-@GRL_MAJORMINOR@.vapi grilo-net-@GRL_MAJORMINOR@.vapi -+if BUILD_GRILO_NET -+targets += grilo-net-@GRL_MAJORMINOR@ -+endif -+ -+targets_u = $(foreach target,$(targets),$(subst @GRL_MAJORMINOR@,uninstalled,$(target))) - --grilo-@GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir grilo-@GRL_MAJORMINOR@-custom.vala grilo-@GRL_MAJORMINOR@.deps Grl-@GRL_MAJORMINOR@.metadata -+# "source" files for vala-gen-introspect -+filesfiles_src = $(foreach target,$(targets_u),$(target).files.in) -+filesfiles = $(foreach target,$(targets_u),$(target).files) -+nsfiles_src = $(foreach target,$(targets_u),$(target).namespace.in) -+nsfiles = $(foreach target,$(targets_u),$(target).namespace) - --grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = --grilo_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) --grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir -+# "source" files for vapigen -+depsfiles = $(foreach target,$(targets),$(target).deps) -+gifiles = $(foreach target,$(targets),$(target).gi) -+metadatafiles = $(foreach target,$(targets),$(target).metadata) - --EXTRA_DIST += grilo-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo-@GRL_MAJORMINOR@-custom.vala -+vapidir = $(datadir)/vala/vapi - --grilo-net-@GRL_MAJORMINOR@.vapi: $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir grilo-net-@GRL_MAJORMINOR@-custom.vala grilo-net-@GRL_MAJORMINOR@.deps GrlNet-@GRL_MAJORMINOR@.metadata -+if HAVE_VALA -+vapifiles = $(foreach target,$(targets),$(target).vapi) -+vapi_DATA = $(depsfiles) $(vapifiles) -+endif - --grilo_net_@GRL_MAJORMINOR_NORM@_vapi_DEPS = --grilo_net_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) --grilo_net_@GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-net-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir -+%-@GRL_MAJORMINOR@.gi: %-uninstalled.files %-uninstalled.namespace -+ PKG_CONFIG_PATH=$(top_builddir)/:${PKG_CONFIG_PATH} \ -+ $(VALA_GEN_INTROSPECT) $*-uninstalled . -+ @mv $*-uninstalled.gi $*-@GRL_MAJORMINOR@.gi - --EXTRA_DIST += GrlNet-@GRL_MAJORMINOR@.metadata grilo-net-@GRL_MAJORMINOR@.deps grilo-net-@GRL_MAJORMINOR@-custom.vala -+%.vapi: %.gi %.metadata %-custom.vala -+ $(VAPIGEN) --library $* \ -+ $(top_srcdir)/bindings/vala/$*.metadata $*.gi \ -+ $*-custom.vala - --vapidir = $(datadir)/vala/vapi --vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) -+all: $(vapifiles) - --endif -+EXTRA_DIST = $(depsfiles) $(filesfiles_src) $(nsfiles_src) $(metadatafiles) $(vapifiles) -+CLEANFILES = $(gifiles) -+DISTCLEANFILES = $(vapifiles) $(filesfiles) $(nsfiles) - - -include $(top_srcdir)/git.mk -diff --git a/bindings/vala/grilo-0.2-custom.vala b/bindings/vala/grilo-0.2-custom.vala -index 4e075e9..1d13da3 100644 ---- a/bindings/vala/grilo-0.2-custom.vala -+++ b/bindings/vala/grilo-0.2-custom.vala -@@ -1,6 +1,19 @@ - namespace Grl { -+ [CCode (instance_pos = 3.1)] -+ public delegate void SourceResolveCb (Grl.Source source, uint operation_id, Grl.Media? media, GLib.Error error); -+ [CCode (instance_pos = 2.1)] -+ public delegate void SourceRemoveCb (Grl.Source source, Grl.Media? media, GLib.Error error); -+ [CCode (instance_pos = 4.1)] -+ public delegate void SourceResultCb (Grl.Source source, uint operation_id, Grl.Media? media, uint remaining, GLib.Error? error); -+ [CCode (instance_pos = 3.1)] -+ public delegate void SourceStoreCb (Grl.Source source, Grl.MediaBox? parent, Grl.Media? media, GLib.Error? error); - -- public struct MetadataKey { -+ [SimpleType] -+ public struct KeyID { -+ } -+ -+ [Compact] -+ public class MetadataKey { - [CCode (cname ="GRL_METADATA_KEY_INVALID")] - public static Grl.KeyID INVALID; - [CCode (cname ="GRL_METADATA_KEY_ALBUM")] -@@ -112,6 +125,6 @@ namespace Grl { - [CCode (cname ="GRL_METADATA_KEY_AUDIO_TRACK")] - public static Grl.KeyID AUDIO_TRACK; - -- public static GLib.List list_new (Grl.KeyID p, ...); -+ public static unowned GLib.List list_new (Grl.KeyID p, ...); - } - } -diff --git a/bindings/vala/grilo-0.2.metadata b/bindings/vala/grilo-0.2.metadata -new file mode 100644 -index 0000000..98ef88a ---- /dev/null -+++ b/bindings/vala/grilo-0.2.metadata -@@ -0,0 +1,58 @@ -+# Grilo library -+Grl cprefix="Grl" lower_case_cprefix="grl_" cheader_filename="grilo.h" -+ -+# GrlConfig -+grl_config_new.source nullable="1" -+ -+# GrlRegistry -+grl_registry_add_config.config transfer_ownership="1" -+grl_registry_get_metadata_keys type_arguments="unowned KeyID" transfer_ownership="1" -+grl_registry_get_sources type_arguments="unowned Plugin" transfer_ownership="1" -+grl_registry_get_sources_by_operations type_arguments="unowned Plugin" transfer_ownership="1" -+ -+# GrlPlugin -+grl_plugin_get_info_keys type_arguments="unowned string" transfer_ownership="1" -+ -+# GrlSource -+grl_source_slow_keys type_arguments="unowned KeyID" transfer_ownership="0" -+grl_source_supported_keys type_arguments="unowned KeyID" transfer_ownership="0" -+grl_source_writable_keys type_arguments="unowned KeyID" transfer_ownership="0" -+grl_source_browse.container nullable="1" -+grl_source_browse.keys type_arguments="KeyID" -+grl_source_browse_sync type_arguments="Media" transfer_ownership="1" -+grl_source_browse_sync.keys type_arguments="KeyID" -+grl_source_query.keys type_arguments="KeyID" -+grl_source_query_sync type_arguments="Media" transfer_ownership="1" -+grl_source_query_sync.keys type_arguments="KeyID" -+grl_source_search.keys type_arguments="KeyID" -+grl_source_search_sync type_arguments="Media" transfer_ownership="1" -+grl_source_search_sync.keys type_arguments="KeyID" -+grl_source_may_resolve.missing_keys type_arguments="unowned KeyID" is_out="1" transfer_ownership="1" -+grl_source_resolve.keys type_arguments="KeyID" -+grl_source_resolve_sync.keys type_arguments="KeyID" -+grl_source_store_metadata.keys type_arguments="KeyID" -+grl_source_set_metadata_sync.keys type_arguments="KeyID" -+grl_source_key_depends type_arguments="unowned KeyID" transfer_ownership="0" -+ -+# GrlOperationOptions -+grl_operation_options_new.caps nullable="1" -+ -+# GrlData -+grl_data_get_keys type_arguments="unowned KeyID" transfer_ownership="1" -+ -+# Error domain -+GrlCoreError errordomain="1" -+ -+# Callbacks -+GrlSourceRemoveCb hidden="1" -+GrlSourceResultCb hidden="1" -+GrlSourceStoreCb hidden="1" -+GrlSourceStoreMetadataCb hidden="1" -+GrlSourceResolveCb hidden="1" -+ -+# Util -+grl_list_from_va ellipsis="1" -+ -+# Grilo -+grl_init.argc hidden="1" -+grl_init.argv is_array="1" is_ref="1" array_length_pos="0.9" -diff --git a/bindings/vala/grilo-net-0.2.metadata b/bindings/vala/grilo-net-0.2.metadata -new file mode 100644 -index 0000000..3552012 ---- /dev/null -+++ b/bindings/vala/grilo-net-0.2.metadata -@@ -0,0 +1,6 @@ -+# Grilo Net library -+GrlNet cprefix="GrlNet" lower_case_cprefix="grl_net_" cheader_filename="net/grl-net.h" -+ -+# GrlNetWc -+grl_net_wc_request_*.content transfer_ownership="0" is_out="1" -+grl_net_wc_request_*.length nullable="1" is_out="1" default_value="null" -diff --git a/bindings/vala/grilo-net-uninstalled.files.in b/bindings/vala/grilo-net-uninstalled.files.in -new file mode 100644 -index 0000000..b857dbe ---- /dev/null -+++ b/bindings/vala/grilo-net-uninstalled.files.in -@@ -0,0 +1,2 @@ -+@top_builddir@/libs/net/grl-net.h -+@top_builddir@/libs/net/.libs/libgrlnet-0.2.so -diff --git a/bindings/vala/grilo-net-uninstalled.namespace.in b/bindings/vala/grilo-net-uninstalled.namespace.in -new file mode 100644 -index 0000000..6430318 ---- /dev/null -+++ b/bindings/vala/grilo-net-uninstalled.namespace.in -@@ -0,0 +1 @@ -+GrlNet -diff --git a/bindings/vala/grilo-uninstalled.defines b/bindings/vala/grilo-uninstalled.defines -new file mode 100644 -index 0000000..3bb8068 ---- /dev/null -+++ b/bindings/vala/grilo-uninstalled.defines -@@ -0,0 +1 @@ -+-DGRILO_COMPILATION -diff --git a/bindings/vala/grilo-uninstalled.files.in b/bindings/vala/grilo-uninstalled.files.in -new file mode 100644 -index 0000000..7c8a334 ---- /dev/null -+++ b/bindings/vala/grilo-uninstalled.files.in -@@ -0,0 +1,13 @@ -+@top_builddir@/src/grilo.h -+@top_builddir@/src/grl-error.h -+@top_builddir@/src/grl-log.h -+@top_builddir@/src/grl-plugin.h -+@top_builddir@/src/grl-source.h -+ -+@top_builddir@/src/grl-caps.h -+@top_builddir@/src/grl-operation-options.h -+@top_builddir@/src/grl-multiple.h -+@top_builddir@/src/grl-registry.h -+@top_builddir@/src/grl-util.h -+@top_builddir@/src/data/ -+@top_builddir@/src/.libs/libgrilo-0.2.so -diff --git a/bindings/vala/grilo-uninstalled.namespace.in b/bindings/vala/grilo-uninstalled.namespace.in -new file mode 100644 -index 0000000..a83f898 ---- /dev/null -+++ b/bindings/vala/grilo-uninstalled.namespace.in -@@ -0,0 +1 @@ -+Grl -diff --git a/configure.ac b/configure.ac -index 7c845e0..c3e2ae5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -243,22 +243,55 @@ AC_ARG_ENABLE([tests], - AM_CONDITIONAL(ENABLE_TESTS, test "enable_tests" = "xyes") - - # ---------------------------------------------------------- --# GTK-DOC -+# VALA BINDINGS - # ---------------------------------------------------------- - --GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) -+AC_PATH_PROG([VALAC], [valac]) -+AC_PATH_PROG([VALA_GEN_INTROSPECT], [vala-gen-introspect]) -+AC_PATH_PROG([VAPIGEN], [vapigen]) -+ -+AC_ARG_ENABLE([vala], -+ AS_HELP_STRING([--enable-vala], -+ [Enable Vala plugin support (default: auto)]), -+ [ -+ case "$enableval" in -+ yes) -+ if test "x$VALAC" = "x"; then -+ AC_MSG_ERROR([valac not found, install it or use --disable-vala]) -+ fi -+ if test "x$VALA_GEN_INTROSPECT" = "x"; then -+ AC_MSG_ERROR([vala-gen-introspect not found, install it or use --disable-vala]) -+ fi -+ if test "x$VAPIGEN" = "x"; then -+ AC_MSG_ERROR([vapigen not found, install it or use --disable-vala]) -+ fi -+ ;; -+ no) -+ enable_vala=no -+ ;; -+ esac -+ ], -+ [ -+ if test "x$VALAC" != "x" -a "x$VALA_GEN_INTROSPECT" != "x" -a "x$VAPIGEN" != "x"; then -+ enable_vala=yes -+ else -+ enable_vala=no -+ fi -+ ]) -+ -+AM_CONDITIONAL([HAVE_VALA], [test "x$enable_vala" = "xyes"]) - - # ---------------------------------------------------------- --# GOBJECT-INTROSPECTION -+# GTK-DOC - # ---------------------------------------------------------- - --GOBJECT_INTROSPECTION_CHECK([0.9]) -+GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) - - # ---------------------------------------------------------- --# VALA BINDINGS -+# GOBJECT-INTROSPECTION - # ---------------------------------------------------------- - --VAPIGEN_CHECK([0.26]) -+GOBJECT_INTROSPECTION_CHECK([0.9]) - - # ---------------------------------------------------------- - # GETTEXT/INTLTOOL -@@ -307,6 +340,10 @@ AC_CONFIG_FILES([ - tools/grilo-launch/Makefile - bindings/Makefile - bindings/vala/Makefile -+ bindings/vala/grilo-uninstalled.files -+ bindings/vala/grilo-uninstalled.namespace -+ bindings/vala/grilo-net-uninstalled.files -+ bindings/vala/grilo-net-uninstalled.namespace - doc/Makefile - doc/grilo/Makefile - examples/Makefile --- -2.4.0 - diff --git a/SPECS/grilo.spec b/SPECS/grilo.spec index d9911f0..03510b6 100644 --- a/SPECS/grilo.spec +++ b/SPECS/grilo.spec @@ -2,19 +2,18 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: grilo -Version: 0.2.12 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Content discovery framework -Group: Applications/Multimedia License: LGPLv2+ -Source0: http://ftp.gnome.org/pub/GNOME/sources/grilo/%{release_version}/grilo-%{version}.tar.xz -Url: http://live.gnome.org/Grilo +URL: https://wiki.gnome.org/Projects/Grilo +Source0: https://download.gnome.org/sources/grilo/%{release_version}/grilo-%{version}.tar.xz BuildRequires: chrpath BuildRequires: gnome-common -BuildRequires: vala-devel >= 0.7.2 -BuildRequires: vala-tools >= 0.7.2 +BuildRequires: intltool +BuildRequires: vala >= 0.27.1 BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel >= 0.9.0 BuildRequires: libxml2-devel @@ -25,12 +24,6 @@ BuildRequires: gtk3-devel BuildRequires: liboauth-devel BuildRequires: totem-pl-parser-devel -Requires: gobject-introspection - -BuildRequires: autoconf automake libtool gnome-common -Patch0: grilo-0.2.12-vala-revert.patch -Patch1: grilo-0.2.12-pre.patch - %description Grilo is a framework that provides access to different sources of multimedia content, using a pluggable system. @@ -38,10 +31,10 @@ This package contains the core library and elements. %package devel Summary: Libraries/include files for Grilo framework -Group: Development/Libraries - -Requires: %{name} = %{version}-%{release} -Requires: glib2-devel gobject-introspection-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +# Provide upgrade path for -vala subpackage that was merged into -devel during +# the F23 cycle +Obsoletes: grilo-vala < 0.2.13 %description devel Grilo is a framework that provides access to different sources of @@ -49,25 +42,10 @@ multimedia content, using a pluggable system. This package contains the core library and elements, as well as general and API documentation. -%package vala -Summary: Vala language bindings for Grilo framework -Group: Development/Libraries - -Requires: %{name}-devel = %{version}-%{release} -Requires: vala >= 0.7.2 - -%description vala -Grilo is a framework that provides access to different sources of -multimedia content, using a pluggable system. -This package contains the Vala language bindings. - %prep %setup -q -%patch0 -p1 -b .vala-revert -%patch1 -p1 -b .bug-fixes %build -autoreconf -f %configure \ --enable-vala \ --enable-gtk-doc \ @@ -79,7 +57,7 @@ autoreconf -f make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install mkdir -p $RPM_BUILD_ROOT%{_libdir}/grilo-%{release_version}/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/grilo-%{release_version}/plugins/ @@ -102,29 +80,32 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist %postun -p /sbin/ldconfig %files -f grilo.lang -%doc AUTHORS COPYING NEWS README TODO +%license COPYING +%doc AUTHORS NEWS README TODO %{_libdir}/*.so.* -%{_libdir}/girepository-1.0/*.typelib +%{_libdir}/girepository-1.0/ %{_bindir}/grl-inspect-%{release_version} %{_bindir}/grl-launch-%{release_version} %{_bindir}/grilo-test-ui-%{release_version} %{_libdir}/grilo-%{release_version}/ -%{_datadir}/grilo-%{release_version}/plugins/ -%{_mandir}/man1/*.1.gz +%{_datadir}/grilo-%{release_version}/ +%{_mandir}/man1/grilo-test-ui-%{release_version}.1* +%{_mandir}/man1/grl-inspect-%{release_version}.1* +%{_mandir}/man1/grl-launch-%{release_version}.1* %files devel -%doc AUTHORS COPYING NEWS README TODO %{_datadir}/gtk-doc/html/%{name} %{_includedir}/%{name}-%{release_version}/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_datadir}/gir-1.0/*.gir - -%files vala -%doc AUTHORS COPYING NEWS README TODO -%{_datadir}/vala/vapi/* +%{_datadir}/gir-1.0/ +%{_datadir}/vala/ %changelog +* Tue Feb 14 2017 Kalev Lember - 0.3.3-1 +- Update to 0.3.3 +- Resolves: #1386974 + * Tue May 12 2015 Bastien Nocera 0.2.12-2 - Rebuild for newer totem-pl-parser Related: #1174535