From 600c65b97e125a661522b15d4a3a1c869e93a12f Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Thu, 4 Feb 2021 15:10:17 +0100
Subject: [PATCH] ci: Reorder mesa and libdrm build and use older mesa sha

We want a mesa version that can be build in Debian/buster, for that
we need to use an older version, and we need to build the dependecies
in order.

While touching it also update the libdrm version.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>.
---
 ci/build-container.sh | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/ci/build-container.sh b/ci/build-container.sh
index be4210f..964b0bd 100644
--- a/ci/build-container.sh
+++ b/ci/build-container.sh
@@ -87,6 +87,35 @@ apt-get -y build-dep --no-install-recommends \
 apt-get -y remove valgrind libepoxy0
 rm -rf /var/lib/apt/lists/*
 
+export KNOWN_GOOD_DRM=libdrm-2.4.104
+mkdir /drm
+pushd /drm
+git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/drm.git . && \
+    git checkout ${KNOWN_GOOD_DRM} && \
+    git log --oneline -n 1 && \
+    mkdir -p build && \
+    meson build/ && \
+    meson configure build/ -Dprefix=/usr/local -Dlibdir=lib && \
+    ninja -C build/ install >/dev/null && \
+    rm -rf /drm
+popd
+
+export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-30a393f4581079ced1ac05d6b74c7408fbe26f83}
+echo $KNOWN_GOOD_MESA
+export MESA_REPO=https://gitlab.freedesktop.org/mesa/mesa.git
+echo $MESA_REPO
+mkdir /mesa
+pushd /mesa
+git clone --shallow-since="$GIT_DATE" ${MESA_REPO} . && \
+    git checkout ${KNOWN_GOOD_MESA} && \
+    git log --oneline -n 1 && \
+    mkdir -p build && \
+    meson build/ && \
+    meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,x11,wayland,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
+    ninja -C build/ install >/dev/null && \
+    rm -rf /mesa
+popd
+
 export KNOWN_GOOD_EPOXY=${KNOWN_GOOD_EPOXY:-1.5.4}
 mkdir /epoxy
 pushd /epoxy
@@ -155,32 +184,4 @@ git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/piglit
     rm -rf /piglit
 popd
 
-export KNOWN_GOOD_DRM=libdrm-2.4.103
-mkdir /drm
-pushd /drm
-git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/drm.git . && \
-    git checkout ${KNOWN_GOOD_DRM} && \
-    git log --oneline -n 1 && \
-    mkdir -p build && \
-    meson build/ && \
-    meson configure build/ -Dprefix=/usr/local -Dlibdir=lib && \
-    ninja -C build/ install >/dev/null && \
-    rm -rf /drm
-popd
-
-export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-1c17223c02b68679d67a4e4a6be8b9b7a80fa2e9}
-echo $KNOWN_GOOD_MESA
-export MESA_REPO=https://gitlab.freedesktop.org/mesa/mesa.git
-echo $MESA_REPO
-mkdir /mesa
-pushd /mesa
-git clone --shallow-since="$GIT_DATE" ${MESA_REPO} . && \
-    git checkout ${KNOWN_GOOD_MESA} && \
-    git log --oneline -n 1 && \
-    mkdir -p build && \
-    meson build/ && \
-    meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,x11,wayland,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
-    ninja -C build/ install >/dev/null && \
-    rm -rf /mesa
-popd