[Spice-devel] [PATCH spice-gtk 5/5] meson: Add spice-protocol as subproject
Eduardo Lima (Etrunko)
etrunko at redhat.com
Tue Sep 25 17:37:59 UTC 2018
Fixes the cases where either the dependency is not installed or the
version installed does not satisfy the requirement.
Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
meson.build | 4 ++--
subprojects/spice-protocol.wrap | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 subprojects/spice-protocol.wrap
diff --git a/meson.build b/meson.build
index ebd42e1..ea6ff2f 100644
--- a/meson.build
+++ b/meson.build
@@ -72,13 +72,13 @@ endforeach
# check for mandatory dependencies
#
spice_protocol_version='>= 0.12.15'
+spice_gtk_deps += dependency('spice-protocol', version : spice_protocol_version, fallback : ['spice-protocol', 'spice_protocol_dep'])
glib_version = '2.46'
glib_version_info = '>= @0@'.format(glib_version)
pixman_version = '>= 0.17.7'
-deps = {'spice-protocol' : spice_protocol_version,
- 'glib-2.0' : glib_version_info,
+deps = {'glib-2.0' : glib_version_info,
'gio-2.0' : glib_version_info,
'gobject-2.0' : glib_version_info,
'pixman-1' : pixman_version,
diff --git a/subprojects/spice-protocol.wrap b/subprojects/spice-protocol.wrap
new file mode 100644
index 0000000..eb271c3
--- /dev/null
+++ b/subprojects/spice-protocol.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=spice-protocol
+url=https://gitlab.freedesktop.org/spice/spice-protocol.git
+revision=master
--
2.17.1
More information about the Spice-devel
mailing list