From d73265e20ddbc4208ff35e3ee5d89a8b3161a3d7 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 28 Jan 2019 17:38:17 +0000
Subject: [PATCH] gitlab-ci: add meson loader/classic DRI build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 .gitlab-ci.yml               | 21 +++++++++++++++++++++
 .gitlab-ci/Dockerfile.ubuntu |  3 +++
 .travis.yml                  | 20 --------------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c3f39c530a..f667cfd74c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,6 +144,27 @@ build:meson-vulkan:
     VULKAN_DRIVERS: intel,amd
     LLVM_VERSION: "7"
 
+build:meson-loader-classic-dri:
+  extends: .meson-build
+  variables:
+    UNWIND: "false"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=true
+      -D egl=true
+      -D platforms=x11,wayland,drm,surfaceless
+      -D osmesa=classic
+    DRI_DRIVERS: "i915,i965,r100,r200,swrast,nouveau"
+    GALLIUM_ST: >
+      -D dri3=true
+      -D gallium-vdpau=false
+      -D gallium-xvmc=false
+      -D gallium-omx=disabled
+      -D gallium-va=false
+      -D gallium-xa=false
+      -D gallium-nine=false
+      -D gallium-opencl=disabled
+
 build:make-vulkan:
   extends: .make-build
   variables:
diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index 745973a9f73..5a27c1502d6 100644
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -17,7 +17,10 @@ RUN apt-get install -y \
       libdrm-dev \
       libpciaccess-dev \
       libxrandr-dev \
+      libxdamage-dev \
+      libxfixes-dev \
       libxshmfence-dev \
+      libxxf86vm-dev \
       libvdpau-dev \
       libva-dev \
       llvm-3.9-dev \
diff --git a/.travis.yml b/.travis.yml
index b27449344ad..8e2a53a8918 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,26 +32,6 @@ env:
 matrix:
   include:
     - env:
-        - 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"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-      addons:
-        apt:
-          packages:
-            - xz-utils
-            - x11proto-xf86vidmode-dev
-            - libxxf86vm-dev
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libxdamage-dev
-            - libxfixes-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
         - LABEL="make loaders/classic DRI"
         - BUILD=make
         - MAKEFLAGS="-j4"
-- 
2.11.0