ci: enable wayland platform in more debian builds

CI has recently gained coverage of wayland platform in EGL tests, but
some CI mesa builds such as arm builds currently don't enable the
wayland platform.
Enable it so test applications can properly initialize EGL with a
wayland platform.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480>

.gitlab-ci/container/build-wayland.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
 
 set -ex
 
@@ -8,7 +9,7 @@ export WAYLAND_PROTOCOLS_VERSION="1.24"
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build
+meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
 ninja -C _build install
 cd ..
 rm -rf wayland
@@ -16,7 +17,7 @@ rm -rf wayland
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson _build
+meson _build $EXTRA_MESON_ARGS
 ninja -C _build install
 cd ..
 rm -rf wayland-protocols

.gitlab-ci/container/cross_build.sh

@@ -18,6 +18,7 @@ apt-get install -y --no-remove \
         crossbuild-essential-$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
+        libffi-dev:$arch \
         libpciaccess-dev:$arch \
         libstdc++6:$arch \
         libvulkan-dev:$arch \
@@ -35,6 +36,7 @@ apt-get install -y --no-remove \
         libxrandr-dev:$arch \
         libxshmfence-dev:$arch \
         libxxf86vm-dev:$arch \
+        libwayland-dev:$arch \
         wget
 
 if [[ $arch != "armhf" ]]; then
@@ -50,7 +52,6 @@ if [[ $arch != "armhf" ]]; then
     # around this.
     apt-get install -y --no-remove --no-install-recommends \
             libclang-cpp${LLVM}:$arch \
-            libffi-dev:$arch \
             libgcc-s1:$arch \
             libtinfo-dev:$arch \
             libz3-dev:$arch \
@@ -68,6 +69,8 @@ fi
 EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
 . .gitlab-ci/container/build-libdrm.sh
 
+. .gitlab-ci/container/build-wayland.sh
+
 apt-get purge -y \
         $STABLE_EPHEMERAL
 

.gitlab-ci/container/debian/arm_build.sh

@@ -50,6 +50,7 @@ apt-get -y install \
 	libxrandr-dev \
 	libxshmfence-dev \
 	libxxf86vm-dev \
+	libwayland-dev \
 	llvm-11-dev \
 	ninja-build \
 	pkg-config \
@@ -84,6 +85,8 @@ arch=armhf
 EXTRA_MESON_ARGS=
 . .gitlab-ci/container/build-libdrm.sh
 
+. .gitlab-ci/container/build-wayland.sh
+
 apt-get purge -y $STABLE_EPHEMERAL
 
 . .gitlab-ci/container/container_post_build.sh