gitlab-ci: Move meson back to x86_test-gl/vk ephemeral packages lists

And python3-distutils back to x86_test-gl's list.

These are not used for building Mesa, only for other components used in
test jobs.

This partially reverts commit c1a290bdd5
"meson: Bump required version to 0.52.0".

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>

.gitlab-ci/container/x86_test-base.sh

@@ -39,7 +39,6 @@ apt-get install -y --no-remove \
       libxrandr2 \
       libxrender1 \
       python \
-      python3-distutils \
       python3-mako \
       python3-numpy \
       python3-pil \
@@ -59,7 +58,4 @@ apt-get install -y --no-remove \
 apt-get purge -y \
       gnupg
 
-apt-get install -t buster-backports -y --no-remove \
-    meson
-
 apt-get autoremove -y --purge

.gitlab-ci/container/x86_test-gl.sh

@@ -22,8 +22,10 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrender-dev \
       make \
+      meson \
       patch \
       pkg-config \
+      python3-distutils \
       python3.7-dev \
       wget \
       xz-utils \

.gitlab-ci/container/x86_test-vk.sh

@@ -20,6 +20,7 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
+      meson \
       p7zip \
       pkg-config \
       python3-distutils \