xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit c7486613b0dc586f93f6ba293d9b55c69995b05c
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 9 15:17:47 2019 -0400

    meson: Fix another reference to "gl" 9.2.0
    
    Previous commit e6ef2b12 missed a spot.

diff --git a/glx/meson.build b/glx/meson.build
index 745814336..d7a2aa468 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: '>= 9.2.0'),
+            dependency('gl', version: '>= 1.2.0'),
         ],
     )