xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 3340ddf37743fdf197dfc16a97107435ff53c6e4
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 9 16:03:17 2019 -0400

    meson: Apparently 1.2 is < 1.2.0
    
    Siiiigh.

diff --git a/glx/meson.build b/glx/meson.build
index d7a2aa468..1140522f6 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -74,7 +74,7 @@ if build_glx
             common_dep,
             dl_dep,
             dependency('glproto', version: '>= 1.4.17'),
-            dependency('gl', version: '>= 1.2.0'),
+            dependency('gl', version: '>= 1.2'),
         ],
     )