* [ptxdist] [PATCH] host-meson: version bump 1.10.1 -> 1.11.1
@ 2026-07-09 11:38 Philipp Zabel
2026-07-15 10:01 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2026-07-09 11:38 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
https://mesonbuild.com/Release-notes-for-1-11-0.html
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...t-add-rpaths-for-build-directories-when-cross-co.patch | 2 +-
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 4 ++--
.../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 6 +++---
.../0004-HACK-don-t-fail-if-uic-is-missing.patch | 6 +++---
...-dependencies-trust-pkgconfig-when-looking-for-z.patch | 8 ++++----
patches/{meson-1.10.1 => meson-1.11.1}/series | 0
rules/host-meson.make | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
rename patches/{meson-1.10.1 => meson-1.11.1}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (97%)
rename patches/{meson-1.10.1 => meson-1.11.1}/0002-HACK-enable-NEON-only-for-ARMv7.patch (90%)
rename patches/{meson-1.10.1 => meson-1.11.1}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (83%)
rename patches/{meson-1.10.1 => meson-1.11.1}/0004-HACK-don-t-fail-if-uic-is-missing.patch (84%)
rename patches/{meson-1.10.1 => meson-1.11.1}/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch (77%)
rename patches/{meson-1.10.1 => meson-1.11.1}/series (100%)
diff --git a/patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 97%
rename from patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index dd5688b684f8..a3eb50245fb4 100644
--- a/patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
-index d40d5e20effe..35b77143c1cb 100644
+index cb8956adf5be..5078c08deb25 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
@@ -756,7 +756,12 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
diff --git a/patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 90%
rename from patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
index eebdaa67f407..6e01e1b5e677 100644
--- a/patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
-index 2519d531ef89..3e89fc14d5fc 100644
+index 55788e0c627b..8f06281a5516 100644
--- a/mesonbuild/modules/simd.py
+++ b/mesonbuild/modules/simd.py
-@@ -84,6 +84,9 @@ class SimdModule(ExtensionModule):
+@@ -82,6 +82,9 @@ class SimdModule(ExtensionModule):
continue
compile_args = compiler.get_instruction_set_args(iset)
diff --git a/patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
similarity index 83%
rename from patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
rename to patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
index 69f3290f8ad9..9440ea0b83f0 100644
--- a/patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
+++ b/patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
@@ -12,10 +12,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
-index b75169e4b2b0..d28fae605186 100644
+index 92bb2c632854..07bf8b6fddf0 100644
--- a/mesonbuild/modules/_qt.py
+++ b/mesonbuild/modules/_qt.py
-@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule):
+@@ -371,7 +371,7 @@ class QtBaseModule(ExtensionModule):
DEPENDENCY_METHOD_KW,
KwargInfo('required', (bool, options.UserFeatureOption), default=False),
KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
@@ -23,4 +23,4 @@ index b75169e4b2b0..d28fae605186 100644
+ default=['moc', 'uic', 'rcc'],
validator=_list_in_set_validator(_set_of_qt_tools),
since='1.6.0'),
- )
+ KwargInfo('version', ContainerTypeInfo(list, str), listify=True, default=[], since='1.11'),
diff --git a/patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
similarity index 84%
rename from patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
rename to patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
index 38f020b5b87e..51a4c337b3b2 100644
--- a/patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
+++ b/patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
@@ -15,10 +15,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
-index d28fae605186..f167f8b5e534 100644
+index 07bf8b6fddf0..7e54cb21a2a4 100644
--- a/mesonbuild/modules/_qt.py
+++ b/mesonbuild/modules/_qt.py
-@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule):
+@@ -371,7 +371,7 @@ class QtBaseModule(ExtensionModule):
DEPENDENCY_METHOD_KW,
KwargInfo('required', (bool, options.UserFeatureOption), default=False),
KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
@@ -26,4 +26,4 @@ index d28fae605186..f167f8b5e534 100644
+ default=['moc', 'rcc'],
validator=_list_in_set_validator(_set_of_qt_tools),
since='1.6.0'),
- )
+ KwargInfo('version', ContainerTypeInfo(list, str), listify=True, default=[], since='1.11'),
diff --git a/patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
similarity index 77%
rename from patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
rename to patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
index 0566e12b3dc0..dc23fb0f3b1a 100644
--- a/patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
+++ b/patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
@@ -10,15 +10,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
-index 4d219a58967f..85f6e2502941 100644
+index 4b043a07e82f..eb47b0f792a9 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
-@@ -818,7 +818,7 @@ packages['gmock'] = gmock_factory = DependencyFactory(
+@@ -822,7 +822,7 @@ packages['gmock'] = gmock_factory = DependencyFactory(
packages['zlib'] = zlib_factory = DependencyFactory(
'zlib',
- [DependencyMethods.PKGCONFIG, DependencyMethods.CMAKE, DependencyMethods.SYSTEM],
+ [DependencyMethods.PKGCONFIG],
- cmake_name='ZLIB',
- system_class=ZlibSystemDependency,
+ cmake=DependencyCandidate.from_dependency('ZLIB', CMakeDependency),
+ system=ZlibSystemDependency,
)
diff --git a/patches/meson-1.10.1/series b/patches/meson-1.11.1/series
similarity index 100%
rename from patches/meson-1.10.1/series
rename to patches/meson-1.11.1/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 6dca6e01b25f..8ad9f566bd91 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 := 1.10.1
-HOST_MESON_SHA256 := c42296f12db316a4515b9375a5df330f2e751ccdd4f608430d41d7d6210e4317
+HOST_MESON_VERSION := 1.11.1
+HOST_MESON_SHA256 := 6788ae299979643f8d841bcaf64352558436cae45a0355148a3aeeccf7913866
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.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] host-meson: version bump 1.10.1 -> 1.11.1
2026-07-09 11:38 [ptxdist] [PATCH] host-meson: version bump 1.10.1 -> 1.11.1 Philipp Zabel
@ 2026-07-15 10:01 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2026-07-15 10:01 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as f998de9c3899f37d3c6f12c27d3031ccb733d02f.
Michael
[sent from post-receive hook]
On Wed, 15 Jul 2026 12:01:59 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://mesonbuild.com/Release-notes-for-1-11-0.html
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20260709113813.3082531-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 97%
> rename from patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index dd5688b684f8..a3eb50245fb4 100644
> --- a/patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-1.11.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
> -index d40d5e20effe..35b77143c1cb 100644
> +index cb8956adf5be..5078c08deb25 100644
> --- a/mesonbuild/linkers/linkers.py
> +++ b/mesonbuild/linkers/linkers.py
> @@ -756,7 +756,12 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
> diff --git a/patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 90%
> rename from patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> index eebdaa67f407..6e01e1b5e677 100644
> --- a/patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> +++ b/patches/meson-1.11.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 3 insertions(+)
>
> diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
> -index 2519d531ef89..3e89fc14d5fc 100644
> +index 55788e0c627b..8f06281a5516 100644
> --- a/mesonbuild/modules/simd.py
> +++ b/mesonbuild/modules/simd.py
> -@@ -84,6 +84,9 @@ class SimdModule(ExtensionModule):
> +@@ -82,6 +82,9 @@ class SimdModule(ExtensionModule):
> continue
>
> compile_args = compiler.get_instruction_set_args(iset)
> diff --git a/patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> similarity index 83%
> rename from patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> rename to patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> index 69f3290f8ad9..9440ea0b83f0 100644
> --- a/patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> +++ b/patches/meson-1.11.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> @@ -12,10 +12,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
> -index b75169e4b2b0..d28fae605186 100644
> +index 92bb2c632854..07bf8b6fddf0 100644
> --- a/mesonbuild/modules/_qt.py
> +++ b/mesonbuild/modules/_qt.py
> -@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule):
> +@@ -371,7 +371,7 @@ class QtBaseModule(ExtensionModule):
> DEPENDENCY_METHOD_KW,
> KwargInfo('required', (bool, options.UserFeatureOption), default=False),
> KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
> @@ -23,4 +23,4 @@ index b75169e4b2b0..d28fae605186 100644
> + default=['moc', 'uic', 'rcc'],
> validator=_list_in_set_validator(_set_of_qt_tools),
> since='1.6.0'),
> - )
> + KwargInfo('version', ContainerTypeInfo(list, str), listify=True, default=[], since='1.11'),
> diff --git a/patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> similarity index 84%
> rename from patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> rename to patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> index 38f020b5b87e..51a4c337b3b2 100644
> --- a/patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> +++ b/patches/meson-1.11.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> @@ -15,10 +15,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
> -index d28fae605186..f167f8b5e534 100644
> +index 07bf8b6fddf0..7e54cb21a2a4 100644
> --- a/mesonbuild/modules/_qt.py
> +++ b/mesonbuild/modules/_qt.py
> -@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule):
> +@@ -371,7 +371,7 @@ class QtBaseModule(ExtensionModule):
> DEPENDENCY_METHOD_KW,
> KwargInfo('required', (bool, options.UserFeatureOption), default=False),
> KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
> @@ -26,4 +26,4 @@ index d28fae605186..f167f8b5e534 100644
> + default=['moc', 'rcc'],
> validator=_list_in_set_validator(_set_of_qt_tools),
> since='1.6.0'),
> - )
> + KwargInfo('version', ContainerTypeInfo(list, str), listify=True, default=[], since='1.11'),
> diff --git a/patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
> similarity index 77%
> rename from patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
> rename to patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
> index 0566e12b3dc0..dc23fb0f3b1a 100644
> --- a/patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
> +++ b/patches/meson-1.11.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
> @@ -10,15 +10,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
> -index 4d219a58967f..85f6e2502941 100644
> +index 4b043a07e82f..eb47b0f792a9 100644
> --- a/mesonbuild/dependencies/dev.py
> +++ b/mesonbuild/dependencies/dev.py
> -@@ -818,7 +818,7 @@ packages['gmock'] = gmock_factory = DependencyFactory(
> +@@ -822,7 +822,7 @@ packages['gmock'] = gmock_factory = DependencyFactory(
>
> packages['zlib'] = zlib_factory = DependencyFactory(
> 'zlib',
> - [DependencyMethods.PKGCONFIG, DependencyMethods.CMAKE, DependencyMethods.SYSTEM],
> + [DependencyMethods.PKGCONFIG],
> - cmake_name='ZLIB',
> - system_class=ZlibSystemDependency,
> + cmake=DependencyCandidate.from_dependency('ZLIB', CMakeDependency),
> + system=ZlibSystemDependency,
> )
> diff --git a/patches/meson-1.10.1/series b/patches/meson-1.11.1/series
> similarity index 100%
> rename from patches/meson-1.10.1/series
> rename to patches/meson-1.11.1/series
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 6dca6e01b25f..8ad9f566bd91 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 := 1.10.1
> -HOST_MESON_SHA256 := c42296f12db316a4515b9375a5df330f2e751ccdd4f608430d41d7d6210e4317
> +HOST_MESON_VERSION := 1.11.1
> +HOST_MESON_SHA256 := 6788ae299979643f8d841bcaf64352558436cae45a0355148a3aeeccf7913866
> 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-07-15 10:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 11:38 [ptxdist] [PATCH] host-meson: version bump 1.10.1 -> 1.11.1 Philipp Zabel
2026-07-15 10:01 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox