Mesa (master): travis: meson: explicitly control the DRI loaders

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 51318c32fe595a313f23003bccb8e9bd84e831e4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51318c32fe595a313f23003bccb8e9bd84e831e4

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 13:42:36 2018 +0000

travis: meson: explicitly control the DRI loaders

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d16c896b8a..4933d8d78a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ matrix:
         - LABEL="meson Vulkan"
         - BUILD=meson
         - UNWIND="false"
+        - DRI_LOADERS="-Dglx=disabled -Dgbm=false -Degl=false -Dplatforms=x11,wayland,drm -Dosmesa=none"
         - VULKAN_DRIVERS="intel,amd"
         - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
@@ -57,6 +58,7 @@ matrix:
         - LABEL="meson loaders/classic DRI"
         - BUILD=meson
         - UNWIND="false"
+        - DRI_LOADERS="-Dglx=dri -Dgbm=true -Degl=true -Dplatforms=x11,wayland,drm,surfaceless -Dosmesa=classic"
         - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
       addons:
         apt:
@@ -460,6 +462,7 @@ matrix:
         - LABEL="macOS meson"
         - BUILD=meson
         - UNWIND="false"
+        - DRI_LOADERS="-Dglx=dri -Dgbm=false -Degl=false -Dplatforms=x11 -Dosmesa=none"
       os: osx
 
 before_install:
@@ -630,11 +633,6 @@ script:
 
   - |
     if test "x$BUILD" = xmeson; then
-
-      if test "x$TRAVIS_OS_NAME" == xosx; then
-        MESON_OPTIONS="-Degl=false"
-      fi
-
       # We need to control the version of llvm-config we're using, so we'll
       # generate a native file to do so. This requires meson >=0.49
       #
@@ -643,10 +641,11 @@ script:
       $LLVM_CONFIG --version
 
       export CFLAGS="$CFLAGS -isystem`pwd`"
-      meson _build $MESON_OPTIONS \
+      meson _build \
                    --native-file=native.file \
                    -Dbuild-tests=true \
                    -Dlibunwind=${UNWIND} \
+                   ${DRI_LOADERS} \
                    -Ddri-drivers=${DRI_DRIVERS:-[]} \
                    -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \
                    -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}