xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 7e046b9467784451769af3a03db46e3c690063b0
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 5 11:31:29 2019 -0500

    meson: Bump required meson version to 0.46
    
    We were being naughty:
    
    WARNING: Project specifies a minimum meson_version '>= 0.42.0' but uses features which were added in newer versions:
     * 0.46.0: {'compiler.has_multi_link_argument', 'compiler.has_link_argument'}

diff --git a/meson.build b/meson.build
index 29794f083..52f4c3c5a 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
             'c_std=gnu99',
         ],
         version: '1.20.99.1',
-        meson_version: '>= 0.42.0',
+        meson_version: '>= 0.46.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
 cc = meson.get_compiler('c')