From b5a70af062510b61bbd6d57fe26933ee3788e5be Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 28 Jan 2019 18:05:22 +0000
Subject: [PATCH] gitlab-ci: add meson gallium ST Clover (LLVM 5.0) build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45c0ee6e4fa..979cbadc717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,6 +228,26 @@ build:meson-gallium-drivers-other:
     GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
     LLVM_VERSION: "5.0"
 
+build:meson-gallium-clover-llvm5:
+  extends: .meson-build
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=false
+      -D gbm=false
+    GALLIUM_ST: >
+      -D dri3=false
+      -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=icd
+    GALLIUM_DRIVERS: "r600"
+    LLVM_VERSION: "5.0"
+
 build:make-vulkan:
   extends: .make-build
   variables:
diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index 4dae37f9e12..1f334ed9946 100644
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -28,6 +28,9 @@ RUN apt-get install -y \
       llvm-5.0-dev \
       llvm-6.0-dev \
       llvm-7-dev \
+      clang-5.0 \
+      libclang-5.0-dev \
+      libclc-dev \
       xz-utils \
       libexpat1-dev \
       libx11-xcb-dev \
diff --git a/.travis.yml b/.travis.yml
index f80473ad12a..662466ed69d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,32 +54,6 @@ matrix:
             - libxfixes-dev
             - python3-pip
             - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Clover LLVM-5.0"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=icd"
-        - GALLIUM_DRIVERS="r600"
-        - LLVM_VERSION=5.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-5.0-dev
-            - clang-5.0
-            - libclang-5.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
     - env:
         - LABEL="meson Gallium ST Clover LLVM-6.0"
         - BUILD=meson
-- 
2.30.2