All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1
@ 2024-12-13 11:58 Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS Roy Kollen Svendsen
                   ` (7 more replies)
  0 siblings, 8 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

For details see:
 - https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.1/release-note.md
 - https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.0/release-note.md

qt6serialport:
 - Fix legal-info. LICENSES/Qt-GPL-exception-1.0.txt was removed from
 Qt6 Serial Port. This broke make qt6serialport-legal-info, so we had to
 do some minor modification to the qt6serialport package.

qt6declarative:
 - Remove patch from qt6declarative, since it's already included in this
 version.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/qt6.mk                            |  4 +--
 package/qt6/qt6base/qt6base.hash              |  6 ++--
 package/qt6/qt6charts/qt6charts.hash          |  4 +--
 .../qt6/qt6core5compat/qt6core5compat.hash    |  4 +--
 ...1-Fix-build-with--no-feature-network.patch | 28 -------------------
 .../qt6/qt6declarative/qt6declarative.hash    |  4 +--
 .../qt6languageserver/qt6languageserver.hash  |  4 +--
 package/qt6/qt6mqtt/qt6mqtt.hash              |  2 +-
 package/qt6/qt6opcua/qt6opcua.hash            |  2 +-
 package/qt6/qt6scxml/qt6scxml.hash            |  4 +--
 package/qt6/qt6serialbus/qt6serialbus.hash    |  4 +--
 package/qt6/qt6serialport/qt6serialport.hash  |  5 ++--
 package/qt6/qt6serialport/qt6serialport.mk    |  3 +-
 .../qt6/qt6shadertools/qt6shadertools.hash    |  4 +--
 package/qt6/qt6svg/qt6svg.hash                |  4 +--
 package/qt6/qt6tools/qt6tools.hash            |  4 +--
 .../qt6virtualkeyboard.hash                   |  4 +--
 package/qt6/qt6wayland/qt6wayland.hash        |  4 +--
 package/qt6/qt6websockets/qt6websockets.hash  |  4 +--
 19 files changed, 34 insertions(+), 64 deletions(-)
 delete mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch

diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 56c5a413ad..33cbf7551f 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-QT6_VERSION_MAJOR = 6.7
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.8
+QT6_VERSION = $(QT6_VERSION_MAJOR).1
 QT6_SOURCE_TARBALL_PREFIX = everywhere-src
 QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules
 
diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash
index 695c1134c8..94269047c5 100644
--- a/package/qt6/qt6base/qt6base.hash
+++ b/package/qt6/qt6base/qt6base.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtbase-everywhere-src-6.7.3.tar.xz.sha256
-sha256  8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtbase-everywhere-src-6.8.1.tar.xz.sha256
+sha256  40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf  qtbase-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files
 sha256  e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb  LICENSES/Apache-2.0.txt
@@ -11,4 +11,4 @@ sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENS
 sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  LICENSES/LGPL-3.0-only.txt
 sha256  d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc  LICENSES/MIT.txt
 sha256  40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2  LICENSES/Qt-GPL-exception-1.0.txt
-sha256  2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216  src/3rdparty/harfbuzz-ng/COPYING
+sha256  ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64  src/3rdparty/harfbuzz-ng/COPYING
diff --git a/package/qt6/qt6charts/qt6charts.hash b/package/qt6/qt6charts/qt6charts.hash
index fbeb580f29..215d18c576 100644
--- a/package/qt6/qt6charts/qt6charts.hash
+++ b/package/qt6/qt6charts/qt6charts.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtcharts-everywhere-src-6.7.3.tar.xz.sha256
-sha256  07ea63a550e6bcfa4a9c38056f7aa524357305572268fe26f6063d83e4233659  qtcharts-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtcharts-everywhere-src-6.8.1.tar.xz.sha256
+sha256  2edea3f16e248ef508d99332798645b7f5ab6edbbf2e3d7d78fb674156f07d29  qtcharts-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0d8b1cf5d8..ba13da8d4e 100644
--- a/package/qt6/qt6core5compat/qt6core5compat.hash
+++ b/package/qt6/qt6core5compat/qt6core5compat.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qt5compat-everywhere-src-6.7.3.tar.xz.sha256
-sha256  8b6a68a3dfaa7e9d10a0dafccee594c72e8de061bc573ae86b1c081b423a53f0  qt5compat-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qt5compat-everywhere-src-6.8.1.tar.xz.sha256
+sha256  05c8c088b4cd8331fa8a9c8b7ff7c42a088cb112e673eae5708048d0131264fc  qt5compat-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
deleted file mode 100644
index bef5794229..0000000000
--- a/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8377691a0998fd84e6fc8349a5db450bf2d79164 Mon Sep 17 00:00:00 2001
-From: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
-Date: Tue, 21 Nov 2023 23:58:43 +0900
-Subject: Fix build with -no-feature-network
-
-Change-Id: Ib21012301da6afb5458f707b39a9a8079d93eb93
-Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-Upstream: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=8377691a0998fd84e6fc8349a5db450bf2d79164
-Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
----
- src/qml/configure.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake
-index 2d0434643a..d1ff90bd54 100644
---- a/src/qml/configure.cmake
-+++ b/src/qml/configure.cmake
-@@ -82,7 +82,7 @@ qt_feature("qml-ssl" PUBLIC
-     SECTION "QML"
-     LABEL "QML SSL support"
-     PURPOSE "Provides ssl support in QML."
--    CONDITION QT_FEATURE_ssl
-+    CONDITION QT_FEATURE_qml_network AND QT_FEATURE_ssl
- )
- 
- # On arm and arm64 we need a specialization of cacheFlush() for each OS to be
--- 
-cgit v1.2.3
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
index 473b9b6baf..81b8ca929b 100644
--- a/package/qt6/qt6declarative/qt6declarative.hash
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtdeclarative-everywhere-src-6.7.3.tar.xz.sha256
-sha256  937b70e441abf5bc4e50d44d26610e2714a28514acf3885cd36116cd610b9875  qtdeclarative-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtdeclarative-everywhere-src-6.8.1.tar.xz.sha256
+sha256  95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc  qtdeclarative-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
index e328cac5e4..a330ecb323 100644
--- a/package/qt6/qt6languageserver/qt6languageserver.hash
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtlanguageserver-everywhere-src-6.7.3.tar.xz.sha256
-sha256  c56d3872428503d9e49bfc6fa1023332f035ffd711d39e904e50cd6bb1f9df8f  qtlanguageserver-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtlanguageserver-everywhere-src-6.8.1.tar.xz.sha256
+sha256  865e9436c1432a53e38a30625b6cee60bf72553ff508047115513a233c8e6d7e  qtlanguageserver-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
index bc2dc68447..f13fbaab9c 100644
--- a/package/qt6/qt6mqtt/qt6mqtt.hash
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  0a80d52cf349b61e0c012f1aa692639ac958de46d8a76cdb99af7b6067cf5c46  qt6mqtt-6.7.3-git4.tar.gz
+sha256  757c96a645b81e858c19b5407d54b3a40ee288d04ffadc9a96dd52e50c6d8d6b  qt6mqtt-6.8.1-git4.tar.gz
 
 # Hashes for license files
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6opcua/qt6opcua.hash b/package/qt6/qt6opcua/qt6opcua.hash
index 8bb89abd58..627450af60 100644
--- a/package/qt6/qt6opcua/qt6opcua.hash
+++ b/package/qt6/qt6opcua/qt6opcua.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  09b5e525ad1a61b537b826f049b8725ab3b783bcaf3010a58361f73ff4df1cdb  qt6opcua-6.7.3-git4.tar.gz
+sha256  0283f634707bf5c88ed30fec604bf7ea3bc22620cd060517812f9fb6304f254b  qt6opcua-6.8.1-git4.tar.gz
 
 # Hashes for license files
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
index f5e8b075a5..f239f18dd3 100644
--- a/package/qt6/qt6scxml/qt6scxml.hash
+++ b/package/qt6/qt6scxml/qt6scxml.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtscxml-everywhere-src-6.7.3.tar.xz.sha256
-sha256  608febeb0dafb6fbf559e064dee779ab799441ed804267b534705ea5077eeda3  qtscxml-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtscxml-everywhere-src-6.8.1.tar.xz.sha256
+sha256  2f406f44cfacd6eddb90468012a5d1d99d7a64ec05a21a2a7eda9dfc12614fd6  qtscxml-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash
index 7da5f2bb43..9777633b85 100644
--- a/package/qt6/qt6serialbus/qt6serialbus.hash
+++ b/package/qt6/qt6serialbus/qt6serialbus.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtserialbus-everywhere-src-6.7.3.tar.xz.sha256
-sha256  55d82e9c7a827808b7383f0a57ad12c2a6fcf5b6c936b27e633155163c0a6276  qtserialbus-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtserialbus-everywhere-src-6.8.1.tar.xz.sha256
+sha256  40788d92ec5c3ae297818e9f9eea9d21e398a54fa3fd8ddd530d324548ed15da  qtserialbus-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash
index 7972749d10..d30c297d0f 100644
--- a/package/qt6/qt6serialport/qt6serialport.hash
+++ b/package/qt6/qt6serialport/qt6serialport.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtserialport-everywhere-src-6.7.3.tar.xz.sha256
-sha256  d4fa58ee809b39c9eda8d20ee4677971e918edb9a076540466693bc46db146f0  qtserialport-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtserialport-everywhere-src-6.8.1.tar.xz.sha256
+sha256  098e72a5c06d7db003e3eea1b0ed72d7308e3ea9cb9e89b538816dc96c938395  qtserialport-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
@@ -7,4 +7,3 @@ sha256  110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4  LICENS
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSES/GPL-2.0-only.txt
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
 sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  LICENSES/LGPL-3.0-only.txt
-sha256  40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2  LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk
index bdb16dd892..4a006d971a 100644
--- a/package/qt6/qt6serialport/qt6serialport.mk
+++ b/package/qt6/qt6serialport/qt6serialport.mk
@@ -23,8 +23,7 @@ QT6SERIALPORT_LICENSE_FILES = \
 	LICENSES/GFDL-1.3-no-invariants-only.txt \
 	LICENSES/GPL-2.0-only.txt \
 	LICENSES/GPL-3.0-only.txt \
-	LICENSES/LGPL-3.0-only.txt \
-	LICENSES/Qt-GPL-exception-1.0.txt
+	LICENSES/LGPL-3.0-only.txt
 
 QT6SERIALPORT_CONF_OPTS = \
 	-DQT_HOST_PATH=$(HOST_DIR) \
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
index d796561424..015ec5b96f 100644
--- a/package/qt6/qt6shadertools/qt6shadertools.hash
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtshadertools-everywhere-src-6.7.3.tar.xz.sha256
-sha256  74e512798c7ddbda354a2d8d975211454bbabb47afb7e598892067a5828c0995  qtshadertools-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtshadertools-everywhere-src-6.8.1.tar.xz.sha256
+sha256  55b70cd632473a8043c74ba89310f7ba9c5041d253bc60e7ae1fa789169c4846  qtshadertools-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6svg/qt6svg.hash b/package/qt6/qt6svg/qt6svg.hash
index 611dbf72a7..cd7a148fb7 100644
--- a/package/qt6/qt6svg/qt6svg.hash
+++ b/package/qt6/qt6svg/qt6svg.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtsvg-everywhere-src-6.7.3.tar.xz.sha256
-sha256  40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtsvg-everywhere-src-6.8.1.tar.xz.sha256
+sha256  3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0  qtsvg-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
index dba38b2895..ede1608ec4 100644
--- a/package/qt6/qt6tools/qt6tools.hash
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qttools-everywhere-src-6.7.3.tar.xz.sha256
-sha256  f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qttools-everywhere-src-6.8.1.tar.xz.sha256
+sha256  9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d  qttools-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
index 3f568755ed..60b9ab08de 100644
--- a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz.sha256
-sha256  1a872104e212c048ada47d28ea8bb2e0ab0637663a3b085989349e249f1423d9  qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz.sha256
+sha256  1022a3bc4093ec732e85b659158c8a70a31eecbd0dfef4e4f6c67f474f89a264  qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
index a1fdb649b2..a378097eb4 100644
--- a/package/qt6/qt6wayland/qt6wayland.hash
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwayland-everywhere-src-6.7.3.tar.xz.sha256
-sha256  e326c7ceb628f503bfc20577d5d2df9690ee10db08eb940cb80c759a6972b2b5  qtwayland-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtwayland-everywhere-src-6.8.1.tar.xz.sha256
+sha256  2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203  qtwayland-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
index d9cfe8e173..789f51a71d 100644
--- a/package/qt6/qt6websockets/qt6websockets.hash
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwebsockets-everywhere-src-6.7.3.tar.xz.sha256
-sha256  ba03007db7ee68a5bc3e3bd1d71e11f3e1f84e470bcb8c54cd7c01bbe1c5990e  qtwebsockets-everywhere-src-6.7.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtwebsockets-everywhere-src-6.8.1.tar.xz.sha256
+sha256  e4cfdae8760bedd1c2b00429a6c9bf88cc11c5018dcb46bde277fb1edf341e3f  qtwebsockets-everywhere-src-6.8.1.tar.xz
 
 # Hashes for license files:
 sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-28 22:33   ` Thomas Petazzoni
  2024-12-13 11:58 ` [Buildroot] [PATCH 3/8] package/qt6/qt6quicktimeline: new package Roy Kollen Svendsen
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

In the qt6opcua and qt6declarative packages we don't follow the same
pattern for default CONF_OPTS as the other packages.

For these two packages we specify QT_HOST_PATH, which I don't see any
good reason for. On the contrary, in my experience, it causes build
failures, when bumping Qt6, if you don't rebuild everything. See:

 - https://doc.qt.io/qt-6/cmake-variable-qt-host-path.html

As for the other parameters, BUILD_WITH_PCH, QT_BUILD_EXAMPLES and
QT_BUILD_TESTS, I don't see a good enough reason for breaking the
the existing pattern for only these two packages.

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/qt6declarative/qt6declarative.mk | 6 ------
 package/qt6/qt6opcua/qt6opcua.mk             | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
index ecf14d3323..edec67649f 100644
--- a/package/qt6/qt6declarative/qt6declarative.mk
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -35,12 +35,6 @@ QT6DECLARATIVE_CONF_OPTS = \
 	-DQT_BUILD_EXAMPLES=OFF \
 	-DQT_BUILD_TESTS=OFF
 
-HOST_QT6DECLARATIVE_CONF_OPTS = \
-	-DQT_HOST_PATH=$(HOST_DIR) \
-	-DBUILD_WITH_PCH=OFF \
-	-DQT_BUILD_EXAMPLES=OFF \
-	-DQT_BUILD_TESTS=OFF
-
 HOST_QT6DECLARATIVE_DEPENDENCIES = \
 	host-qt6base
 
diff --git a/package/qt6/qt6opcua/qt6opcua.mk b/package/qt6/qt6opcua/qt6opcua.mk
index 6c8ff7af89..28771ba8a5 100644
--- a/package/qt6/qt6opcua/qt6opcua.mk
+++ b/package/qt6/qt6opcua/qt6opcua.mk
@@ -28,10 +28,6 @@ QT6OPCUA_CONF_OPTS = \
 	-DQT_HOST_PATH=$(HOST_DIR) \
 	-DBUILD_WITH_PCH=OFF
 
-HOST_QT6OPCUA_CONF_OPTS = \
-	-DQT_HOST_PATH=$(HOST_DIR) \
-	-DBUILD_WITH_PCH=OFF
-
 QT6OPCUA_DEPENDENCIES = \
 	qt6base \
 	host-qt6opcua
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/8] package/qt6/qt6quicktimeline: new package
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 4/8] package/qt6/qt6base: add blind host option for selecting 'Qt Concurrent' Roy Kollen Svendsen
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/Config.in                         |  1 +
 package/qt6/qt6quicktimeline/Config.in        |  7 +++++
 .../qt6quicktimeline/qt6quicktimeline.hash    |  5 ++++
 .../qt6/qt6quicktimeline/qt6quicktimeline.mk  | 26 +++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 package/qt6/qt6quicktimeline/Config.in
 create mode 100644 package/qt6/qt6quicktimeline/qt6quicktimeline.hash
 create mode 100644 package/qt6/qt6quicktimeline/qt6quicktimeline.mk

diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index c5a1a702d3..b1616495a6 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -50,6 +50,7 @@ source "package/qt6/qt6declarative/Config.in"
 source "package/qt6/qt6languageserver/Config.in"
 source "package/qt6/qt6mqtt/Config.in"
 source "package/qt6/qt6opcua/Config.in"
+source "package/qt6/qt6quicktimeline/Config.in"
 source "package/qt6/qt6scxml/Config.in"
 source "package/qt6/qt6serialbus/Config.in"
 source "package/qt6/qt6serialport/Config.in"
diff --git a/package/qt6/qt6quicktimeline/Config.in b/package/qt6/qt6quicktimeline/Config.in
new file mode 100644
index 0000000000..4dcf0e1452
--- /dev/null
+++ b/package/qt6/qt6quicktimeline/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QT6QUICKTIMELINE
+	bool "qt6quicktimeline"
+	select BR2_PACKAGE_QT6DECLARATIVE_QUICK
+	help
+	  This package corresponds to the Qt Quick Timeline module:
+
+	  https://doc.qt.io/qt-6/qtquicktimeline-index.html
diff --git a/package/qt6/qt6quicktimeline/qt6quicktimeline.hash b/package/qt6/qt6quicktimeline/qt6quicktimeline.hash
new file mode 100644
index 0000000000..b042b4e2f8
--- /dev/null
+++ b/package/qt6/qt6quicktimeline/qt6quicktimeline.hash
@@ -0,0 +1,5 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtquicktimeline-everywhere-src-6.8.1.tar.xz.sha256
+sha256  fdbc198e27fd7bce0801fb3cfa336e81932607e6a36c97ae8394880eedfe12a3  qtquicktimeline-everywhere-src-6.8.1.tar.xz
+
+# Hashes for license files
+sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
diff --git a/package/qt6/qt6quicktimeline/qt6quicktimeline.mk b/package/qt6/qt6quicktimeline/qt6quicktimeline.mk
new file mode 100644
index 0000000000..18544a5a2b
--- /dev/null
+++ b/package/qt6/qt6quicktimeline/qt6quicktimeline.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# qt6quicktimeline
+#
+################################################################################
+
+QT6QUICKTIMELINE_VERSION = $(QT6_VERSION)
+QT6QUICKTIMELINE_SITE = $(QT6_SITE)
+QT6QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6QUICKTIMELINE_VERSION).tar.xz
+QT6QUICKTIMELINE_INSTALL_STAGING = YES
+QT6QUICKTIMELINE_SUPPORTS_IN_SOURCE_BUILD = NO
+QT6QUICKTIMELINE_CMAKE_BACKEND = ninja
+QT6QUICKTIMELINE_LICENSE = GPL-3.0
+QT6QUICKTIMELINE_LICENSE_FILES = LICENSES/GPL-3.0-only.txt
+
+QT6QUICKTIMELINE_CONF_OPTS = \
+	-DQT_HOST_PATH=$(HOST_DIR) \
+	-DBUILD_WITH_PCH=OFF \
+	-DQT_BUILD_EXAMPLES=OFF \
+	-DQT_BUILD_TESTS=OFF
+
+QT6QUICKTIMELINE_DEPENDENCIES = \
+	qt6base \
+	qt6declarative
+
+$(eval $(cmake-package))
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/8] package/qt6/qt6base: add blind host option for selecting 'Qt Concurrent'
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 3/8] package/qt6/qt6quicktimeline: new package Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 5/8] package/qt6/qt6base: add blind host option for selecting 'Qt Widgets' Roy Kollen Svendsen
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Needed by new package qt6quick3d.

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/qt6base/Config.in.host | 3 +++
 package/qt6/qt6base/qt6base.mk     | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 46fb668817..a6dfb40c34 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -1,3 +1,6 @@
+config BR2_PACKAGE_HOST_QT6BASE_CONCURRENT
+	bool
+
 # Select this if you need host qt6 tools that require the Qt::Gui module (e.g.
 # Qt Shader Baker(qsb)).
 config BR2_PACKAGE_HOST_QT6BASE_GUI
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 888654a216..153fe1abfa 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,8 +83,8 @@ HOST_QT6BASE_DEPENDENCIES = \
 	host-libb2 \
 	host-pcre2 \
 	host-zlib
+
 HOST_QT6BASE_CONF_OPTS = \
-	-DFEATURE_concurrent=OFF \
 	-DFEATURE_xml=ON \
 	-DFEATURE_dbus=OFF \
 	-DFEATURE_icu=OFF \
@@ -94,6 +94,12 @@ HOST_QT6BASE_CONF_OPTS = \
 	-DFEATURE_system_pcre2=ON \
 	-DFEATURE_system_zlib=ON
 
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_CONCURRENT),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
+endif
+
 # We need host-qt6base with Gui support when building host-qt6shadertools,
 # otherwise the build is skipped and no qsb host tool is generated.
 # qt6shadertools fail to build if qsb is not available.
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/8] package/qt6/qt6base: add blind host option for selecting 'Qt Widgets'
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
                   ` (2 preceding siblings ...)
  2024-12-13 11:58 ` [Buildroot] [PATCH 4/8] package/qt6/qt6base: add blind host option for selecting 'Qt Concurrent' Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 6/8] package/qt6/qt6quick3d: new package Roy Kollen Svendsen
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Needed by new package qt6quick3d.

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/qt6base/Config.in.host | 3 +++
 package/qt6/qt6base/qt6base.mk     | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index a6dfb40c34..e38e99fbaf 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -20,3 +20,6 @@ config BR2_PACKAGE_HOST_QT6BASE_TEST
 # (e.g. qhelpgenerator).
 config BR2_PACKAGE_HOST_QT6BASE_SQL
 	bool
+
+config BR2_PACKAGE_HOST_QT6BASE_WIDGETS
+	bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 153fe1abfa..a4c56da601 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -118,10 +118,16 @@ HOST_QT6BASE_CONF_OPTS += \
 	-DFEATURE_printsupport=OFF \
 	-DFEATURE_kms=OFF \
 	-DFEATURE_fontconfig=OFF \
-	-DFEATURE_widgets=OFF \
 	-DFEATURE_libinput=OFF \
 	-DFEATURE_tslib=OFF \
 	-DFEATURE_eglfs=OFF
+
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF
+endif
+
 else
 HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
 endif
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 6/8] package/qt6/qt6quick3d: new package
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
                   ` (3 preceding siblings ...)
  2024-12-13 11:58 ` [Buildroot] [PATCH 5/8] package/qt6/qt6base: add blind host option for selecting 'Qt Widgets' Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 7/8] package/qt6/qt6graphs: " Roy Kollen Svendsen
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/Config.in                  |  1 +
 package/qt6/qt6quick3d/Config.in       | 10 +++++
 package/qt6/qt6quick3d/qt6quick3d.hash | 14 ++++++
 package/qt6/qt6quick3d/qt6quick3d.mk   | 62 ++++++++++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 package/qt6/qt6quick3d/Config.in
 create mode 100644 package/qt6/qt6quick3d/qt6quick3d.hash
 create mode 100644 package/qt6/qt6quick3d/qt6quick3d.mk

diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b1616495a6..2a5f5a4511 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -50,6 +50,7 @@ source "package/qt6/qt6declarative/Config.in"
 source "package/qt6/qt6languageserver/Config.in"
 source "package/qt6/qt6mqtt/Config.in"
 source "package/qt6/qt6opcua/Config.in"
+source "package/qt6/qt6quick3d/Config.in"
 source "package/qt6/qt6quicktimeline/Config.in"
 source "package/qt6/qt6scxml/Config.in"
 source "package/qt6/qt6serialbus/Config.in"
diff --git a/package/qt6/qt6quick3d/Config.in b/package/qt6/qt6quick3d/Config.in
new file mode 100644
index 0000000000..c4b8148039
--- /dev/null
+++ b/package/qt6/qt6quick3d/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6QUICK3D
+	bool "qt6quick3d"
+	select BR2_PACKAGE_HOST_QT6BASE_CONCURRENT # Host Quick3DRuntimeRender
+	select BR2_PACKAGE_HOST_QT6BASE_GUI
+	select BR2_PACKAGE_HOST_QT6BASE_WIDGETS
+	select BR2_PACKAGE_QT6DECLARATIVE_QUICK
+	help
+	  This package corresponds to the Qt Quick 3D module:
+
+	  https://doc.qt.io/qt-6/qtquick3d-index.html
diff --git a/package/qt6/qt6quick3d/qt6quick3d.hash b/package/qt6/qt6quick3d/qt6quick3d.hash
new file mode 100644
index 0000000000..960cda69ad
--- /dev/null
+++ b/package/qt6/qt6quick3d/qt6quick3d.hash
@@ -0,0 +1,14 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtquick3d-everywhere-src-6.8.1.tar.xz.sha256
+sha256  3f3d345e6c95fcd40ab37e6a37cd31811e5d239dea8e142e632d4ea41bf20ce7  qtquick3d-everywhere-src-6.8.1.tar.xz
+
+# Hashes for license files
+sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt
+sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
+sha256  d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc  LICENSES/MIT.txt
+sha256  c3ed04bcbea49f521e4ab32c638fa86b13ebc7b8e1a8972807265079fcd1e6b9  src/3rdparty/assimp/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  src/3rdparty/embree/LICENSE.txt
+sha256  063805e3b8e24ceab4c5dea358b03245ee41c31be87cf65c61d836636cb494bb  src/3rdparty/meshoptimizer/LICENSE.md
+sha256  2af9d14c7cd67f13c3e7e91dcfe15ec5c8af42923635441e0f5a75bcadadeb33  src/3rdparty/tinyexr/LICENSE
+sha256  2c16d5b1c2808277fe975b4f70f0fd9afc9b3bcf04e6c676665a82cb2d5579e3  src/3rdparty/xatlas/LICENSE
+sha256  966313e8129db5d0b3b081d1a50ae107da9a3da2d8faa05899e3042a33192525  src/helpers/GODOT_LICENSE.txt
+sha256  966313e8129db5d0b3b081d1a50ae107da9a3da2d8faa05899e3042a33192525  src/runtimerender/GODOT_LICENSE.txt
diff --git a/package/qt6/qt6quick3d/qt6quick3d.mk b/package/qt6/qt6quick3d/qt6quick3d.mk
new file mode 100644
index 0000000000..246bd2d82d
--- /dev/null
+++ b/package/qt6/qt6quick3d/qt6quick3d.mk
@@ -0,0 +1,62 @@
+################################################################################
+#
+# qt6quick3d
+#
+################################################################################
+
+QT6QUICK3D_VERSION = $(QT6_VERSION)
+QT6QUICK3D_SITE = $(QT6_SITE)
+QT6QUICK3D_SOURCE = qtquick3d-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6QUICK3D_VERSION).tar.xz
+QT6QUICK3D_INSTALL_STAGING = YES
+QT6QUICK3D_SUPPORTS_IN_SOURCE_BUILD = NO
+QT6QUICK3D_CMAKE_BACKEND = ninja
+QT6QUICK3D_LICENSE = GPL-3.0
+
+QT6QUICK3D_LICENSE_FILES = \
+	LICENSES/BSD-3-Clause.txt \
+	LICENSES/GPL-3.0-only.txt \
+	LICENSES/MIT.txt \
+	src/3rdparty/assimp/LICENSE \
+	src/3rdparty/embree/LICENSE.txt \
+	src/3rdparty/meshoptimizer/LICENSE.md \
+	src/3rdparty/tinyexr/LICENSE \
+	src/3rdparty/xatlas/LICENSE \
+	src/helpers/GODOT_LICENSE.txt \
+	src/runtimerender/GODOT_LICENSE.txt
+
+QT6QUICK3D_CONF_OPTS = \
+	-DQT_HOST_PATH=$(HOST_DIR) \
+	-DBUILD_WITH_PCH=OFF \
+	-DQT_BUILD_EXAMPLES=OFF \
+	-DQT_BUILD_TESTS=OFF
+
+QT6QUICK3D_DEPENDENCIES = \
+	host-qt6quick3d \
+	host-qt6shadertools \
+	qt6base \
+	qt6declarative
+
+ifeq ($(BR2_PACKAGE_ASSIMP),y)
+QT6QUICK3D_CONF_OPTS += -DFEATURE_system_assimp=ON
+QT6QUICK3D_DEPENDENCIES += assimp
+else
+QT6QUICK3D_CONF_OPTS += -DFEATURE_system_assimp=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6QUICKTIMELINE),y)
+QT6QUICK3D_DEPENDENCIES += qt6quicktimeline
+endif
+
+ifeq ($(BR2_PACKAGE_QT6SHADERTOOLS),y)
+QT6QUICK3D_DEPENDENCIES += qt6shadertools
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+QT6QUICK3D_CONF_OPTS += -DFEATURE_system_zlib=ON
+QT6QUICK3D_DEPENDENCIES += zlib
+else
+QT6QUICK3D_CONF_OPTS += -DFEATURE_system_zlib=OFF
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 7/8] package/qt6/qt6graphs: new package
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
                   ` (4 preceding siblings ...)
  2024-12-13 11:58 ` [Buildroot] [PATCH 6/8] package/qt6/qt6quick3d: new package Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2024-12-13 11:58 ` [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo Roy Kollen Svendsen
  2024-12-28 22:33 ` [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Thomas Petazzoni
  7 siblings, 0 replies; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/Config.in                |  1 +
 package/qt6/qt6graphs/Config.in      |  8 ++++++++
 package/qt6/qt6graphs/qt6graphs.hash |  5 +++++
 package/qt6/qt6graphs/qt6graphs.mk   | 27 +++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 package/qt6/qt6graphs/Config.in
 create mode 100644 package/qt6/qt6graphs/qt6graphs.hash
 create mode 100644 package/qt6/qt6graphs/qt6graphs.mk

diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 2a5f5a4511..80c417809d 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
 source "package/qt6/qt6charts/Config.in"
 source "package/qt6/qt6core5compat/Config.in"
 source "package/qt6/qt6declarative/Config.in"
+source "package/qt6/qt6graphs/Config.in"
 source "package/qt6/qt6languageserver/Config.in"
 source "package/qt6/qt6mqtt/Config.in"
 source "package/qt6/qt6opcua/Config.in"
diff --git a/package/qt6/qt6graphs/Config.in b/package/qt6/qt6graphs/Config.in
new file mode 100644
index 0000000000..a99f25d6de
--- /dev/null
+++ b/package/qt6/qt6graphs/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_QT6GRAPHS
+	bool "qt6graphs"
+	select BR2_PACKAGE_QT6DECLARATIVE
+	select BR2_PACKAGE_QT6QUICK3D
+	help
+	  This package corresponds to the Qt Graphs module:
+
+	  https://doc.qt.io/qt-6/qtgraphs-index.html
diff --git a/package/qt6/qt6graphs/qt6graphs.hash b/package/qt6/qt6graphs/qt6graphs.hash
new file mode 100644
index 0000000000..59d35d9e66
--- /dev/null
+++ b/package/qt6/qt6graphs/qt6graphs.hash
@@ -0,0 +1,5 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtgraphs-everywhere-src-6.8.1.tar.xz.sha256
+sha256  1e46e3de69936835652ab40ef8caf5824ea71e26871274561fb65ec142d54a80  qtgraphs-everywhere-src-6.8.1.tar.xz
+
+# Hashes for license files
+sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
diff --git a/package/qt6/qt6graphs/qt6graphs.mk b/package/qt6/qt6graphs/qt6graphs.mk
new file mode 100644
index 0000000000..488d5acde2
--- /dev/null
+++ b/package/qt6/qt6graphs/qt6graphs.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# qt6graphs
+#
+################################################################################
+
+QT6GRAPHS_VERSION = $(QT6_VERSION)
+QT6GRAPHS_SITE = $(QT6_SITE)
+QT6GRAPHS_SOURCE = qtgraphs-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6GRAPHS_VERSION).tar.xz
+QT6GRAPHS_INSTALL_STAGING = YES
+QT6GRAPHS_SUPPORTS_IN_SOURCE_BUILD = NO
+QT6GRAPHS_CMAKE_BACKEND = ninja
+QT6GRAPHS_LICENSE = GPL-3.0
+QT6GRAPHS_LICENSE_FILES = LICENSES/GPL-3.0-only.txt
+
+QT6GRAPHS_CONF_OPTS = \
+	-DQT_HOST_PATH=$(HOST_DIR) \
+	-DBUILD_WITH_PCH=OFF \
+	-DQT_BUILD_EXAMPLES=OFF \
+	-DQT_BUILD_TESTS=OFF
+
+QT6GRAPHS_DEPENDENCIES = \
+	qt6base \
+	qt6declarative \
+	qt6quick3d
+
+$(eval $(cmake-package))
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
                   ` (5 preceding siblings ...)
  2024-12-13 11:58 ` [Buildroot] [PATCH 7/8] package/qt6/qt6graphs: " Roy Kollen Svendsen
@ 2024-12-13 11:58 ` Roy Kollen Svendsen
  2025-01-03 19:08   ` Peter Korsgaard
  2024-12-28 22:33 ` [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Thomas Petazzoni
  7 siblings, 1 reply; 11+ messages in thread
From: Roy Kollen Svendsen @ 2024-12-13 11:58 UTC (permalink / raw)
  To: buildroot
  Cc: Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Roy Kollen Svendsen, Thomas Petazzoni, Jesse Van Gavere

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
 package/qt6/qt6opcua/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt6/qt6opcua/Config.in b/package/qt6/qt6opcua/Config.in
index 68b73f7c50..9b5359dd4c 100644
--- a/package/qt6/qt6opcua/Config.in
+++ b/package/qt6/qt6opcua/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QT6OPCUA
 	bool "qt6opcua"
 	select BR2_PACKAGE_QT6BASE_NETWORK
-	# qt6opcuda needs host-qt6opcua, and host-qt6opcua needs
+	# qt6opcua needs host-qt6opcua, and host-qt6opcua needs
 	# network support in qt6base.
 	select BR2_PACKAGE_HOST_QT6BASE_NETWORK
 
-- 
2.47.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1
  2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
                   ` (6 preceding siblings ...)
  2024-12-13 11:58 ` [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo Roy Kollen Svendsen
@ 2024-12-28 22:33 ` Thomas Petazzoni
  7 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2024-12-28 22:33 UTC (permalink / raw)
  To: Roy Kollen Svendsen
  Cc: buildroot, Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Jesse Van Gavere

On Fri, 13 Dec 2024 12:58:08 +0100
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:

> For details see:
>  - https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.1/release-note.md
>  - https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.0/release-note.md
> 
> qt6serialport:
>  - Fix legal-info. LICENSES/Qt-GPL-exception-1.0.txt was removed from
>  Qt6 Serial Port. This broke make qt6serialport-legal-info, so we had to
>  do some minor modification to the qt6serialport package.
> 
> qt6declarative:
>  - Remove patch from qt6declarative, since it's already included in this
>  version.
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
>  package/qt6/qt6.mk                            |  4 +--
>  package/qt6/qt6base/qt6base.hash              |  6 ++--
>  package/qt6/qt6charts/qt6charts.hash          |  4 +--
>  .../qt6/qt6core5compat/qt6core5compat.hash    |  4 +--
>  ...1-Fix-build-with--no-feature-network.patch | 28 -------------------
>  .../qt6/qt6declarative/qt6declarative.hash    |  4 +--
>  .../qt6languageserver/qt6languageserver.hash  |  4 +--
>  package/qt6/qt6mqtt/qt6mqtt.hash              |  2 +-
>  package/qt6/qt6opcua/qt6opcua.hash            |  2 +-
>  package/qt6/qt6scxml/qt6scxml.hash            |  4 +--
>  package/qt6/qt6serialbus/qt6serialbus.hash    |  4 +--
>  package/qt6/qt6serialport/qt6serialport.hash  |  5 ++--
>  package/qt6/qt6serialport/qt6serialport.mk    |  3 +-
>  .../qt6/qt6shadertools/qt6shadertools.hash    |  4 +--
>  package/qt6/qt6svg/qt6svg.hash                |  4 +--
>  package/qt6/qt6tools/qt6tools.hash            |  4 +--
>  .../qt6virtualkeyboard.hash                   |  4 +--
>  package/qt6/qt6wayland/qt6wayland.hash        |  4 +--
>  package/qt6/qt6websockets/qt6websockets.hash  |  4 +--
>  19 files changed, 34 insertions(+), 64 deletions(-)
>  delete mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch

Thanks, entire series applied!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS
  2024-12-13 11:58 ` [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS Roy Kollen Svendsen
@ 2024-12-28 22:33   ` Thomas Petazzoni
  0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2024-12-28 22:33 UTC (permalink / raw)
  To: Roy Kollen Svendsen
  Cc: buildroot, Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Jesse Van Gavere

On Fri, 13 Dec 2024 12:58:09 +0100
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:

> As for the other parameters, BUILD_WITH_PCH, QT_BUILD_EXAMPLES and
> QT_BUILD_TESTS, I don't see a good enough reason for breaking the
> the existing pattern for only these two packages.

I've applied, but it would be good to check if tests/examples are built
by default or not, as building those for the host packages isn't really
useful.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo
  2024-12-13 11:58 ` [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo Roy Kollen Svendsen
@ 2025-01-03 19:08   ` Peter Korsgaard
  0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2025-01-03 19:08 UTC (permalink / raw)
  To: Roy Kollen Svendsen
  Cc: buildroot, Christian Hitz, Andreas Naumann, Zoltan Gyarmati,
	Thomas Petazzoni, Jesse Van Gavere

>>>>> "Roy" == Roy Kollen Svendsen <roykollensvendsen@gmail.com> writes:

 > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>

Committed to 2024.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-01-03 19:08 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-13 11:58 [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 2/8] package/qt6: remove unneeded and problematic CONF_OPTS Roy Kollen Svendsen
2024-12-28 22:33   ` Thomas Petazzoni
2024-12-13 11:58 ` [Buildroot] [PATCH 3/8] package/qt6/qt6quicktimeline: new package Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 4/8] package/qt6/qt6base: add blind host option for selecting 'Qt Concurrent' Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 5/8] package/qt6/qt6base: add blind host option for selecting 'Qt Widgets' Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 6/8] package/qt6/qt6quick3d: new package Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 7/8] package/qt6/qt6graphs: " Roy Kollen Svendsen
2024-12-13 11:58 ` [Buildroot] [PATCH 8/8] package/qt6/qt6opcua: fix 'qt6opcua' typo Roy Kollen Svendsen
2025-01-03 19:08   ` Peter Korsgaard
2024-12-28 22:33 ` [Buildroot] [PATCH 1/8] package/qt6: bump version to 6.8.1 Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.