Thanks, applied as 46e4099d41948fdf7a57511fdb8b3fada6b35aa6. Michael
[sent from post-receive hook] On Thu, 07 Dec 2023 12:09:57 +0100, Philipp Zabel <[email protected]> wrote: > https://mesonbuild.com/Release-notes-for-1-3-0.html > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > > b/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > similarity index 86% > rename from > patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > rename to > patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > index 8fbe58b0cd5d..6a4772ac571e 100644 > --- > a/patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > +++ > b/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py > -index edd408572be0..409e12a5b0ad 100644 > +index dbb5e57aa585..3d321cc24413 100644 > --- a/mesonbuild/linkers/linkers.py > +++ b/mesonbuild/linkers/linkers.py > -@@ -676,7 +676,10 @@ class GnuLikeDynamicLinkerMixin: > +@@ -684,7 +684,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. > @@ -23,10 +23,10 @@ index edd408572be0..409e12a5b0ad 100644 > + all_paths = > mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in > processed_rpaths]) > + else: > + all_paths = mesonlib.OrderedSet() > - rpath_dirs_to_remove = set() > + rpath_dirs_to_remove: T.Set[bytes] = set() > for p in all_paths: > rpath_dirs_to_remove.add(p.encode('utf8')) > -@@ -704,7 +707,8 @@ class GnuLikeDynamicLinkerMixin: > +@@ -712,7 +715,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > paths = padding > else: > paths = paths + ':' + padding > diff --git a/patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch > b/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > similarity index 62% > rename from patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch > rename to patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > index 6c206ee62f51..7be876034262 100644 > --- a/patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch > +++ b/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > @@ -10,16 +10,16 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py > -index 3ee0858b3287..25add8aec18e 100644 > +index b8baf39ef34a..2ce09b20d2f9 100644 > --- a/mesonbuild/modules/simd.py > +++ b/mesonbuild/modules/simd.py > -@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule): > +@@ -94,6 +94,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) > + > + compile_args = compiler.get_instruction_set_args(iset) > + cpu = state.environment.machines.host.cpu > + if iset == 'neon' and not cpu.startswith('armv7'): > -+ args = None > - if args is None: > - mlog.log('Compiler supports %s:' % iset, mlog.red('NO')) > ++ compile_args = None > + if compile_args is None: > + mlog.log(f'Compiler supports {iset}:', mlog.red('NO')) > continue > diff --git > a/patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > b/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > similarity index 96% > rename from > patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > rename to > patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > index f2e6418c7c11..28e6b90846c7 100644 > --- a/patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > +++ b/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > @@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py > -index 85558885343a..5938fbd4d650 100644 > +index 83dcf31bdfb3..b3242ceaf167 100644 > --- a/mesonbuild/modules/qt.py > +++ b/mesonbuild/modules/qt.py > @@ -278,6 +278,9 @@ class QtBaseModule(ExtensionModule): > diff --git a/patches/meson-1.2.1/series b/patches/meson-1.3.0/series > similarity index 100% > rename from patches/meson-1.2.1/series > rename to patches/meson-1.3.0/series > diff --git a/rules/host-meson.make b/rules/host-meson.make > index 4d8eb9cea4a7..aec7a539f03b 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.2.1 > -HOST_MESON_MD5 := e3cc846536189aacd7d01858a45ca9af > +HOST_MESON_VERSION := 1.3.0 > +HOST_MESON_MD5 := 35dc15e4f94ca5fd30dbe2d88a672254 > 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)
