diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2019-10-07 18:10:48 +0200 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2019-10-07 18:10:48 +0200 |
| commit | f05062c9d3e37f98c0754c3c549e62c1c0b228e8 (patch) | |
| tree | 3464b8552e30099431fb56ab926ac430ccba19f3 | |
| parent | ebd62de97b96eccd513efdc0fc89acc3388d380c (diff) | |
| download | totem-f05062c9d3e37f98c0754c3c549e62c1c0b228e8.tar.gz | |
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.
| -rw-r--r-- | src/meson.build | 6 | ||||
| -rw-r--r-- | subprojects/.gitignore | 1 | ||||
| -rw-r--r-- | 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 |