Require meson version 1.5.0

This is needed for Rust support.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Link: https://lore.kernel.org/r/74e1eb4b13717d061c5ad9c198bf56951fbfc14f.1727961605.git.manos.pitsidianakis@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/meson.build b/meson.build
index 67d045eb5af10083753666da6a278cc9bc10ab29..e6a65463ff9685e889fca92b56628e37a2dc0577 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('qemu', ['c'], meson_version: '>=1.1.0',
+project('qemu', ['c'], meson_version: '>=1.5.0',
         default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
                           'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
         version: files('VERSION'))

diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py
index 07aff97ccad4f6fdbaa1de284174909821e01bf9..0405e910b481ace39548827602ef7ad2f80b63b2 100755 (executable)
--- a/python/scripts/vendor.py
+++ b/python/scripts/vendor.py
@@ -41,8 +41,8 @@ def main() -> int:
     parser.parse_args()
 
     packages = {
-        "meson==1.2.3":
-        "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1",
+        "meson==1.5.0":
+        "52b34f4903b882df52ad0d533146d4b992c018ea77399f825579737672ae7b20",
     }
 
     vendor_dir = Path(__file__, "..", "..", "wheels").resolve()

diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl
deleted file mode 100644 (file)
index a8b84e5..0000000
Binary files a/python/wheels/meson-1.2.3-py3-none-any.whl and /dev/null differ

diff --git a/python/wheels/meson-1.5.0-py3-none-any.whl b/python/wheels/meson-1.5.0-py3-none-any.whl
new file mode 100644 (file)
index 0000000..c7edeb3
Binary files /dev/null and b/python/wheels/meson-1.5.0-py3-none-any.whl differ

diff --git a/pythondeps.toml b/pythondeps.toml
index 0a7f69b196be829326683dc4a64e7ff3eae63599..c03c9df81b5c31a8eaf8e85a72953a7d6dd8c3cf 100644 (file)
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -19,7 +19,7 @@
 
 [meson]
 # The install key should match the version in python/wheels/
-meson = { accepted = ">=1.1.0", installed = "1.2.3", canary = "meson" }
+meson = { accepted = ">=1.5.0", installed = "1.5.0", canary = "meson" }
 pycotap = { accepted = ">=1.1.0", installed = "1.3.1" }
 
 [docs]

diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 66143621fe76f22936e918102c0c146f11458bdb..a64fcacae24a2d042ffb03bd8a7f3416695faef4 100644 (file)
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -127,7 +127,7 @@ RUN zypper update -y && \
 
 RUN /usr/bin/pip3.11 install \
                      PyYAML \
-                     meson==0.63.2 \
+                     meson==1.5.0 \
                      pillow \
                      sphinx \
                      sphinx-rtd-theme

diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index 0ab3a89013470e4edf25e412e17d66e64906fb0a..9c5ac87c1c2f68580692640fd2434a11a4db78c1 100644 (file)
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -89,7 +89,7 @@ mappings:
 pypi_mappings:
   # Request more recent version
   meson:
-    default: meson==0.63.2
+    default: meson==1.5.0
 
   # Drop packages that need devel headers
   python3-numpy: