gitlab-ci: build GLVND in meson-clang
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 19 Nov 2019 13:37:32 +0000 (14:37 +0100)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 21 Nov 2019 08:35:05 +0000 (09:35 +0100)
Building GLVND in meson-main doesn't work because this disables
libEGL and it's needed for running shader-db.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
.gitlab-ci.yml

index 4f742d430b9631d9d6b7ed0bbd74b7ddc7a8aba6..9c0612a90b6604ec9e92ac96309bafdfdfd3134a 100644 (file)
@@ -318,7 +318,6 @@ meson-swr-glvnd:
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
-      -D glvnd=true
       -D egl=true
     GALLIUM_ST: >
       -D dri3=true
@@ -336,6 +335,8 @@ meson-clang:
   extends: .meson-build
   variables:
     UNWIND: "true"
+    DRI_LOADERS: >
+      -D glvnd=true
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
     VULKAN_DRIVERS: intel,amd,freedreno