[totem/sam/grilo-subproject: 1/3] build: Allow building grilo as Meson subproject
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/sam/grilo-subproject: 1/3] build: Allow building grilo as Meson subproject
- Date: Mon, 7 Oct 2019 16:24:53 +0000 (UTC)
commit f05062c9d3e37f98c0754c3c549e62c1c0b228e8
Author: Sam Thursfield <sam afuera me uk>
Date: Mon Oct 7 18:10:48 2019 +0200
build: Allow building grilo as Meson subproject
This change makes it easier to build and test Totem on systems which
have an old version of Grilo installed. Meson will now automatically
clone and build the latest Git version of grilo if the system-installed
version is too old.
Distributors can disable this behaviour by passing
`--wrap-mode=nodownload` at configure time.
src/meson.build | 6 ++++--
subprojects/.gitignore | 1 +
subprojects/grilo.wrap | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 1ad816adf..133d7c640 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -59,8 +59,10 @@ totem_common_deps = libbacon_video_widget_deps + python_deps + [
gir_dep,
peas_dep,
peas_gtk_dep,
- dependency('grilo-0.3', version: grilo_req_version),
- dependency('grilo-pls-0.3', version: grilo_req_version),
+ dependency('grilo-0.3', version: grilo_req_version,
+ fallback: ['grilo', 'libgrl_dep']),
+ dependency('grilo-pls-0.3', version: grilo_req_version,
+ fallback: ['grilo', 'libgrlpls_dep']),
dependency('gnome-desktop-3.0')
]
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
new file mode 100644
index 000000000..a6818723e
--- /dev/null
+++ b/subprojects/.gitignore
@@ -0,0 +1 @@
+grilo/
diff --git a/subprojects/grilo.wrap b/subprojects/grilo.wrap
new file mode 100644
index 000000000..ca4e89056
--- /dev/null
+++ b/subprojects/grilo.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = grilo
+url = https://gitlab.gnome.org/GNOME/grilo.git
+revision = head
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]