Mesa (master): gitlab-ci: build a specific libdrm version for ARM64

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cb19f69ff0604d1a439532253432b048d5af0213
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb19f69ff0604d1a439532253432b048d5af0213

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Nov 12 14:56:35 2019 +0100

gitlab-ci: build a specific libdrm version for ARM64

RADV requires libdrm-2.4.100 but the distrib package is too old.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 .gitlab-ci.yml                     | 2 +-
 .gitlab-ci/debian-arm64-install.sh | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7eb604fb21..78358841116 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ variables:
   UPSTREAM_REPO: mesa/mesa
   DEBIAN_TAG: "amd64-2019-11-13-2"
   DEBIAN_TEST_TAG: "amd64-test-2019-11-12-2"
-  DEBIAN_ARM64_TAG: "arm64v8-2019-11-06"
+  DEBIAN_ARM64_TAG: "arm64v8-2019-11-13"
   DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-12-2"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim
diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/debian-arm64-install.sh
index 3f068f6dddf..c08746b1df2 100644
--- a/.gitlab-ci/debian-arm64-install.sh
+++ b/.gitlab-ci/debian-arm64-install.sh
@@ -17,7 +17,6 @@ apt-get -y install \
 	flex \
 	g++ \
 	gettext \
-	libdrm-dev \
 	libdrm-dev:armhf \
 	libelf-dev \
 	libelf-dev:armhf \
@@ -33,6 +32,14 @@ apt-get -y install \
 	wget \
 	zlib1g-dev
 
+# dependencies where we want a specific version
+export LIBDRM_VERSION=libdrm-2.4.100
+
+wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
+tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
+cd $LIBDRM_VERSION; meson build -D vc4=true -D freedreno=true -D etnaviv=true; ninja -j4 -C build install; cd ..
+rm -rf $LIBDRM_VERSION
+
 ############### Generate cross build file for Meson
 
 cross_file="/cross_file-armhf.txt"