[gnome-music/sam/grilo-subproject: 3/3] build: Allow building grilo and grilo-plugins as Meson subprojects

[Marinus Schraal <mschraal src gnome org>]

commit 00197556ec8fa3777b8da26328bf184e2ca264b0
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Oct 6 21:05:35 2019 +0200

    build: Allow building grilo and grilo-plugins as Meson subprojects
    
    This change makes it easier to build and test gnome-music on systems
    which have old versions of Grilo installed. Meson will now automatically
    clone and build the latest Git versions of grilo and grilo-plugins if
    the system-installed versions are too old.
    
    Distributors can disable this behaviour by passing
    `--wrap-mode=nodownload` at configure time.

 .gitignore                     | 1 -
 meson.build                    | 4 ++--
 subprojects/.gitignore         | 1 +
 subprojects/grilo-plugins.wrap | 4 ++++
 subprojects/grilo.wrap         | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97154a82..cbbcb9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *~
 builddir/
-subprojects/
 /*.bak
 /*.lo
 /*.o
diff --git a/meson.build b/meson.build
index bb147bdc..46da0f58 100644
--- a/meson.build
+++ b/meson.build
@@ -45,8 +45,8 @@ dependency('libsoup-2.4')
 dependency('tracker-sparql-2.0', version: '>= 2.3.0')
 dependency('pygobject-3.0', version: '>= 3.29.1')
 dependency('py3cairo', version: '>= 1.14.0')
-dependency('grilo-0.3', version: '>= 0.3.9')
-dependency('grilo-plugins-0.3', version: '>= 0.3.10')
+dependency('grilo-0.3', version: '>= 0.3.9', fallback: ['grilo', 'libgrl_dep'])
+dependency('grilo-plugins-0.3', version: '>= 0.3.10', fallback: ['grilo-plugins', 'grilo_plugins_dep'])
 
 subproject('libgd',
     default_options: [
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
new file mode 100644
index 00000000..355164c1
--- /dev/null
+++ b/subprojects/.gitignore
@@ -0,0 +1 @@
+*/
diff --git a/subprojects/grilo-plugins.wrap b/subprojects/grilo-plugins.wrap
new file mode 100644
index 00000000..88ab98a6
--- /dev/null
+++ b/subprojects/grilo-plugins.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = grilo-plugins
+url = https://gitlab.gnome.org/GNOME/grilo-plugins.git
+revision = head
diff --git a/subprojects/grilo.wrap b/subprojects/grilo.wrap
new file mode 100644
index 00000000..ca4e8905
--- /dev/null
+++ b/subprojects/grilo.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = grilo
+url = https://gitlab.gnome.org/GNOME/grilo.git
+revision = head