From a75a1cd8ecdedfb842eb549d6481990ec2eefe17 Mon Sep 17 00:00:00 2001
From: Matt Jolly <kangie@gentoo.org>
Date: Fri, 28 Feb 2025 23:24:43 +1000
Subject: [PATCH] ci/alpine: Control Meson version

We need to use a later version of Meson than is currently available
in the Alpine repository. Use the existing `install-meson.sh` to fetch
the appropriate version from PyPI.

This requires that we explicitly install a Ninja impl on Alpine -
Samurai is the preferred impl and by using this we do not need
to prefix `PATH` to access Ninja.

`apk` installed Installed packages are additionally sorted.

Signed-off-by: Matt Jolly <kangie@gentoo.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33725>
---
 .gitlab-ci/container/alpine/x86_64_build.sh | 34 +++++++++++----------
 .gitlab-ci/container/install-meson.sh       |  1 +
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh
index 0e4ee323a89..456f2d2096b 100644
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -20,31 +20,28 @@ DEPS=(
     bison
     ccache
     "clang${LLVM_VERSION}-dev"
-    cmake
     clang-dev
+    cmake
     coreutils
     curl
+    elfutils-dev
+    expat-dev
     flex
-    gcc
     g++
-    git
+    gcc
     gettext
+    git
     glslang
     graphviz
-    linux-headers
-    "llvm${LLVM_VERSION}-static"
-    "llvm${LLVM_VERSION}-dev"
-    meson
-    mold
-    musl-dev
-    expat-dev
-    elfutils-dev
     libclc-dev
     libdrm-dev
-    libva-dev
     libpciaccess-dev
-    zlib-dev
-    python3-dev
+    libva-dev
+    linux-headers
+    "llvm${LLVM_VERSION}-dev"
+    "llvm${LLVM_VERSION}-static"
+    mold
+    musl-dev
     py3-clang
     py3-cparser
     py3-mako
@@ -52,10 +49,13 @@ DEPS=(
     py3-pip
     py3-ply
     py3-yaml
-    vulkan-headers
-    spirv-tools-dev
+    python3-dev
+    samurai
     spirv-llvm-translator-dev
+    spirv-tools-dev
     util-macros
+    vulkan-headers
+    zlib-dev
 )
 
 apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
@@ -64,6 +64,8 @@ pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0
 
 . .gitlab-ci/container/container_pre_build.sh
 
+. .gitlab-ci/container/install-meson.sh
+
 EXTRA_MESON_ARGS='--prefix=/usr' \
 . .gitlab-ci/container/build-wayland.sh
 
diff --git a/.gitlab-ci/container/install-meson.sh b/.gitlab-ci/container/install-meson.sh
index 1c016ebcc50..3fb19a3db2a 100644
--- a/.gitlab-ci/container/install-meson.sh
+++ b/.gitlab-ci/container/install-meson.sh
@@ -2,6 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
+# ALPINE_X86_64_BUILD_TAG
 # DEBIAN_BUILD_TAG
 # FEDORA_X86_64_BUILD_TAG