Commit 4c8c132036 for qemu.org

commit 4c8c1320367a5b84864700d4634a8f07aed4753a
Author: Paolo Bonzini <pbonzini@redhat.com>
Date:   Thu Aug 13 10:27:10 2026 +0200

    python, meson: update meson required for Rust to 1.12.0

    Meson 1.11.0 brings support for parsing Cargo.toml inside QEMU's source
    tree, and Meson 1.12.0 brings support for cross-compilation of Cargo
    subprojects.

    Together, these two features allow QEMU to remove hundreds of lines of
    manual compilation scripts.

    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/configure b/configure
index 6ddfe4b534..7f637c018c 100755
--- a/configure
+++ b/configure
@@ -1166,12 +1166,12 @@ fi
 # detect rust triple

 meson_version=$($meson --version)
-if test "$rust" != disabled && ! version_ge "$meson_version" 1.10.0; then
+if test "$rust" != disabled && ! version_ge "$meson_version" 1.12.0; then
   if test "$rust" = enabled; then
     $mkvenv ensuregroup --dir "${source_path}/python/wheels" \
          ${source_path}/pythondeps.toml meson-rust || exit 1
   else
-    echo "Rust needs Meson 1.10.0, disabling" 2>&1
+    echo "Rust needs Meson 1.12.0, disabling" 2>&1
     rust=disabled
   fi
 fi
diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py
index 1bb59d863a..9b4c763f9e 100755
--- a/python/scripts/vendor.py
+++ b/python/scripts/vendor.py
@@ -41,8 +41,8 @@ def main() -> int:
     parser.parse_args()

     packages = {
-        "meson==1.11.1":
-        "9b3a023657e393dbc5335b95c561337d49b7a458f5541e47ec44f2cc566e0d80",
+        "meson==1.12.0":
+        "71f133147fa0fcfe8f4df49fa1045771064947834538409e5d97b3613aac8b4e",
         "qemu.qmp==0.0.6":
         "5d7c5af0e9de427696e3bf72e333965c3a697929f77f6b7ddc30c989fc7b539b",
         "pycotap==1.3.1":
diff --git a/python/wheels/meson-1.11.1-py3-none-any.whl b/python/wheels/meson-1.11.1-py3-none-any.whl
deleted file mode 100644
index 8dc3c9f2f6..0000000000
Binary files a/python/wheels/meson-1.11.1-py3-none-any.whl and /dev/null differ
diff --git a/python/wheels/meson-1.12.0-py3-none-any.whl b/python/wheels/meson-1.12.0-py3-none-any.whl
new file mode 100644
index 0000000000..0b764d238f
Binary files /dev/null and b/python/wheels/meson-1.12.0-py3-none-any.whl differ
diff --git a/pythondeps.toml b/pythondeps.toml
index bef88d49a6..061f0cff0c 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -19,12 +19,12 @@

 [meson]
 # The install key should match the version in python/wheels/
-meson = { accepted = ">=1.5.0", installed = "1.11.1", canary = "meson" }
+meson = { accepted = ">=1.5.0", installed = "1.12.0", canary = "meson" }
 pycotap = { accepted = ">=1.1.0", installed = "1.3.1" }

 [meson-rust]
 # The install key should match the version in python/wheels/
-meson = { accepted = ">=1.11.0", installed = "1.11.1", canary = "meson" }
+meson = { accepted = ">=1.12.0", installed = "1.12.0", canary = "meson" }

 [docs]
 # Please keep the installed versions in sync with docs/requirements.txt