Re: [ptxdist] [APPLIED] host-meson: version bump 1.4.0 -> 1.5.1

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 36cc3fab77eaf092168367cdf34178accf4d0f53.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:50 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://mesonbuild.com/Release-notes-for-1-5-0.html
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240816094850.669078-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 90%
> rename from patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index 2f8fb33ec671..80b7f8e38a96 100644
> --- a/patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 6 insertions(+), 2 deletions(-)
>  
>  diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
> -index 2048268193a5..49d6ee2f2d81 100644
> +index c3750ccc372f..5f37eaac68ed 100644
>  --- a/mesonbuild/linkers/linkers.py
>  +++ b/mesonbuild/linkers/linkers.py
> -@@ -671,7 +671,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
> +@@ -674,7 +674,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
>           # 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 2048268193a5..49d6ee2f2d81 100644
>           rpath_dirs_to_remove: T.Set[bytes] = set()
>           for p in all_paths:
>               rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -699,7 +702,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
> +@@ -702,7 +705,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
>                   paths = padding
>               else:
>                   paths = paths + ':' + padding
> diff --git a/patches/meson-1.4.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.5.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 100%
> rename from patches/meson-1.4.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-1.5.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> diff --git a/patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.5.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> similarity index 79%
> rename from patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> rename to patches/meson-1.5.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> index c6654d3e5c65..f88b2300c819 100644
> --- a/patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> +++ b/patches/meson-1.5.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> @@ -7,13 +7,13 @@ missing. It's not needed in most cases, so just ignore it.
>  
>  Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>  ---
> - mesonbuild/modules/qt.py | 3 +++
> + mesonbuild/modules/_qt.py | 3 +++
>   1 file changed, 3 insertions(+)
>  
> -diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
> -index 7effa1f58401..c16d8c603ce7 100644
> ---- a/mesonbuild/modules/qt.py
> -+++ b/mesonbuild/modules/qt.py
> +diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
> +index ebb8a3994097..2fab8d319169 100644
> +--- a/mesonbuild/modules/_qt.py
> ++++ b/mesonbuild/modules/_qt.py
>  @@ -271,6 +271,9 @@ class QtBaseModule(ExtensionModule):
>           self._detect_tools(state, method, required=False)
>           for tool in self.tools.values():
> diff --git a/patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.5.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> similarity index 80%
> rename from patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
> rename to patches/meson-1.5.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> index 008f602a061e..2b74b24039b0 100644
> --- a/patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
> +++ b/patches/meson-1.5.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> @@ -10,13 +10,13 @@ Ignore uic if it is not found.
>  
>  Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
>  ---
> - mesonbuild/modules/qt.py | 3 +++
> + mesonbuild/modules/_qt.py | 3 +++
>   1 file changed, 3 insertions(+)
>  
> -diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
> -index c16d8c603ce7..20ca4810edc5 100644
> ---- a/mesonbuild/modules/qt.py
> -+++ b/mesonbuild/modules/qt.py
> +diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
> +index 2fab8d319169..2790fe0e2da6 100644
> +--- a/mesonbuild/modules/_qt.py
> ++++ b/mesonbuild/modules/_qt.py
>  @@ -274,6 +274,9 @@ class QtBaseModule(ExtensionModule):
>                   if tool.name == 'lrelease':
>                       mlog.warning('Ignoring missing lrelease')
> diff --git a/patches/meson-1.4.0/series b/patches/meson-1.5.1/series
> similarity index 100%
> rename from patches/meson-1.4.0/series
> rename to patches/meson-1.5.1/series
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index d03a350cb3c3..1f8700443bd6 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.4.0
> -HOST_MESON_MD5		:= a5cddd4299ead830106242c53ea7f10f
> +HOST_MESON_VERSION	:= 1.5.1
> +HOST_MESON_MD5		:= c4f2b3e5ea632685f61ba1b833c4905c
>  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)