gitlab-ci: add meson loader/classic DRI build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>

.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:

.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 \

.travis.yml

@@ -31,26 +31,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