Add xserver-21.1 branch to CI build matrix

Also updates build container from Debian buster (10) to bookworm (12),
which in turn requires working around glvnd shipping gl.pc with a much
lower version number than Mesa had.

v2: use Debian bookworm (12) instead of bullseye (11)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/19>

2 files changed, 23 insertions, 11 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52f9d491..4cd462b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,10 @@
 # recommended except for ephemeral images during development.
 #
 variables:
-  FDO_DISTRIBUTION_VERSION: buster-slim
+  FDO_DISTRIBUTION_VERSION: bookworm-slim
   FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
-  FDO_DISTRIBUTION_TAG: "2021-05-10"
+  FDO_DISTRIBUTION_PACKAGES: 'ca-certificates'
+  FDO_DISTRIBUTION_TAG: "2024-02-23.2"
   FDO_UPSTREAM_REPO: xorg/driver/xf86-video-ati
 
 #
@@ -19,7 +20,7 @@ variables:
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 9568e38927f9e9c48d4f586f84a071c3a4bdcd39 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -105,21 +106,22 @@ build-distcheck:
   - make install V=1
   - make -j${FDO_CI_CONCURRENT:-4} distcheck
   variables:
-    XSERVER_VERSION: "1.20"
+    XSERVER_VERSION: "21.1"
 
+# excludes version already checked in build-distcheck
 build-gcc:
   extends:
     - .default_build
   parallel:
     matrix:
-      - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19"]
+      - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19", "1.20"]
 
 build-clang:
   extends:
     - .default_build
   parallel:
     matrix:
-      - XSERVER_VERSION: ["1.20", "1.18", "1.19"]
+      - XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"]
   variables:
     CC: clang
 
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 4e528588..f010cd0b 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -3,7 +3,7 @@
 set -e
 set -o xtrace
 
-echo 'deb-src https://deb.debian.org/debian buster main' >/etc/apt/sources.list.d/deb-src.list
+echo 'deb-src https://deb.debian.org/debian bookworm main' >/etc/apt/sources.list.d/deb-src.list
 apt-get update
 
 
@@ -25,7 +25,7 @@ apt-get install -y --no-remove \
 echo 'APT::Get::Build-Dep-Automatic "true";' >>/etc/apt/apt.conf
 apt-get build-dep -y xorg-server
 
-
+# xserver 1.18 and older branches require libXfont 1.5 instead of 2.0
 git clone https://gitlab.freedesktop.org/xorg/lib/libXfont.git
 cd libXfont
 git checkout libXfont-1.5-branch
@@ -40,16 +40,24 @@ cd xserver
 
 for VERSION in 1.13 1.14 1.15; do
     git checkout server-${VERSION}-branch
-    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2
+    # Workaround glvnd having reset the version in gl.pc from what Mesa used
+    # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
+    sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac
+    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --disable-dmx
     make -C include install-nodist_sdkHEADERS
     make install-headers install-aclocalDATA install-pkgconfigDATA clean
+    git restore configure.ac
 done
 
-for VERSION in 1.16 1.17 1.18 1.19 1.20; do
+for VERSION in 1.16 1.17 1.18 1.19 1.20 21.1; do
     git checkout server-${VERSION}-branch
-    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --enable-dri3 --enable-glamor
+    # Workaround glvnd having reset the version in gl.pc from what Mesa used
+    # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
+    sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac
+    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --enable-dri3 --enable-glamor --disable-dmx
     make -C include install-nodist_sdkHEADERS
     make install-headers install-aclocalDATA install-pkgconfigDATA clean
+    git restore configure.ac
 done
 
 cd ..
@@ -65,6 +73,8 @@ apt-get install -y --no-remove \
 	libpciaccess-dev \
 	libpixman-1-dev \
 	libudev-dev \
+	libxcvt-dev \
+	mesa-common-dev \
 	xutils-dev \
 	x11proto-dev