[Spice-commits] .gitlab-ci.yml meson.build meson_options.txt

[GitLab Mirror]

 .gitlab-ci.yml    |    1 -
 meson.build       |   10 +++-------
 meson_options.txt |    3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit f494335bc34773f27bd9c519b8b383cc011e7528
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Jan 4 19:58:47 2019 +0400

    meson: switch lz4 option to auto feature
    
    Contrary to spice server dependency, spice-gtk doesn't have a known
    minimum version requirement.
    
    It looks like all distros we care about have >= v1.7.3
    https://repology.org/metapackage/lz4/versions
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce4f18f..fcaebbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,6 @@ makecheck_simple:
 makecheck_simple-meson:
   script:
   - meson build -Dauto_features=disabled
-                -Dlz4=false
                 -Dgstaudio=false
                 -Dgstvideo=false
                 -Dsmartcard=false
diff --git a/meson.build b/meson.build
index e406feb..7daea8f 100644
--- a/meson.build
+++ b/meson.build
@@ -318,13 +318,9 @@ endif
 
 # lz4
 spice_gtk_has_lz4 = false
-if get_option('lz4')
-  lz4_dep = dependency('liblz4', required : false, version : '>= 129')
-  if not lz4_dep.found()
-    lz4_dep = dependency('liblz4', version : '>= 1.7.3')
-  endif
-
-  spice_glib_deps += lz4_dep
+d = dependency('liblz4', required : get_option('lz4'))
+if d.found()
+  spice_glib_deps += d
   spice_gtk_config_data.set('USE_LZ4', '1')
   spice_gtk_has_lz4 = true
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 05ca407..5d48a2c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -75,8 +75,7 @@ option('alignment-checks',
     description : 'Enable runtime checks for cast alignment')
 
 option('lz4',
-    type : 'boolean',
-    value : true,
+    type : 'feature',
     description: 'Enable lz4 compression support')
 
 option('sasl',