meson,ci: bump meson req for rusticl to 1.2

Signed-off-by: Karol Herbst <git@karolherbst.de>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21451>

.gitlab-ci/container/debian/x86_64_build-base.sh

@@ -58,7 +58,6 @@ apt-get install -y --no-remove \
         libxxf86vm-dev \
         libwayland-egl-backend-dev \
         make \
-        meson \
         ninja-build \
         openssh-server \
         pkgconf \
@@ -80,6 +79,9 @@ apt-get install -y --no-remove \
 # Needed for ci-fairy, this revision is able to upload files to S3
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
+# We need at least 1.2 for Rust's `debug_assertions`
+pip3 install --break-system-packages meson==1.2.0
+
 . .gitlab-ci/container/build-rust.sh
 
 . .gitlab-ci/container/debian/x86_64_build-base-wine.sh

.gitlab-ci/container/fedora/x86_64_build.sh

@@ -14,6 +14,7 @@ EPHEMERAL=(
         "pkgconfig(epoxy)"
         "pkgconfig(gbm)"
         "pkgconfig(openssl)"
+        python3-pip
         unzip
         xz
 )
@@ -30,7 +31,7 @@ DEPS=(
     glslang
     kernel-headers
     llvm-devel
-    meson
+    ninja-build
     "pkgconfig(LLVMSPIRVLib)"
     "pkgconfig(SPIRV-Tools)"
     "pkgconfig(dri2proto)"
@@ -90,6 +91,9 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
+# We need at least 1.2 for Rust's `debug_assertions`
+pip install meson==1.2.0
+
 . .gitlab-ci/container/build-mold.sh
 
 . .gitlab-ci/container/build-libdrm.sh

.gitlab-ci/image-tags.yml

@@ -1,6 +1,6 @@
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2023-07-11-dekernelize"
+   DEBIAN_BASE_TAG: "2023-07-26-meson-1.2"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "2023-06-24-agility-711"
@@ -20,7 +20,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
-   FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
+   FEDORA_X86_64_BUILD_TAG: "2023-07-26-meson-1.2"
    KERNEL_ROOTFS_TAG: "2023-07-24-piglit-ed58dfbd"
    KERNEL_TAG: "v6.3.13-for-mesa-ci-a7f02a9f9591"
 

docs/rusticl.rst

@@ -30,7 +30,7 @@ To build Rusticl you need to satisfy the following build dependencies:
 The minimum versions to build Rusticl are:
 
 -  Rust: 1.60
--  Meson: 1.0.0
+-  Meson: 1.2.0
 -  Bindgen: 0.62.0
 -  LLVM: 11.0.0 (recommended: 15.0.0)
 -  SPIRV-Tools: any version (recommended: v2022.3)

meson.build

@@ -764,8 +764,8 @@ if with_gallium_rusticl
     error('rusticl requires at least one gallium driver.')
   endif
 
-  if meson.version().version_compare('< 1.0.0')
+  if meson.version().version_compare('< 1.2')
-    error('rusticl requires meson 1.0.0 or newer')
+    error('rusticl requires meson 1.2.0 or newer')
   endif
 
   add_languages('rust', required: true)