meson: Bump required version to 0.52.0

This matches what other graphics space projects require now, and allows
us to simplify a number of cases, as well as make use of new features in
meson.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2737
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>

.gitlab-ci/container/arm_build.sh

@@ -41,10 +41,10 @@ apt-get -y install \
 	libvulkan-dev:armhf \
 	llvm-7-dev:armhf \
 	llvm-8-dev \
-	meson \
 	pkg-config \
 	python \
 	python3-distutils \
+	python3-setuptools \
 	python3-mako \
 	python3-serial \
 	unzip \
@@ -52,6 +52,9 @@ apt-get -y install \
 	xz-utils \
 	zlib1g-dev
 
+apt install -y --no-remove -t buster-backports \
+    meson
+
 . .gitlab-ci/container/container_pre_build.sh
 
 # dependencies where we want a specific version
@@ -72,7 +75,6 @@ DEBIAN_ARCH=arm64 . .gitlab-ci/container/lava_arm.sh
 DEBIAN_ARCH=armhf . .gitlab-ci/container/lava_arm.sh
 
 apt-get purge -y \
-        python3-distutils \
         wget
 
 . .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/arm_test.sh

@@ -30,7 +30,6 @@ apt-get install -y --no-remove \
         fastboot \
         flex \
         git \
-        meson \
         netcat \
         python3-distutils \
         python3-minimal \
@@ -41,6 +40,9 @@ apt-get install -y --no-remove \
         u-boot-tools \
         unzip
 
+apt install -t buster-backports -y --no-remove \
+    meson
+
 # Cross-build test deps
 for arch in $CROSS_ARCHITECTURES; do
     apt-get install -y --no-remove \

.gitlab-ci/container/x86_build.sh

@@ -80,7 +80,6 @@ apt-get install -y --no-remove \
       llvm-6.0-dev \
       llvm-7-dev \
       llvm-9-dev \
-      meson \
       pkg-config \
       python-mako \
       python3-mako \
@@ -95,7 +94,8 @@ apt-get install -y --no-remove \
       zlib1g-dev
 
 apt-get install -y --no-remove -t buster-backports \
-      libclang-8-dev
+      libclang-8-dev \
+      meson
 
 # Cross-build Mesa deps
 for arch in $CROSS_ARCHITECTURES; do

.gitlab-ci/container/x86_build_old.sh

@@ -45,14 +45,20 @@ apt-get install -y --no-remove \
       llvm-3.9-dev \
       llvm-4.0-dev \
       llvm-5.0-dev \
-      meson \
+      ninja-build \
       pkg-config \
       python-mako \
       python3-mako \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
       scons \
       xz-utils \
       zlib1g-dev
 
+# We need at least 0.52.0, which is not in stretch
+python3 -m pip install meson>=0.52
+
 . .gitlab-ci/container/container_pre_build.sh
 
 ############### Uninstall unused packages

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

@@ -14,6 +14,7 @@ apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
 echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
 
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list
 
 apt-get update
@@ -47,6 +48,7 @@ apt-get install -y --no-remove \
       libxrandr2 \
       libxrender1 \
       python \
+      python3-distutils \
       python3-mako \
       python3-numpy \
       python3-pil \
@@ -66,4 +68,7 @@ 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

@@ -21,10 +21,8 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrender-dev \
       make \
-      meson \
       patch \
       pkg-config \
-      python3-distutils \
       python3.7-dev \
       wget \
       xz-utils \
@@ -44,7 +42,6 @@ apt-get install -y --no-remove \
 apt-get install -y -t testing \
       $TESTING_EPHEMERAL
 
-
 . .gitlab-ci/container/container_pre_build.sh
 
 ############### Build virglrenderer

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

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