Mesa (main): ci: Use common build script for libwayland

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9bab991be09db0332ef6d68e8a91f29e0712328d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bab991be09db0332ef6d68e8a91f29e0712328d

Author: Daniel Stone <daniels at collabora.com>
Date:   Thu Nov 25 16:49:03 2021 +0100

ci: Use common build script for libwayland

Rather than open-coding libwayland install for each container, create a
common build script like the rest, using both git and meson like the
rest.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11248>

---

 .gitlab-ci/container/build-wayland.sh    | 13 +++++++++++++
 .gitlab-ci/container/debian/x86_build.sh |  8 +-------
 .gitlab-ci/container/fedora/x86_build.sh |  8 +-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
new file mode 100644
index 00000000000..8166f528bf6
--- /dev/null
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -ex
+
+export LIBWAYLAND_VERSION="1.18.0"
+
+git clone https://gitlab.freedesktop.org/wayland/wayland
+cd wayland
+git checkout "$LIBWAYLAND_VERSION"
+meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build
+ninja -C _build install
+cd ..
+rm -rf wayland
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 318a0bc490c..bd2f49b7aea 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -67,10 +67,8 @@ chmod +x /usr/local/bin/x86_64-w64-mingw32-pkg-config
 
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
-export         LIBWAYLAND_VERSION=wayland-1.18.0
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
@@ -79,11 +77,7 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-libdrm.sh
 
-wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
-tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
-cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
-rm -rf $LIBWAYLAND_VERSION
-
+. .gitlab-ci/container/build-wayland.sh
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
diff --git a/.gitlab-ci/container/fedora/x86_build.sh b/.gitlab-ci/container/fedora/x86_build.sh
index 718e49e9338..6231cf69b11 100644
--- a/.gitlab-ci/container/fedora/x86_build.sh
+++ b/.gitlab-ci/container/fedora/x86_build.sh
@@ -74,10 +74,8 @@ dnf install -y --setopt=install_weak_deps=False \
 
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
-export         LIBWAYLAND_VERSION=wayland-1.18.0
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
@@ -86,11 +84,7 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-libdrm.sh
 
-wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
-tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
-cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
-rm -rf $LIBWAYLAND_VERSION
-
+. .gitlab-ci/container/build-wayland.sh
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1