gitlab CI: add builds against server-21.1-branchHEADmaster

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 22 insertions, 41 deletions

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index cf9faac..ddb3c57 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -20,48 +20,29 @@ cd .. && rm -rf libXfont
 git clone https://gitlab.freedesktop.org/xorg/xserver.git
 cd xserver
 
-git checkout server-1.13-branch
-./autogen.sh --prefix=/usr/local/xserver-1.13 --enable-dri2
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.14-branch
-./autogen.sh --prefix=/usr/local/xserver-1.14 --enable-dri2
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.15-branch
-./autogen.sh --prefix=/usr/local/xserver-1.15 --enable-dri2
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.16-branch
-./autogen.sh --prefix=/usr/local/xserver-1.16 --enable-dri2 --enable-dri3 --enable-glamor
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.17-branch
-./autogen.sh --prefix=/usr/local/xserver-1.17 --enable-dri2 --enable-dri3 --enable-glamor
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.18-branch
-./autogen.sh --prefix=/usr/local/xserver-1.18 --enable-dri2 --enable-dri3 --enable-glamor
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.19-branch
-./autogen.sh --prefix=/usr/local/xserver-1.19 --enable-dri2 --enable-dri3 --enable-glamor
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-
-git checkout server-1.20-branch
-./autogen.sh --prefix=/usr/local/xserver-1.20 --enable-dri2 --enable-dri3 --enable-glamor
-make -C include install-nodist_sdkHEADERS
-make install-headers install-aclocalDATA install-pkgconfigDATA clean
-cd .. && rm -rf xserver
+for VERSION in 1.13 1.14 1.15; do
+    git checkout server-${VERSION}-branch
+    # 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 21.1; do
+    git checkout server-${VERSION}-branch
+    # 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
 
 apt-get install -y clang xutils-dev libdrm-dev libgl1-mesa-dev libgbm-dev libudev-dev \
-        x11proto-dev libpixman-1-dev libpciaccess-dev
+        x11proto-dev libpixman-1-dev libpciaccess-dev mesa-common-dev libxcvt-dev
 apt-get purge -y git ca-certificates
 apt-get autoremove -y --purge