From 08a821f291cd55b9d2654d15b1da832ead782c96 Mon Sep 17 00:00:00 2001
From: Luigi Santivetti <luigi.santivetti@imgtec.com>
Date: Thu, 2 Jun 2022 01:32:15 +0100
Subject: [PATCH] gitlab-ci: build libdrm version 2.4.108 from source

libdrm with version 2.4.108 provides new functionality for parsing
IN_FORMATS blobs. Weston can make use of it and avoid implementing
its own logic. At present CI uses Debian 11 (bullseye) which comes
with an older version (2.4.104), so we build it from source.

Signed-off-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
---
 .gitlab-ci.yml               |  2 +-
 .gitlab-ci/build-deps.sh     | 11 +++++++++++
 .gitlab-ci/debian-install.sh |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0841437d..dd8d0fa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
-  FDO_DISTRIBUTION_TAG: '2022-02-07.00-add-vgem-to-ci'
+  FDO_DISTRIBUTION_TAG: '2022-06-06.00-build-libdrm-dep'
 
 
 include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index 158ff7c4..1f85fb8f 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -130,6 +130,17 @@ ninja ${NINJAFLAGS} -C build install
 cd ..
 rm -rf mesa
 
+# Build and install our own version of libdrm. Debian 11 (bullseye) provides
+# libdrm 2.4.104 which doesn't have the IN_FORMATS iterator api. We can stop
+# building and installing libdrm as soon as we move to Debian 12.
+git clone --branch libdrm-2.4.108 --depth=1 https://gitlab.freedesktop.org/mesa/drm.git
+cd drm
+meson build -Dauto_features=disabled \
+	-Dvc4=false -Dfreedreno=false -Detnaviv=false
+ninja ${NINJAFLAGS} -C build install
+cd ..
+rm -rf drm
+
 # PipeWire is used for remoting support. Unlike our other dependencies its
 # behaviour will be stable, however as a pre-1.0 project its API is not yet
 # stable, so again we lock it to a fixed version.
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 2c243101..9b9d2a6d 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -68,6 +68,7 @@ apt-get -y --no-install-recommends install \
 	libmtdev-dev \
 	libpam0g-dev \
 	libpango1.0-dev \
+	libpciaccess-dev \
 	libpixman-1-dev \
 	libpng-dev \
 	libpulse-dev \