[grilo-plugins/sam/grilo-subproject: 4/5] build: Allow building grilo as a Meson subproject



commit 34d3c5844864f0d00d7a565285840cde0943d03e
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Sep 29 16:56:26 2019 +0200

    build: Allow building grilo as a Meson subproject
    
    If a new enough version of Grilo isn't installed when trying to build
    grilo-plugins, Meson will now automatically clone the repo from Gitlab
    and build that.
    
    This can be disabled with the `--wrap-mode=nodownload` configure time
    option.
    
    Depends on: https://gitlab.gnome.org/GNOME/grilo/merge_requests/50
    and https://gitlab.gnome.org/GNOME/grilo/merge_requests/51

 meson.build            | 9 ++++++---
 subprojects/grilo.wrap | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index f0fd5142..5efbeebc 100644
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,8 @@ grilo_required_info = '>= @0@'.format(grilo_required)
 glib_dep = dependency('glib-2.0', version: glib2_required_info, required: true)
 gmodule_dep = dependency('gmodule-2.0', version: glib2_required_info, required: true)
 gobject_dep = dependency('gobject-2.0', version: glib2_required_info, required: true)
-grilo_dep = dependency('grilo-0.3', version: grilo_required_info, required: true)
+grilo_dep = dependency('grilo-0.3', version: grilo_required_info, required: true,
+                       fallback: ['grilo', 'libgrl_dep'])
 
 pkgconf = configuration_data()
 pkgconf.set('VERSION', plugin_version)
@@ -53,8 +54,10 @@ gio_dep = dependency('gio-2.0', required: false)
 gio_unix_dep = dependency('gio-unix-2.0', required: false)
 goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false)
 gom_dep = dependency('gom-1.0', version: '>= 0.3.2', required: false)
-grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false)
-grilo_pls_dep = dependency('grilo-pls-0.3', version: '>= 0.3.0', required: false)
+grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false,
+                           fallback: ['grilo', 'libgrlnet_dep'])
+grilo_pls_dep = dependency('grilo-pls-0.3', version: '>= 0.3.0', required: false,
+                           fallback: ['grilo', 'libgrlpls_dep'])
 gstreamer_dep = dependency('gstreamer-1.0', required: false)
 gthread_dep = dependency('gthread-2.0', required: false)
 json_glib_dep = dependency('json-glib-1.0', required: false)
diff --git a/subprojects/grilo.wrap b/subprojects/grilo.wrap
new file mode 100644
index 00000000..4dafc57c
--- /dev/null
+++ b/subprojects/grilo.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = grilo
+url = https://gitlab.gnome.org/gnome/grilo
+revision = head


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]