[totem/sam/grilo-subproject: 2/3] build: Add optional dependency on grilo-plugins
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/sam/grilo-subproject: 2/3] build: Add optional dependency on grilo-plugins
- Date: Mon, 7 Oct 2019 16:24:58 +0000 (UTC)
commit 910070912c77f69b599648e1f56de842306048fe
Author: Sam Thursfield <sam afuera me uk>
Date: Mon Oct 7 18:18:44 2019 +0200
build: Add optional dependency on grilo-plugins
Totem makes use of grilo-plugins, but didn't express a dependency on it
until now. This optional dependency means that if grilo-plugins is not
installed on the host, Meson will download and build the latest version
from Gitlab. Distributors can disable this behaviour by passing
`--wrap-mode=nodownload` at configure time.
meson.build | 4 ++++
subprojects/.gitignore | 1 +
subprojects/grilo-plugins.wrap | 4 ++++
3 files changed, 9 insertions(+)
---
diff --git a/meson.build b/meson.build
index 63c4162a2..b4835dc8d 100644
--- a/meson.build
+++ b/meson.build
@@ -144,6 +144,10 @@ totem_plparser_dep = dependency('totem-plparser', version: totem_plparser_req_ve
clutter_gtk_dep = dependency('clutter-gtk-1.0', version: '>= 1.8.1')
m_dep = cc.find_library('m', required: true)
+grilo_plugins_dep = dependency('grilo-plugins-0.3', version: grilo_req_version,
+ required: false,
+ fallback: ['grilo-plugins', 'grilo_plugins_dep'])
+
libgd = subproject(
'libgd',
default_options: [
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index a6818723e..a644f2b0b 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1 +1,2 @@
grilo/
+grilo-plugins/
diff --git a/subprojects/grilo-plugins.wrap b/subprojects/grilo-plugins.wrap
new file mode 100644
index 000000000..88ab98a68
--- /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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]