[Spice-devel] [PATCH spice-common v2] fixup: meson build

[Eduardo Lima (Etrunko)]

Adjusts dependencies, removes 'glib-version' and 'protocol-version'
options, and does not propagate some cflags to the parent project
anymore.

Sending this one as a separate patch to show the differences in the v3
I am about to send. Both spice-server and spice-gtk still need
adjustments before they can be used together with spice-common if this
one gets merged.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 common/meson.build |  3 ---
 meson.build        | 15 ++++-----------
 meson_options.txt  | 10 ----------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/common/meson.build b/common/meson.build
index 8af185c..9d46899 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -45,7 +45,6 @@ spice_common_lib = static_library('spice-common', spice_common_sources,
                                   dependencies : spice_common_deps)
 
 spice_common_dep = declare_dependency(link_with : spice_common_lib,
-                                      compile_args : spice_common_glib_cflags,
                                       include_directories : spice_common_include,
                                       dependencies : spice_common_deps)
 
@@ -79,7 +78,6 @@ if spice_common_generate_client_code
                                            dependencies : spice_common_dep)
 
   spice_common_client_dep = declare_dependency(sources : target,
-                                               compile_args : spice_common_glib_cflags,
                                                link_with : spice_common_client_lib,
                                                dependencies : spice_common_dep)
 endif
@@ -127,7 +125,6 @@ if spice_common_generate_server_code
                                            dependencies : spice_common_dep)
 
   spice_common_server_dep = declare_dependency(sources : target,
-                                               compile_args : spice_common_glib_cflags,
                                                link_with : spice_common_server_lib,
                                                dependencies : spice_common_dep)
 endif
diff --git a/meson.build b/meson.build
index 700b906..58cce39 100644
--- a/meson.build
+++ b/meson.build
@@ -91,16 +91,13 @@ endforeach
 #
 # check for mandatory dependencies
 #
-spice_protocol_version = '>= @0@'.format(get_option('protocol-version'))
-
-glib_version = get_option('glib-version')
+glib_version = '2.38'
 glib_major_minor = glib_version.split('.')
 glib_version_info = '>= @0 at .@1@'.format(glib_major_minor[0], glib_major_minor[1])
 glib_encoded_version = 'GLIB_VERSION_ at 0@_ at 1@'.format(glib_major_minor[0], glib_major_minor[1])
 
-deps = [['spice-protocol', '>= @0@'.format(get_option('protocol-version'))],
+deps = [['spice-protocol', '>= 0.12.12'],
         ['glib-2.0', glib_version_info],
-        ['gobject-2.0', glib_version_info],
         ['gio-2.0', glib_version_info],
         ['gthread-2.0', glib_version_info],
         ['pixman-1', '>= 0.17.7'],
@@ -110,10 +107,8 @@ foreach dep : deps
   spice_common_deps += dependency(dep[0], version : dep[1])
 endforeach
 
-spice_common_glib_cflags = ['-DGLIB_VERSION_MIN_REQUIRED=@0@'.format(glib_encoded_version),
-                            '-DGLIB_VERSION_MAX_ALLOWED=@0@'.format(glib_encoded_version)]
-
-spice_common_global_cflags += spice_common_glib_cflags
+spice_common_global_cflags += ['-DGLIB_VERSION_MIN_REQUIRED=@0@'.format(glib_encoded_version),
+                               '-DGLIB_VERSION_MAX_ALLOWED=@0@'.format(glib_encoded_version)]
 
 #
 # Non-mandatory/optional dependencies
@@ -164,8 +159,6 @@ else
   endif
 endif
 
-spice_common_has_smartcard = smartcard_dep.found() or smartcard012_dep.found()
-
 #
 # global C defines
 #
diff --git a/meson_options.txt b/meson_options.txt
index b2a38e7..5189f4f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,16 +26,6 @@ option('manual',
     yield : true,
     description : 'Build SPICE manual (default=true)')
 
-option('glib-version',
-    type : 'string',
-    value : '2.38',
-    description : 'Glib version required (default=2.38)')
-
-option('protocol-version',
-    type : 'string',
-    value : '0.12.12',
-    description : 'SPICE protocol version required (default=0.12.12)')
-
 option('generate-code',
     type : 'combo',
     choices : ['all', 'server', 'client'],
-- 
2.14.4