[cairo-commit] .gitlab-ci.yml meson_options.txt

[GitLab Mirror]

 .gitlab-ci.yml    |    3 +++
 meson_options.txt |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3e5115fde7086ffe2b73eab62d8b80c50f217f4a
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Nov 17 15:07:29 2020 +0000

    meson: align gl backend option defaults with autotools
    
    Disable gl backend by default, just like autotools does:
    
      --enable-gl=[no/auto/yes]
                              Enable cairo's OpenGL surface backend feature
                              [default=no]
      --enable-glesv2=[no/auto/yes]
                              Enable cairo's OpenGLESv2 surface backend feature
                              [default=no]
      --enable-glesv3=[no/auto/yes]
                              Enable cairo's OpenGLESv3 surface backend feature
                              [default=no]

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bddba8649..1f67f240c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,9 @@ variables:
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
+    -Dgl-backend=auto
+    -Dglesv2=auto
+    -Dglesv2=auto
 
 stages:
   - prep
diff --git a/meson_options.txt b/meson_options.txt
index a52b6e2f3..ff11fe7ed 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,11 +5,11 @@ option('freetype', type : 'feature', value : 'auto')
 # Cairo surface backends
 option('cogl', type : 'feature', value : 'disabled')
 option('directfb', type : 'feature', value : 'disabled')
-option('gl-backend', type : 'combo', value : 'auto',
+option('gl-backend', type : 'combo', value : 'disabled',
        # FIXME: https://github.com/mesonbuild/meson/issues/4566
        choices : ['auto', 'gl', 'glesv2', 'glesv3', 'disabled'])
-option('glesv2', type : 'feature', value : 'auto')
-option('glesv3', type : 'feature', value : 'auto')
+option('glesv2', type : 'feature', value : 'disabled')
+option('glesv3', type : 'feature', value : 'disabled')
 option('drm', type : 'feature', value : 'disabled')
 option('openvg', type : 'feature', value : 'disabled')
 option('png', type : 'feature', value : 'auto') # png and svg surfaces