From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 11 Mar 2025 15:10:23 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1ts0JL-00Chle-27 for lore@lore.pengutronix.de; Tue, 11 Mar 2025 15:10:23 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ts0JK-0002Gq-RS; Tue, 11 Mar 2025 15:10:22 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ts0J3-00027n-J7; Tue, 11 Mar 2025 15:10:05 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Tue, 11 Mar 2025 15:10:05 +0100 Message-Id: <20250311141005.4116533-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] meson: version bump 1.6.1 -> 1.7.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://mesonbuild.com/Release-notes-for-1-7-0.html Signed-off-by: Philipp Zabel --- The lrelease patch can be dropped after updating GStreamer to 1.26 [1], but uic is still explicitly requested. [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7937 --- ...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++--- .../0002-HACK-enable-NEON-only-for-ARMv7.patch | 0 .../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 4 ++-- .../0004-HACK-don-t-fail-if-uic-is-missing.patch | 4 ++-- ...CK-dependencies-trust-pkgconfig-when-looking-for-z.patch | 0 patches/{meson-1.6.1 => meson-1.7.0}/series | 0 rules/host-meson.make | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename patches/{meson-1.6.1 => meson-1.7.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (90%) rename patches/{meson-1.6.1 => meson-1.7.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%) rename patches/{meson-1.6.1 => meson-1.7.0}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (91%) rename patches/{meson-1.6.1 => meson-1.7.0}/0004-HACK-don-t-fail-if-uic-is-missing.patch (91%) rename patches/{meson-1.6.1 => meson-1.7.0}/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch (100%) rename patches/{meson-1.6.1 => meson-1.7.0}/series (100%) diff --git a/patches/meson-1.6.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch similarity index 90% rename from patches/meson-1.6.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch rename to patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch index a9b8cf732084..1376f3feb3c9 100644 --- a/patches/meson-1.6.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch +++ b/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py -index c4df0fa1d893..50e11175e413 100644 +index 176fb3348204..a1f1e0c2d87b 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py -@@ -677,7 +677,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): +@@ -698,7 +698,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 c4df0fa1d893..50e11175e413 100644 rpath_dirs_to_remove: T.Set[bytes] = set() for p in all_paths: rpath_dirs_to_remove.add(p.encode('utf8')) -@@ -705,7 +708,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): +@@ -728,7 +731,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): paths = padding else: paths = paths + ':' + padding diff --git a/patches/meson-1.6.1/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch similarity index 100% rename from patches/meson-1.6.1/0002-HACK-enable-NEON-only-for-ARMv7.patch rename to patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch diff --git a/patches/meson-1.6.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch similarity index 91% rename from patches/meson-1.6.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch rename to patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch index d07dd5b568fc..5386dde3f75e 100644 --- a/patches/meson-1.6.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch +++ b/patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch @@ -12,10 +12,10 @@ Signed-off-by: Philipp Zabel 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py -index 9f10c58266a5..b11127548d00 100644 +index 7d52842f9dd4..e9b0001a0186 100644 --- a/mesonbuild/modules/_qt.py +++ b/mesonbuild/modules/_qt.py -@@ -269,7 +269,7 @@ class QtBaseModule(ExtensionModule): +@@ -368,7 +368,7 @@ class QtBaseModule(ExtensionModule): KwargInfo('required', (bool, options.UserFeatureOption), default=False), KwargInfo('method', str, default='auto'), KwargInfo('tools', ContainerTypeInfo(list, str), listify=True, diff --git a/patches/meson-1.6.1/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch similarity index 91% rename from patches/meson-1.6.1/0004-HACK-don-t-fail-if-uic-is-missing.patch rename to patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch index 795d9d6de796..e7d0cc779b63 100644 --- a/patches/meson-1.6.1/0004-HACK-don-t-fail-if-uic-is-missing.patch +++ b/patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch @@ -15,10 +15,10 @@ Signed-off-by: Philipp Zabel 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py -index b11127548d00..19a3266a09af 100644 +index e9b0001a0186..eb40463aaf0d 100644 --- a/mesonbuild/modules/_qt.py +++ b/mesonbuild/modules/_qt.py -@@ -269,7 +269,7 @@ class QtBaseModule(ExtensionModule): +@@ -368,7 +368,7 @@ class QtBaseModule(ExtensionModule): KwargInfo('required', (bool, options.UserFeatureOption), default=False), KwargInfo('method', str, default='auto'), KwargInfo('tools', ContainerTypeInfo(list, str), listify=True, diff --git a/patches/meson-1.6.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch similarity index 100% rename from patches/meson-1.6.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch rename to patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch diff --git a/patches/meson-1.6.1/series b/patches/meson-1.7.0/series similarity index 100% rename from patches/meson-1.6.1/series rename to patches/meson-1.7.0/series diff --git a/rules/host-meson.make b/rules/host-meson.make index 16b5398c7008..ca7649b00f2d 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.6.1 -HOST_MESON_MD5 := 397e29700c71f69d70fd2b5898620177 +HOST_MESON_VERSION := 1.7.0 +HOST_MESON_MD5 := c20f3e5ebbb007352d22f4fd6ceb925c 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.39.5