[Spice-commits] 2 commits - meson.build

[GitLab Mirror]

 meson.build |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 252b10e4ca752982a0114eb24224a4afcd5b3bb2
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Tue Sep 25 10:47:39 2018 -0300

    meson: Add json-glib to the list of mandatory deps
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/meson.build b/meson.build
index 76fb0cd..48f5f74 100644
--- a/meson.build
+++ b/meson.build
@@ -88,10 +88,9 @@ foreach dep, version : deps
   spice_gtk_deps += dependency(dep, version : version)
 endforeach
 
-spice_gtk_deps += dependency('json-glib-1.0')
-
+# mandatory dependencies, without specific version requirement
 # TODO: specify minimum version for cairo, jpeg and zlib?
-deps = ['cairo', 'libjpeg', 'zlib']
+deps = ['cairo', 'libjpeg', 'zlib', 'json-glib-1.0']
 if spice_gtk_host_system == 'windows'
   deps += 'gio-windows-2.0'
 else
commit 74589aac7c4e1dd69ec7c21c9db70eb4af6c11fb
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Tue Sep 25 11:32:24 2018 -0300

    meson: Remove unecessary variable spice_protocol_min_version
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/meson.build b/meson.build
index eba2c38..76fb0cd 100644
--- a/meson.build
+++ b/meson.build
@@ -30,7 +30,6 @@ spice_gtk_global_cflags = ['-DHAVE_CONFIG_H',
 # other global vars
 compiler = meson.get_compiler('c')
 spice_gtk_config_data = configuration_data()
-spice_protocol_min_version='0.12.13'
 spice_gtk_include = [include_directories('.')]
 spice_gtk_deps = []
 spice_gtk_host_system = host_machine.system()
@@ -72,13 +71,13 @@ endforeach
 #
 # check for mandatory dependencies
 #
-spice_protocol_version='0.12.15'
+spice_protocol_version='>= 0.12.15'
 
 glib_version = '2.46'
 glib_version_info = '>= @0@'.format(glib_version)
 pixman_version = '>= 0.17.7'
 
-deps = {'spice-protocol' : '>= @0@'.format(spice_protocol_version),
+deps = {'spice-protocol' : spice_protocol_version,
         'glib-2.0'       : glib_version_info,
         'gio-2.0'        : glib_version_info,
         'gobject-2.0'    : glib_version_info,
@@ -423,7 +422,7 @@ pkgconfig = import('pkgconfig')
 pkgconfig.generate(spice_client_glib_lib,
                    description : 'SPICE Client GLib 2.0 library',
                    subdirs : 'spice-client-glib-2.0',
-                   requires : 'spice-protocol >= @0@'.format(spice_protocol_min_version),
+                   requires : 'spice-protocol',
                    variables : 'exec_prefix=${prefix}')
 
 #