[Spice-devel] [PATCH spice-server 2/2] meson: Add spice-protocol as subproject

[Eduardo Lima (Etrunko)]

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 3184a6f5..deb9bbcd 100644
--- a/meson.build
+++ b/meson.build
@@ -83,13 +83,13 @@ endif
 # check for mandatory dependencies
 #
 spice_protocol_version='0.12.15'
+spice_server_deps += dependency('spice-protocol', version : '>= @0@'.format(spice_protocol_version), fallback : ['spice-protocol', 'spice_protocol_dep'])
 
 glib_version = '2.38'
 glib_version_info = '>= @0@'.format(glib_version)
 pixman_version = '>= 0.17.7'
 
-deps = {'spice-protocol' : '>= @0@'.format(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 00000000..eb271c39
--- /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