https://mesonbuild.com/Release-notes-for-1-0-0.html
This bumps the host Python minimum version requirement from 3.6 to 3.7.
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
GStreamer 1.22 will require Meson >= 0.62, which already introduced the
Python 3.7 dependency.
---
...-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 12 ++++++------
patches/{meson-0.61.4 => meson-1.0.0}/series | 0
rules/host-meson.make | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
rename patches/{meson-0.61.4 =>
meson-1.0.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
(91%)
rename patches/{meson-0.61.4 =>
meson-1.0.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (71%)
rename patches/{meson-0.61.4 => meson-1.0.0}/series (100%)
diff --git
a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from
patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to
patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index dc4b960b0302..efed46c1df60 100644
---
a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++
b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
-index c8489dafe11d..7440aa1a7c4e 100644
+index 3385dd3dcadd..7c15a212802e 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
-@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -660,7 +660,10 @@ class GnuLikeDynamicLinkerMixin:
# Need to deduplicate rpaths, as macOS's install_name_tool
# is *very* allergic to duplicate -delete_rpath arguments
# when calling depfixer on installation.
@@ -26,7 +26,7 @@ index c8489dafe11d..7440aa1a7c4e 100644
rpath_dirs_to_remove = set()
for p in all_paths:
rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
paths = padding
else:
paths = paths + ':' + padding
diff --git a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 71%
rename from patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
index f6c355728034..263e1a76b552 100644
--- a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -6,14 +6,14 @@ NEON detection is broken, so just skip it for anything that
is not ARMv7.
Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
---
- mesonbuild/modules/unstable_simd.py | 3 +++
+ mesonbuild/modules/simd.py | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/mesonbuild/modules/unstable_simd.py
b/mesonbuild/modules/unstable_simd.py
-index 3339cea5a03f..da2e740d4cd3 100644
---- a/mesonbuild/modules/unstable_simd.py
-+++ b/mesonbuild/modules/unstable_simd.py
-@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
+diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
+index a33022d0435b..d40be3443776 100644
+--- a/mesonbuild/modules/simd.py
++++ b/mesonbuild/modules/simd.py
+@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
continue
iset_fname = kwargs[iset] # Might also be an array or Files.
static_library will validate.
args = compiler.get_instruction_set_args(iset)
diff --git a/patches/meson-0.61.4/series b/patches/meson-1.0.0/series
similarity index 100%
rename from patches/meson-0.61.4/series
rename to patches/meson-1.0.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 038db5570d89..c94b885641e6 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
#
# Paths and names
#
-HOST_MESON_VERSION := 0.61.4
-HOST_MESON_MD5 := e894ff3492fd8a1ab4587b4f8e91f28f
+HOST_MESON_VERSION := 1.0.0
+HOST_MESON_MD5 := 009b78125467cd9ee4d467175a5c12e1
HOST_MESON := meson-$(HOST_MESON_VERSION)
HOST_MESON_SUFFIX := tar.gz
HOST_MESON_URL :=
https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
--
2.30.2
