mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] host-meson: version bump 1.5.2 -> 1.6.0
@ 2024-10-21 13:18 Philipp Zabel
  2024-10-30  8:00 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2024-10-21 13:18 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

https://mesonbuild.com/Release-notes-for-1-6-0.html

The Qt module now allows to specify which tools are required via
the tools kwarg of qt_mod.has_tools(). Patches 3 and 4 are updated
to modify the default value of this parameter. They can be dropped
once all users, such as gst-plugins-good1, make use of it.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...CK-don-t-fail-if-lrelease-is-missing.patch | 26 -----------------
 ...04-HACK-don-t-fail-if-uic-is-missing.patch | 29 -------------------
 ...-for-build-directories-when-cross-co.patch |  8 ++---
 ...0002-HACK-enable-NEON-only-for-ARMv7.patch |  0
 ...CK-don-t-fail-if-lrelease-is-missing.patch | 26 +++++++++++++++++
 ...04-HACK-don-t-fail-if-uic-is-missing.patch | 29 +++++++++++++++++++
 patches/{meson-1.5.2 => meson-1.6.0}/series   |  0
 rules/host-meson.make                         |  4 +--
 8 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
 delete mode 100644 patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch
 rename patches/{meson-1.5.2 => meson-1.6.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (86%)
 rename patches/{meson-1.5.2 => meson-1.6.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%)
 create mode 100644 patches/meson-1.6.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
 create mode 100644 patches/meson-1.6.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
 rename patches/{meson-1.5.2 => meson-1.6.0}/series (100%)

diff --git a/patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
deleted file mode 100644
index f88b2300c819..000000000000
--- a/patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 7 Jun 2023 11:42:46 +0200
-Subject: [PATCH] HACK: don't fail if lrelease is missing
-
-PTXdist does not currently build lrelease for Qt6 so this is always
-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 +++
- 1 file changed, 3 insertions(+)
-
-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():
-             if not tool.found():
-+                if tool.name == 'lrelease':
-+                    mlog.warning('Ignoring missing lrelease')
-+                    continue
-                 if required:
-                     raise MesonException('Qt tools not found')
-                 return False
diff --git a/patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch
deleted file mode 100644
index 2b74b24039b0..000000000000
--- a/patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Michael Tretter <m.tretter@pengutronix.de>
-Date: Tue, 12 Mar 2024 18:22:06 +0100
-Subject: [PATCH] HACK: don't fail if uic is missing
-
-Qt5 builds the uic only if Widgets are enabled. The uic is not required
-for applications that don't use Widgets, but is required as standard
-tool by meson.
-
-Ignore uic if it is not found.
-
-Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
----
- mesonbuild/modules/_qt.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-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')
-                     continue
-+                if tool.name == 'uic':
-+                    mlog.warning('Ignoring missing uic')
-+                    continue
-                 if required:
-                     raise MesonException('Qt tools not found')
-                 return False
diff --git a/patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.6.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 86%
rename from patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to patches/meson-1.6.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index ab2020e23783..a9b8cf732084 100644
--- a/patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-1.6.0/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 4eec82edd177..92ef9669cfeb 100644
+index c4df0fa1d893..50e11175e413 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -674,7 +674,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
+@@ -677,7 +677,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 4eec82edd177..92ef9669cfeb 100644
          rpath_dirs_to_remove: T.Set[bytes] = set()
          for p in all_paths:
              rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -702,7 +705,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
+@@ -705,7 +708,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
                  paths = padding
              else:
                  paths = paths + ':' + padding
@@ -35,4 +35,4 @@ index 4eec82edd177..92ef9669cfeb 100644
 +            args.extend(self._apply_prefix('-rpath,' + paths))
  
          # TODO: should this actually be "for solaris/sunos"?
-         if mesonlib.is_sunos():
+         # NOTE: Remove the zigcc check once zig support "-rpath-link"
diff --git a/patches/meson-1.5.2/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.6.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 100%
rename from patches/meson-1.5.2/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.6.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
diff --git a/patches/meson-1.6.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.6.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
new file mode 100644
index 000000000000..d07dd5b568fc
--- /dev/null
+++ b/patches/meson-1.6.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
@@ -0,0 +1,26 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 7 Jun 2023 11:42:46 +0200
+Subject: [PATCH] HACK: don't fail if lrelease is missing
+
+PTXdist does not currently build lrelease for Qt6 so this is always
+missing. It's not needed in most cases, so just ignore it.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ mesonbuild/modules/_qt.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
+index 9f10c58266a5..b11127548d00 100644
+--- a/mesonbuild/modules/_qt.py
++++ b/mesonbuild/modules/_qt.py
+@@ -269,7 +269,7 @@ class QtBaseModule(ExtensionModule):
+         KwargInfo('required', (bool, options.UserFeatureOption), default=False),
+         KwargInfo('method', str, default='auto'),
+         KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
+-                  default=['moc', 'uic', 'rcc', 'lrelease'],
++                  default=['moc', 'uic', 'rcc'],
+                   validator=_list_in_set_validator(_set_of_qt_tools),
+                   since='1.6.0'),
+     )
diff --git a/patches/meson-1.6.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.6.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
new file mode 100644
index 000000000000..795d9d6de796
--- /dev/null
+++ b/patches/meson-1.6.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
@@ -0,0 +1,29 @@
+From: Michael Tretter <m.tretter@pengutronix.de>
+Date: Tue, 12 Mar 2024 18:22:06 +0100
+Subject: [PATCH] HACK: don't fail if uic is missing
+
+Qt5 builds the uic only if Widgets are enabled. The uic is not required
+for applications that don't use Widgets, but is required as standard
+tool by meson.
+
+Ignore uic if it is not found.
+
+Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ mesonbuild/modules/_qt.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
+index b11127548d00..19a3266a09af 100644
+--- a/mesonbuild/modules/_qt.py
++++ b/mesonbuild/modules/_qt.py
+@@ -269,7 +269,7 @@ class QtBaseModule(ExtensionModule):
+         KwargInfo('required', (bool, options.UserFeatureOption), default=False),
+         KwargInfo('method', str, default='auto'),
+         KwargInfo('tools', ContainerTypeInfo(list, str), listify=True,
+-                  default=['moc', 'uic', 'rcc'],
++                  default=['moc', 'rcc'],
+                   validator=_list_in_set_validator(_set_of_qt_tools),
+                   since='1.6.0'),
+     )
diff --git a/patches/meson-1.5.2/series b/patches/meson-1.6.0/series
similarity index 100%
rename from patches/meson-1.5.2/series
rename to patches/meson-1.6.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 8835367be758..868d43d0c508 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.5.2
-HOST_MESON_MD5		:= 682f75ef96c2e7542b0148e70068ea09
+HOST_MESON_VERSION	:= 1.6.0
+HOST_MESON_MD5		:= 0031ea392f8ef97eeadfe1906c5cc5b4
 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




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-30  8:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-21 13:18 [ptxdist] [PATCH] host-meson: version bump 1.5.2 -> 1.6.0 Philipp Zabel
2024-10-30  8:00 ` [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