xserver: Branch 'master'

[GitLab Mirror]

 test/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9114c4341cec91ed41c9527c88200b7712357951
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Mar 13 13:25:02 2019 +0000

    meson: Drop a meson version check
    
    Drop some code conditional on meson version, which is not needed
    since 7e046b94 bumped the minimum meson version

diff --git a/test/meson.build b/test/meson.build
index 89d8260ed..26503ce0c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -53,7 +53,7 @@ if build_xorg
         unit_defines += ['-DRES_TESTS']
     endif
 
-    if meson.version().version_compare('>=0.46.0') and meson.get_compiler('c').has_link_argument('-Wl,-wrap')
+    if meson.get_compiler('c').has_link_argument('-Wl,-wrap')
        unit_sources += [
         'xi1/protocol-xchangedevicecontrol.c',
         'xi2/protocol-common.c',