* [Buildroot] [PATCH v4 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (13 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 986b2854d0..cbf54f5752 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -95,6 +95,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index b8040e395b..36ec05b394 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -84,7 +84,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -98,6 +97,12 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (12 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Qt Network is a required dependency of Qt Tools. Therefor we need a way
to enable the Qt Network module when building for host.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 36ec05b394..684bb86bc9 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -88,7 +88,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -103,6 +102,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (11 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v3 -> v4:
- This patch was added in v4. Required by patch 9/14.
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 684bb86bc9..b19cce26f8 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -108,6 +107,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (10 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v3 -> v4:
- This patch was added in v4. Required by patch 12/14.
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index b19cce26f8..c927b06482 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -107,6 +106,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
else
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 06/14] package/qt6/qt6shadertools: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (9 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..90313163fa
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz.sha256
+sha256 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af qtshadertools-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 07/14] package/qt6/qt6svg: allow building for host
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (8 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 08/14] package/qt6/qt6languageserver: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (7 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..2d40426c6f
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz.sha256
+sha256 a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc qtlanguageserver-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 09/14] package/qt6/qt6declarative: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (6 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Call Stack (most recent call first):
qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:180 (qt_internal_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
To avoid the following build error, we also make sure the host qt6base is
built with Testlib enabled:
CMake Error at buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message):
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Call Stack (most recent call first):
buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool)
tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v3 -> v4:
- Fix build failure when Testlib enabled for target. (suggested by Jesse)
- Squash the 'Fix build with -no-feature-network'-patch into this commit,
since no earlier version of the qt6declarative package exist.
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
package/qt6/qt6declarative/Config.in | 24 ++++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
5 files changed, 120 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..1daa645413
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6LANGUAGESERVER
+ select BR2_PACKAGE_QT6SHADERTOOLS
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_HOST_QT6SVG
+ select BR2_PACKAGE_HOST_QT6DECLARATIVE
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..ae9925509b
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz.sha256
+sha256 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c qtdeclarative-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..2348ff2dae
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_FEATURE_qml_profiler=OFF \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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 \
+ -DQT_FEATURE_ssl=OFF
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools \
+ host-qt6declarative \
+ qt6base \
+ qt6shadertools \
+ qt6languageserver \
+ qt6svg
+
+HOST_QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 10/14] package/qt6/qt6websockets: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (5 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 9 ++++
package/qt6/qt6websockets/qt6websockets.hash | 11 +++++
package/qt6/qt6websockets/qt6websockets.mk | 46 ++++++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..a201483922
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4e36eb4257
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz.sha256
+sha256 5ffc77da6b36cdf18e04c975a0fbf243968806a93a6291bcd2e9cd0b26139736 qtwebsockets-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..cc17085d10
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 11/14] package/qt6/qt6wayland: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (4 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v3 -> v4:
- Fix compositor build by letting this package select libxkbcommon.
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 25 ++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++
package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++
4 files changed, 90 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..a47c9e888c
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,25 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..13a6ba15eb
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz.sha256
+sha256 d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea qtwayland-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..cf8727287e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6wayland \
+ wayland \
+ host-wayland
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 12/14] package/qt6/qt6tools: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
` (3 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v3 -> v4:
- Fix build by selecting the Sql module on host so that the required host
tool qhelpgenerator is built.
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 +++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 +++++++++
package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..6e5298de35
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..6f2c962740
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz.sha256
+sha256 c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b qttools-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..8779e8c00f
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6tools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 13/14] package/qt6/qt6virtualkeyboard: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:03 ` [Buildroot] [PATCH v4 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
` (2 subsequent siblings)
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 9 ++++
.../qt6virtualkeyboard.hash | 12 +++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 49 +++++++++++++++++++
4 files changed, 71 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..59e9dc3595
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..dc9a0f23ab
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz.sha256
+sha256 d61bb2a18b1b06f64c956b2bde740c90a4bb46c47a99b31462e6e8d278a0cb6a qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e49643149e
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v4 14/14] package/qt6/qt6mqtt: new package
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-05-13 22:03 ` Roy Kollen Svendsen
2024-05-13 22:13 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Jesse Van Gavere
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
14 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 22:03 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index b87cb6748d..42984f89ee 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ QT6_VERSION = $(QT6_VERSION_MAJOR).0
QT6_SOURCE_TARBALL_PREFIX = everywhere-src
QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..0fad4fe06f
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 94024e3dd6c77feddfbd35520cc1f474d669aad7402f087827221890e07a64d5 qt6mqtt-6.7.0-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (12 preceding siblings ...)
2024-05-13 22:03 ` [Buildroot] [PATCH v4 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
@ 2024-05-13 22:13 ` Jesse Van Gavere
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
14 siblings, 0 replies; 114+ messages in thread
From: Jesse Van Gavere @ 2024-05-13 22:13 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Samuel Martin,
Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 11466 bytes --]
Op di 14 mei 2024 om 00:03 schreef Roy Kollen Svendsen <
roykollensvendsen@gmail.com>:
> From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
>
> For details see [1], [2], [3], [4], [5], [6], [7], [8] and [9].
>
> [1]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
> [2]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
> [3]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
> [4]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
>
> [5]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
> [6]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
> [7]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
> [8]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
>
> [9]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
>
> We also apply the associated CVE-2024-33861 patch from:
>
> https://download.qt.io/archive/qt/6.7/
>
> As Jesse Van Gavere noted:
>
> "This is not applicable to 6.4.3, the affected versions are detailed in
> the bugzilla report below and it's only 6.5.0+
> So this seems perfectly valid to go along with the version bump.
>
> OpenSUSE report:
> https://www.suse.com/security/cve/CVE-2024-33861.html
> Bugzilla report clarifying affected versions
> https://bugzilla.suse.com/show_bug.cgi?id=1223917"
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> Changes v3 -> v4:
> - Explain why the associated CVE-patch should be part of this series
> (suggested by Thomas)
> - Squash the CVE-patch into this patch.
> - Add CVE-ID to QT6BASE_IGNORE_CVES. (suggested by Thomas)
>
> package/qt6/qt6.mk | 4 +--
> .../0001-Fix-CVE-2024-33861-for-Qt6.7.patch | 36 +++++++++++++++++++
> package/qt6/qt6base/qt6base.hash | 4 +--
> package/qt6/qt6base/qt6base.mk | 2 +-
> .../qt6/qt6core5compat/qt6core5compat.hash | 4 +--
> package/qt6/qt6serialbus/qt6serialbus.hash | 4 +--
> package/qt6/qt6serialport/qt6serialport.hash | 4 +--
> package/qt6/qt6svg/qt6svg.hash | 4 +--
> 8 files changed, 49 insertions(+), 13 deletions(-)
> create mode 100644
> package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
>
> diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
> index 1edb252c96..b87cb6748d 100644
> --- a/package/qt6/qt6.mk
> +++ b/package/qt6/qt6.mk
> @@ -4,8 +4,8 @@
> #
>
> ################################################################################
>
> -QT6_VERSION_MAJOR = 6.4
> -QT6_VERSION = $(QT6_VERSION_MAJOR).3
> +QT6_VERSION_MAJOR = 6.7
> +QT6_VERSION = $(QT6_VERSION_MAJOR).0
> 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/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
> b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
> new file mode 100644
> index 0000000000..f016788017
> --- /dev/null
> +++ b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
> @@ -0,0 +1,36 @@
> +From 7f88945625f560796c86a267086f163e74c1407b Mon Sep 17 00:00:00 2001
> +From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> +Date: Sun, 12 May 2024 07:15:32 +0200
> +Subject: [PATCH] Fix CVE-2024-33861 for Qt6.7
> +
> +Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com
> >
> +Upstream:
> https://download.qt.io/archive/qt/6.7/CVE-2024-33861-qtbase-6.7.diff
> +---
> + src/corelib/text/qstringconverter.cpp | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/corelib/text/qstringconverter.cpp
> b/src/corelib/text/qstringconverter.cpp
> +index b5749843..fd45ccf2 100644
> +--- a/src/corelib/text/qstringconverter.cpp
> ++++ b/src/corelib/text/qstringconverter.cpp
> +@@ -1954,7 +1954,7 @@ struct QStringConverterICU : QStringConverter
> + const void *context;
> + ucnv_getToUCallBack(icu_conv, &action, &context);
> + if (context != state)
> +- ucnv_setToUCallBack(icu_conv, action, &state, nullptr,
> nullptr, &err);
> ++ ucnv_setToUCallBack(icu_conv, action, state, nullptr,
> nullptr, &err);
> +
> + ucnv_toUnicode(icu_conv, &target, targetLimit, &source,
> sourceLimit, nullptr, flush, &err);
> + // We did reserve enough space:
> +@@ -1987,7 +1987,7 @@ struct QStringConverterICU : QStringConverter
> + const void *context;
> + ucnv_getFromUCallBack(icu_conv, &action, &context);
> + if (context != state)
> +- ucnv_setFromUCallBack(icu_conv, action, &state, nullptr,
> nullptr, &err);
> ++ ucnv_setFromUCallBack(icu_conv, action, state, nullptr,
> nullptr, &err);
> +
> + ucnv_fromUnicode(icu_conv, &target, targetLimit, &source,
> sourceLimit, nullptr, flush, &err);
> + // We did reserve enough space:
> +--
> +2.45.0
> +
> diff --git a/package/qt6/qt6base/qt6base.hash
> b/package/qt6/qt6base/qt6base.hash
> index cb111bd405..0f45826a45 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
> -sha256
> <https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256-sha256>
> 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
> qtbase-everywhere-src-6.4.3.tar.xz
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz.sha256+sha256>
> 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
> qtbase-everywhere-src-6.7.0.tar.xz
>
> # Hashes for license files
> sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb
> LICENSES/Apache-2.0.txt
> diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/
> qt6base.mk
> index 6857725ef5..b8040e395b 100644
> --- a/package/qt6/qt6base/qt6base.mk
> +++ b/package/qt6/qt6base/qt6base.mk
> @@ -9,7 +9,7 @@ QT6BASE_SITE = $(QT6_SITE)
> QT6BASE_SOURCE =
> qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
> QT6BASE_CPE_ID_VENDOR = qt
> QT6BASE_CPE_ID_PRODUCT = qt
> -
> +QT6BASE_IGNORE_CVES = CVE-2024-33861
> QT6BASE_CMAKE_BACKEND = ninja
>
> QT6BASE_LICENSE = \
> diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash
> b/package/qt6/qt6core5compat/qt6core5compat.hash
> index 0735df3af2..1eb0b5b460 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
> -sha256
> <https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256-sha256>
> d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a
> qt5compat-everywhere-src-6.4.3.tar.xz
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz.sha256+sha256>
> 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5
> qt5compat-everywhere-src-6.7.0.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 98c8931962..17d5090076 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
> -sha256
> <https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256-sha256>
> b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366
> qtserialbus-everywhere-src-6.4.3.tar.xz
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz.sha256+sha256>
> 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd
> qtserialbus-everywhere-src-6.7.0.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 9341978d86..cd51fbe435 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
> -sha256
> <https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256-sha256>
> 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de
> qtserialport-everywhere-src-6.4.3.tar.xz
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz.sha256+sha256>
> b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9
> qtserialport-everywhere-src-6.7.0.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 bb239cb012..32c1a79a5c 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
> -sha256
> <https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256-sha256>
> 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a
> qtsvg-everywhere-src-6.4.3.tar.xz
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz.sha256+sha256>
> 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d
> qtsvg-everywhere-src-6.7.0.tar.xz
>
> # Hashes for license files:
> sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
> LICENSES/BSD-3-Clause.txt
> --
> 2.45.0
>
>
Acked-by: Jesse Van Gavere <jesse.vangavere@scioteq.com>
Of course testing a huge module like Qt fully is difficult given all the
possible options but with these new iterations I tested them as good as I
could and I feel confident this series is good to go as-is, great work Roy.
[-- Attachment #1.2: Type: text/html, Size: 15684 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1
2024-05-13 22:03 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (13 preceding siblings ...)
2024-05-13 22:13 ` [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 Jesse Van Gavere
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (12 more replies)
14 siblings, 13 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
For details see [1], [2], [3], [4], [5], [6], [7], [8], [9] and [10].
[1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
[2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
[3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
[4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
[5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
[6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
[7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
[8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
[9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
[10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
- Remove CVE-patch. It is already part of v6.7.1
package/qt6/qt6.mk | 4 ++--
package/qt6/qt6base/qt6base.hash | 4 ++--
package/qt6/qt6base/qt6base.mk | 1 -
package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++--
package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++--
package/qt6/qt6serialport/qt6serialport.hash | 4 ++--
package/qt6/qt6svg/qt6svg.hash | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 1edb252c96..ee426884f9 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QT6_VERSION_MAJOR = 6.4
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.7
+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 cb111bd405..488f4b0136 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz.sha256
+sha256 b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 qtbase-everywhere-src-6.7.1.tar.xz
# Hashes for license files
sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6857725ef5..5bc5370834 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -9,7 +9,6 @@ QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CPE_ID_VENDOR = qt
QT6BASE_CPE_ID_PRODUCT = qt
-
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0735df3af2..c50093c0a9 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz.sha256
+sha256 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009 qt5compat-everywhere-src-6.7.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 98c8931962..d9cf2260c1 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
-sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz.sha256
+sha256 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f qtserialbus-everywhere-src-6.7.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 9341978d86..527bc14fe4 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886 qtserialport-everywhere-src-6.7.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 bb239cb012..80924035f0 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
-sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz.sha256
+sha256 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce qtsvg-everywhere-src-6.7.1.tar.xz
# Hashes for license files:
sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (11 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 986b2854d0..cbf54f5752 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -95,6 +95,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5bc5370834..08c6425331 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,7 +83,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -97,6 +96,12 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (10 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Qt Network is a required dependency of Qt Tools. Therefor we need a way
to enable the Qt Network module when building for host.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 08c6425331..8c08784f91 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -102,6 +101,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (9 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 8c08784f91..4bf715f5c6 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -107,6 +106,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (8 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 4bf715f5c6..1d4afaa801 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -85,7 +85,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -106,6 +105,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
else
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-06-01 17:10 ` Yann E. MORIN
2024-05-31 15:13 ` [Buildroot] [PATCH v5 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (7 subsequent siblings)
12 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..8e80d64851
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 qtshadertools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-06-01 17:10 ` Yann E. MORIN
2024-06-01 22:48 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Yann E. MORIN @ 2024-06-01 17:10 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
Roy, All,
Thanks for your new iteration of this series.
I was looking at applying it, but I have a comment about this patch: why
is the host qt6base required to have GUI support to build the target
qt6shadertools?
That's a question Thomas already asked in a previous iteration:
https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
but I could not see an explanation as a reply to Thomas, or in the
following versions of this series.
Could you provide a little bit of an explanation? For example, does it
need a tool that is provided by qt6base only when the gui module is
enabled? Or something else?
It does not need to be a long explanation, just a sentence or maybe two;
we just need to understand the dependency.
Same goes for the qt6tols and its dependencies on HOST_QT6BASE_NETWORK
and HOST_QT6BASE_SQL, and other such dependencies.
Thank you!
Regards,
Yann E. MORIN.
On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> ---
> Changes v4 -> v5:
> - Bump to v6.7.1
>
> package/qt6/Config.in | 1 +
> package/qt6/qt6shadertools/Config.in | 13 +++++++
> .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
> package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
> 4 files changed, 63 insertions(+)
> create mode 100644 package/qt6/qt6shadertools/Config.in
> create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
> create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
>
> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> index 276a0217ab..b7e95a6885 100644
> --- a/package/qt6/Config.in
> +++ b/package/qt6/Config.in
> @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
> source "package/qt6/qt6core5compat/Config.in"
> source "package/qt6/qt6serialbus/Config.in"
> source "package/qt6/qt6serialport/Config.in"
> +source "package/qt6/qt6shadertools/Config.in"
> source "package/qt6/qt6svg/Config.in"
>
> endif
> diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
> new file mode 100644
> index 0000000000..1b47dc6132
> --- /dev/null
> +++ b/package/qt6/qt6shadertools/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_QT6SHADERTOOLS
> + bool "qt6shadertools"
> + select BR2_PACKAGE_HOST_QT6BASE_GUI
> + select BR2_PACKAGE_QT6BASE_GUI
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + The Qt Shader Tools module builds on the SPIR-V Open
> + Source Ecosystem as described at the Khronos SPIR-V web
> + site.
> +
> + https://doc.qt.io/qt-6/qtshadertools-index.html
> diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
> new file mode 100644
> index 0000000000..8e80d64851
> --- /dev/null
> +++ b/package/qt6/qt6shadertools/qt6shadertools.hash
> @@ -0,0 +1,10 @@
> +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> +sha256 e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 qtshadertools-everywhere-src-6.7.1.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
> +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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
> new file mode 100644
> index 0000000000..108f409380
> --- /dev/null
> +++ b/package/qt6/qt6shadertools/qt6shadertools.mk
> @@ -0,0 +1,39 @@
> +################################################################################
> +#
> +# qt6shadertools
> +#
> +################################################################################
> +
> +QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
> +QT6SHADERTOOLS_SITE = $(QT6_SITE)
> +QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
> +QT6SHADERTOOLS_INSTALL_STAGING = YES
> +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> +
> +QT6SHADERTOOLS_CMAKE_BACKEND = ninja
> +
> +QT6SHADERTOOLS_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
> +
> +QT6SHADERTOOLS_LICENSE_FILES = \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt
> +
> +QT6SHADERTOOLS_CONF_OPTS = \
> + -DBUILD_WITH_PCH=OFF \
> + -DQT_BUILD_EXAMPLES=OFF \
> + -DQT_BUILD_TESTS=OFF
> +
> +QT6SHADERTOOLS_DEPENDENCIES = \
> + host-pkgconf \
> + qt6base \
> + host-qt6shadertools
> +
> +HOST_QT6SHADERTOOLS_DEPENDENCIES = \
> + host-qt6base
> +
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
> --
> 2.45.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package
2024-06-01 17:10 ` Yann E. MORIN
@ 2024-06-01 22:48 ` Roy Kollen Svendsen
2024-06-02 8:24 ` Yann E. MORIN
0 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-01 22:48 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 8348 bytes --]
Hi Yann,
I attempted to explain the host Qt6::Gui dependency in patch 02/14:
The Qt6::Gui module is needed when building the 'Qt Shader Baker' (qsb)
> host tool. Qsb is needed for converting the Qt6 Vulkan GLSL source code to
> platform specific shader languages which is then later copied to target.
> For more details take a look at:
> https://doc.qt.io/qt-6/qtshadertools-overview.html and
> https://doc.qt.io/qt-6/qshaderbaker.html
>
In commit message 03/14 I wrote:
Qt Network is a required dependency of Qt Tools. Therefor we need a way to
> enable the Qt Network module when building for host.
qt6tools-6.7.1/CMakeLists.txt:
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
> BuildInternals Core Network)
>
In commit message 09/14 I explained why I added an option to enable the
Testlib feature on host. You seemed to accept this explanation.
I added the blind host option for enabling the Qt Sql module to fix the
following build failure:
CMake Error at
/home/roy/src/buildroot-qt6-testing/buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684
(message):
Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
Qt6ToolsTools package, but the package did not contain the tool. Make
sure
that the host module Tools was built with all features enabled (no
explicitly disabled tools).
Call Stack (most recent call first):
/home/roy/src/buildroot-qt6-testing/buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72
(qt_internal_find_tool)
src/assistant/qhelpgenerator/CMakeLists.txt:9 (qt_internal_add_tool)
I'll add this to commit message 05/14, if you want me to create a v6 patch
set.
Best Regards,
Roy
lør. 1. juni 2024 kl. 19:10 skrev Yann E. MORIN <yann.morin.1998@free.fr>:
> Roy, All,
>
> Thanks for your new iteration of this series.
>
> I was looking at applying it, but I have a comment about this patch: why
> is the host qt6base required to have GUI support to build the target
> qt6shadertools?
>
> That's a question Thomas already asked in a previous iteration:
> https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
>
> but I could not see an explanation as a reply to Thomas, or in the
> following versions of this series.
>
> Could you provide a little bit of an explanation? For example, does it
> need a tool that is provided by qt6base only when the gui module is
> enabled? Or something else?
>
> It does not need to be a long explanation, just a sentence or maybe two;
> we just need to understand the dependency.
>
> Same goes for the qt6tols and its dependencies on HOST_QT6BASE_NETWORK
> and HOST_QT6BASE_SQL, and other such dependencies.
>
> Thank you!
>
> Regards,
> Yann E. MORIN.
>
> On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> > Signed-off-by: Roy Kollen Svendsen <
> roy.kollen.svendsen@akersolutions.com>
> > ---
> > Changes v4 -> v5:
> > - Bump to v6.7.1
> >
> > package/qt6/Config.in | 1 +
> > package/qt6/qt6shadertools/Config.in | 13 +++++++
> > .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
> > package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
> > 4 files changed, 63 insertions(+)
> > create mode 100644 package/qt6/qt6shadertools/Config.in
> > create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
> > create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
> >
> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> > index 276a0217ab..b7e95a6885 100644
> > --- a/package/qt6/Config.in
> > +++ b/package/qt6/Config.in
> > @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
> > source "package/qt6/qt6core5compat/Config.in"
> > source "package/qt6/qt6serialbus/Config.in"
> > source "package/qt6/qt6serialport/Config.in"
> > +source "package/qt6/qt6shadertools/Config.in"
> > source "package/qt6/qt6svg/Config.in"
> >
> > endif
> > diff --git a/package/qt6/qt6shadertools/Config.in
> b/package/qt6/qt6shadertools/Config.in
> > new file mode 100644
> > index 0000000000..1b47dc6132
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/Config.in
> > @@ -0,0 +1,13 @@
> > +config BR2_PACKAGE_QT6SHADERTOOLS
> > + bool "qt6shadertools"
> > + select BR2_PACKAGE_HOST_QT6BASE_GUI
> > + select BR2_PACKAGE_QT6BASE_GUI
> > + help
> > + Qt is a cross-platform application and UI framework for
> > + developers using C++.
> > +
> > + The Qt Shader Tools module builds on the SPIR-V Open
> > + Source Ecosystem as described at the Khronos SPIR-V web
> > + site.
> > +
> > + https://doc.qt.io/qt-6/qtshadertools-index.html
> > diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash
> b/package/qt6/qt6shadertools/qt6shadertools.hash
> > new file mode 100644
> > index 0000000000..8e80d64851
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/qt6shadertools.hash
> > @@ -0,0 +1,10 @@
> > +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> > +sha256
> e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2
> qtshadertools-everywhere-src-6.7.1.tar.xz
> > +
> > +# Hashes for license files:
> > +sha256
> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
> LICENSES/BSD-3-Clause.txt
> > +sha256
> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
> LICENSES/GFDL-1.3-no-invariants-only.txt
> > +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/qt6shadertools/qt6shadertools.mk
> b/package/qt6/qt6shadertools/qt6shadertools.mk
> > new file mode 100644
> > index 0000000000..108f409380
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/qt6shadertools.mk
> > @@ -0,0 +1,39 @@
> >
> +################################################################################
> > +#
> > +# qt6shadertools
> > +#
> >
> +################################################################################
> > +
> > +QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
> > +QT6SHADERTOOLS_SITE = $(QT6_SITE)
> > +QT6SHADERTOOLS_SOURCE =
> qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
> > +QT6SHADERTOOLS_INSTALL_STAGING = YES
> > +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> > +
> > +QT6SHADERTOOLS_CMAKE_BACKEND = ninja
> > +
> > +QT6SHADERTOOLS_LICENSE = \
> > + GPL-2.0+ or LGPL-3.0, \
> > + GPL-3.0, GFDL-1.3 no invariants (docs)
> > +
> > +QT6SHADERTOOLS_LICENSE_FILES = \
> > + LICENSES/GPL-2.0-only.txt \
> > + LICENSES/GPL-3.0-only.txt \
> > + LICENSES/LGPL-3.0-only.txt \
> > + LICENSES/GFDL-1.3-no-invariants-only.txt
> > +
> > +QT6SHADERTOOLS_CONF_OPTS = \
> > + -DBUILD_WITH_PCH=OFF \
> > + -DQT_BUILD_EXAMPLES=OFF \
> > + -DQT_BUILD_TESTS=OFF
> > +
> > +QT6SHADERTOOLS_DEPENDENCIES = \
> > + host-pkgconf \
> > + qt6base \
> > + host-qt6shadertools
> > +
> > +HOST_QT6SHADERTOOLS_DEPENDENCIES = \
> > + host-qt6base
> > +
> > +$(eval $(cmake-package))
> > +$(eval $(host-cmake-package))
> > --
> > 2.45.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
> |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is
> no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> conspiracy. |
>
> '------------------------------^-------^------------------^--------------------'
>
[-- Attachment #1.2: Type: text/html, Size: 11926 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package
2024-06-01 22:48 ` Roy Kollen Svendsen
@ 2024-06-02 8:24 ` Yann E. MORIN
2024-06-03 12:24 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Yann E. MORIN @ 2024-06-02 8:24 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
Roy, All,
On 2024-06-02 00:48 +0200, Roy Kollen Svendsen spake thusly:
> I attempted to explain the host Qt6::Gui dependency in patch 02/14:
> The Qt6::Gui module is needed when building the 'Qt Shader Baker' (qsb)
> host tool. Qsb is needed for converting the Qt6 Vulkan GLSL source code to
> platform specific shader languages which is then later copied to target.
> For more details take a look at: [1]https://doc.qt.io/qt-6/
> qtshadertools-overview.html and [2]https://doc.qt.io/qt-6/qshaderbaker.html
Ah, those explanations should belong to the commit that adds
qt6shadertools as well, then.
I'll do the duplication when applying (a bit later after coffee has
kicked in).
> In commit message 03/14 I wrote:
> Qt Network is a required dependency of Qt Tools. Therefor we need a way to
> enable the Qt Network module when building for host.
Ditto.
> In commit message 09/14 I explained why I added an option to enable the Testlib
> feature on host. You seemed to accept this explanation.
Yes.
> I added the blind host option for enabling the Qt Sql module to fix the
> following build failure:
>
> CMake Error at /home/roy/src/buildroot-qt6-testing/buildroot/output/build/
> qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message):
> Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
> Qt6ToolsTools package, but the package did not contain the tool. Make sure
> that the host module Tools was built with all features enabled (no
> explicitly disabled tools).
> Call Stack (most recent call first):
> /home/roy/src/buildroot-qt6-testing/buildroot/output/build/qt6base-6.7.0/
> cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool)
> src/assistant/qhelpgenerator/CMakeLists.txt:9 (qt_internal_add_tool)
>
> I'll add this to commit message 05/14, if you want me to create a v6 patch set.
No need to resend for now, let's see if I can apply with your additional
explanations
Thanks!
Regards,
Yann E. MORIN.
> Best Regards,
>
> Roy
>
>
> lør. 1. juni 2024 kl. 19:10 skrev Yann E. MORIN <[3]yann.morin.1998@free.fr>:
>
> Roy, All,
>
> Thanks for your new iteration of this series.
>
> I was looking at applying it, but I have a comment about this patch: why
> is the host qt6base required to have GUI support to build the target
> qt6shadertools?
>
> That's a question Thomas already asked in a previous iteration:
> [4]https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
>
> but I could not see an explanation as a reply to Thomas, or in the
> following versions of this series.
>
> Could you provide a little bit of an explanation? For example, does it
> need a tool that is provided by qt6base only when the gui module is
> enabled? Or something else?
>
> It does not need to be a long explanation, just a sentence or maybe two;
> we just need to understand the dependency.
>
> Same goes for the qt6tols and its dependencies on HOST_QT6BASE_NETWORK
> and HOST_QT6BASE_SQL, and other such dependencies.
>
> Thank you!
>
> Regards,
> Yann E. MORIN.
>
> On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> > Signed-off-by: Roy Kollen Svendsen <[5]
> roy.kollen.svendsen@akersolutions.com>
> > ---
> > Changes v4 -> v5:
> > - Bump to v6.7.1
> >
> > package/qt6/Config.in | 1 +
> > package/qt6/qt6shadertools/Config.in | 13 +++++++
> > .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
> > package/qt6/qt6shadertools/[6]qt6shadertools.mk | 39
> +++++++++++++++++++
> > 4 files changed, 63 insertions(+)
> > create mode 100644 package/qt6/qt6shadertools/Config.in
> > create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
> > create mode 100644 package/qt6/qt6shadertools/[7]qt6shadertools.mk
> >
> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> > index 276a0217ab..b7e95a6885 100644
> > --- a/package/qt6/Config.in
> > +++ b/package/qt6/Config.in
> > @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
> > source "package/qt6/qt6core5compat/Config.in"
> > source "package/qt6/qt6serialbus/Config.in"
> > source "package/qt6/qt6serialport/Config.in"
> > +source "package/qt6/qt6shadertools/Config.in"
> > source "package/qt6/qt6svg/Config.in"
> >
> > endif
> > diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/
> qt6shadertools/Config.in
> > new file mode 100644
> > index 0000000000..1b47dc6132
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/Config.in
> > @@ -0,0 +1,13 @@
> > +config BR2_PACKAGE_QT6SHADERTOOLS
> > + bool "qt6shadertools"
> > + select BR2_PACKAGE_HOST_QT6BASE_GUI
> > + select BR2_PACKAGE_QT6BASE_GUI
> > + help
> > + Qt is a cross-platform application and UI framework for
> > + developers using C++.
> > +
> > + The Qt Shader Tools module builds on the SPIR-V Open
> > + Source Ecosystem as described at the Khronos SPIR-V web
> > + site.
> > +
> > + [8]https://doc.qt.io/qt-6/qtshadertools-index.html
> > diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6
> /qt6shadertools/qt6shadertools.hash
> > new file mode 100644
> > index 0000000000..8e80d64851
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/qt6shadertools.hash
> > @@ -0,0 +1,10 @@
> > +# Hash from: [9]https://download.qt.io/official_releases/qt/6.7/6.7.1/
> submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> > +sha256
> e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2
> qtshadertools-everywhere-src-6.7.1.tar.xz
> > +
> > +# Hashes for license files:
> > +sha256
> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/
> BSD-3-Clause.txt
> > +sha256
> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/
> GFDL-1.3-no-invariants-only.txt
> > +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/qt6shadertools/[10]qt6shadertools.mk b/package/
> qt6/qt6shadertools/[11]qt6shadertools.mk
> > new file mode 100644
> > index 0000000000..108f409380
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/[12]qt6shadertools.mk
> > @@ -0,0 +1,39 @@
> > +########################################################################
> ########
> > +#
> > +# qt6shadertools
> > +#
> > +########################################################################
> ########
> > +
> > +QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
> > +QT6SHADERTOOLS_SITE = $(QT6_SITE)
> > +QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$
> (QT6SHADERTOOLS_VERSION).tar.xz
> > +QT6SHADERTOOLS_INSTALL_STAGING = YES
> > +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> > +
> > +QT6SHADERTOOLS_CMAKE_BACKEND = ninja
> > +
> > +QT6SHADERTOOLS_LICENSE = \
> > + GPL-2.0+ or LGPL-3.0, \
> > + GPL-3.0, GFDL-1.3 no invariants (docs)
> > +
> > +QT6SHADERTOOLS_LICENSE_FILES = \
> > + LICENSES/GPL-2.0-only.txt \
> > + LICENSES/GPL-3.0-only.txt \
> > + LICENSES/LGPL-3.0-only.txt \
> > + LICENSES/GFDL-1.3-no-invariants-only.txt
> > +
> > +QT6SHADERTOOLS_CONF_OPTS = \
> > + -DBUILD_WITH_PCH=OFF \
> > + -DQT_BUILD_EXAMPLES=OFF \
> > + -DQT_BUILD_TESTS=OFF
> > +
> > +QT6SHADERTOOLS_DEPENDENCIES = \
> > + host-pkgconf \
> > + qt6base \
> > + host-qt6shadertools
> > +
> > +HOST_QT6SHADERTOOLS_DEPENDENCIES = \
> > + host-qt6base
> > +
> > +$(eval $(cmake-package))
> > +$(eval $(host-cmake-package))
> > --
> > 2.45.1
> >
> > _______________________________________________
> > buildroot mailing list
> > [13]buildroot@buildroot.org
> > [14]https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
> |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is
> no |
> | [15]http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> conspiracy. |
> '------------------------------^-------^------------------^
> --------------------'
>
>
> References:
>
> [1] https://doc.qt.io/qt-6/qtshadertools-overview.html
> [2] https://doc.qt.io/qt-6/qshaderbaker.html
> [3] mailto:yann.morin.1998@free.fr
> [4] https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
> [5] mailto:roy.kollen.svendsen@akersolutions.com
> [6] http://qt6shadertools.mk/
> [7] http://qt6shadertools.mk/
> [8] https://doc.qt.io/qt-6/qtshadertools-index.html
> [9] https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> [10] http://qt6shadertools.mk/
> [11] http://qt6shadertools.mk/
> [12] http://qt6shadertools.mk/
> [13] mailto:buildroot@buildroot.org
> [14] https://lists.buildroot.org/mailman/listinfo/buildroot
> [15] http://ymorin.is-a-geek.org/
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* Re: [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package
2024-06-02 8:24 ` Yann E. MORIN
@ 2024-06-03 12:24 ` Roy Kollen Svendsen
0 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 12:24 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 11624 bytes --]
Hi Yann,
I made a v6 patch set anyway.
Best Regards,
Roy
søn. 2. juni 2024 kl. 10:25 skrev Yann E. MORIN <yann.morin.1998@free.fr>:
> Roy, All,
>
> On 2024-06-02 00:48 +0200, Roy Kollen Svendsen spake thusly:
> > I attempted to explain the host Qt6::Gui dependency in patch 02/14:
> > The Qt6::Gui module is needed when building the 'Qt Shader Baker'
> (qsb)
> > host tool. Qsb is needed for converting the Qt6 Vulkan GLSL source
> code to
> > platform specific shader languages which is then later copied to
> target.
> > For more details take a look at: [1]https://doc.qt.io/qt-6/
> > qtshadertools-overview.html and [2]
> https://doc.qt.io/qt-6/qshaderbaker.html
>
> Ah, those explanations should belong to the commit that adds
> qt6shadertools as well, then.
>
> I'll do the duplication when applying (a bit later after coffee has
> kicked in).
>
> > In commit message 03/14 I wrote:
> > Qt Network is a required dependency of Qt Tools. Therefor we need a
> way to
> > enable the Qt Network module when building for host.
>
> Ditto.
>
> > In commit message 09/14 I explained why I added an option to enable the
> Testlib
> > feature on host. You seemed to accept this explanation.
>
> Yes.
>
> > I added the blind host option for enabling the Qt Sql module to fix the
> > following build failure:
> >
> > CMake Error at
> /home/roy/src/buildroot-qt6-testing/buildroot/output/build/
> > qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message):
> > Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
> > Qt6ToolsTools package, but the package did not contain the tool. Make
> sure
> > that the host module Tools was built with all features enabled (no
> > explicitly disabled tools).
> > Call Stack (most recent call first):
> >
> /home/roy/src/buildroot-qt6-testing/buildroot/output/build/qt6base-6.7.0/
> > cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool)
> > src/assistant/qhelpgenerator/CMakeLists.txt:9 (qt_internal_add_tool)
> >
> > I'll add this to commit message 05/14, if you want me to create a v6
> patch set.
>
> No need to resend for now, let's see if I can apply with your additional
> explanations
>
> Thanks!
>
> Regards,
> Yann E. MORIN.
>
> > Best Regards,
> >
> > Roy
> >
> >
> > lør. 1. juni 2024 kl. 19:10 skrev Yann E. MORIN <[3]
> yann.morin.1998@free.fr>:
> >
> > Roy, All,
> >
> > Thanks for your new iteration of this series.
> >
> > I was looking at applying it, but I have a comment about this patch:
> why
> > is the host qt6base required to have GUI support to build the target
> > qt6shadertools?
> >
> > That's a question Thomas already asked in a previous iteration:
> > [4]
> https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
> >
> > but I could not see an explanation as a reply to Thomas, or in the
> > following versions of this series.
> >
> > Could you provide a little bit of an explanation? For example, does
> it
> > need a tool that is provided by qt6base only when the gui module is
> > enabled? Or something else?
> >
> > It does not need to be a long explanation, just a sentence or maybe
> two;
> > we just need to understand the dependency.
> >
> > Same goes for the qt6tols and its dependencies on
> HOST_QT6BASE_NETWORK
> > and HOST_QT6BASE_SQL, and other such dependencies.
> >
> > Thank you!
> >
> > Regards,
> > Yann E. MORIN.
> >
> > On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> > > Signed-off-by: Roy Kollen Svendsen <[5]
> > roy.kollen.svendsen@akersolutions.com>
> > > ---
> > > Changes v4 -> v5:
> > > - Bump to v6.7.1
> > >
> > > package/qt6/Config.in | 1 +
> > > package/qt6/qt6shadertools/Config.in | 13 +++++++
> > > .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
> > > package/qt6/qt6shadertools/[6]qt6shadertools.mk | 39
> > +++++++++++++++++++
> > > 4 files changed, 63 insertions(+)
> > > create mode 100644 package/qt6/qt6shadertools/Config.in
> > > create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
> > > create mode 100644 package/qt6/qt6shadertools/[7]
> qt6shadertools.mk
> > >
> > > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> > > index 276a0217ab..b7e95a6885 100644
> > > --- a/package/qt6/Config.in
> > > +++ b/package/qt6/Config.in
> > > @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
> > > source "package/qt6/qt6core5compat/Config.in"
> > > source "package/qt6/qt6serialbus/Config.in"
> > > source "package/qt6/qt6serialport/Config.in"
> > > +source "package/qt6/qt6shadertools/Config.in"
> > > source "package/qt6/qt6svg/Config.in"
> > >
> > > endif
> > > diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/
> > qt6shadertools/Config.in
> > > new file mode 100644
> > > index 0000000000..1b47dc6132
> > > --- /dev/null
> > > +++ b/package/qt6/qt6shadertools/Config.in
> > > @@ -0,0 +1,13 @@
> > > +config BR2_PACKAGE_QT6SHADERTOOLS
> > > + bool "qt6shadertools"
> > > + select BR2_PACKAGE_HOST_QT6BASE_GUI
> > > + select BR2_PACKAGE_QT6BASE_GUI
> > > + help
> > > + Qt is a cross-platform application and UI framework for
> > > + developers using C++.
> > > +
> > > + The Qt Shader Tools module builds on the SPIR-V Open
> > > + Source Ecosystem as described at the Khronos SPIR-V web
> > > + site.
> > > +
> > > + [8]https://doc.qt.io/qt-6/qtshadertools-index.html
> > > diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash
> b/package/qt6
> > /qt6shadertools/qt6shadertools.hash
> > > new file mode 100644
> > > index 0000000000..8e80d64851
> > > --- /dev/null
> > > +++ b/package/qt6/qt6shadertools/qt6shadertools.hash
> > > @@ -0,0 +1,10 @@
> > > +# Hash from: [9]
> https://download.qt.io/official_releases/qt/6.7/6.7.1/
> > submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> > > +sha256
> > e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2
> > qtshadertools-everywhere-src-6.7.1.tar.xz
> > > +
> > > +# Hashes for license files:
> > > +sha256
> > 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
> LICENSES/
> > BSD-3-Clause.txt
> > > +sha256
> > 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
> LICENSES/
> > GFDL-1.3-no-invariants-only.txt
> > > +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/qt6shadertools/[10]qt6shadertools.mk
> b/package/
> > qt6/qt6shadertools/[11]qt6shadertools.mk
> > > new file mode 100644
> > > index 0000000000..108f409380
> > > --- /dev/null
> > > +++ b/package/qt6/qt6shadertools/[12]qt6shadertools.mk
> > > @@ -0,0 +1,39 @@
> > >
> +########################################################################
> > ########
> > > +#
> > > +# qt6shadertools
> > > +#
> > >
> +########################################################################
> > ########
> > > +
> > > +QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
> > > +QT6SHADERTOOLS_SITE = $(QT6_SITE)
> > > +QT6SHADERTOOLS_SOURCE =
> qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$
> > (QT6SHADERTOOLS_VERSION).tar.xz
> > > +QT6SHADERTOOLS_INSTALL_STAGING = YES
> > > +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> > > +
> > > +QT6SHADERTOOLS_CMAKE_BACKEND = ninja
> > > +
> > > +QT6SHADERTOOLS_LICENSE = \
> > > + GPL-2.0+ or LGPL-3.0, \
> > > + GPL-3.0, GFDL-1.3 no invariants (docs)
> > > +
> > > +QT6SHADERTOOLS_LICENSE_FILES = \
> > > + LICENSES/GPL-2.0-only.txt \
> > > + LICENSES/GPL-3.0-only.txt \
> > > + LICENSES/LGPL-3.0-only.txt \
> > > + LICENSES/GFDL-1.3-no-invariants-only.txt
> > > +
> > > +QT6SHADERTOOLS_CONF_OPTS = \
> > > + -DBUILD_WITH_PCH=OFF \
> > > + -DQT_BUILD_EXAMPLES=OFF \
> > > + -DQT_BUILD_TESTS=OFF
> > > +
> > > +QT6SHADERTOOLS_DEPENDENCIES = \
> > > + host-pkgconf \
> > > + qt6base \
> > > + host-qt6shadertools
> > > +
> > > +HOST_QT6SHADERTOOLS_DEPENDENCIES = \
> > > + host-qt6base
> > > +
> > > +$(eval $(cmake-package))
> > > +$(eval $(host-cmake-package))
> > > --
> > > 2.45.1
> > >
> > > _______________________________________________
> > > buildroot mailing list
> > > [13]buildroot@buildroot.org
> > > [14]https://lists.buildroot.org/mailman/listinfo/buildroot
> >
> > --
> >
> .-----------------.--------------------.------------------.--------------------.
> > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> > conspiracy: |
> > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
>
> > |
> > | +33 561 099 427 `------------.-------: X AGAINST | \e/
> There is
> > no |
> > | [15]http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> > conspiracy. |
> > '------------------------------^-------^------------------^
> > --------------------'
> >
> >
> > References:
> >
> > [1] https://doc.qt.io/qt-6/qtshadertools-overview.html
> > [2] https://doc.qt.io/qt-6/qshaderbaker.html
> > [3] mailto:yann.morin.1998@free.fr
> > [4] https://lore.kernel.org/buildroot/20240509164507.4682bee8@windsurf/
> > [5] mailto:roy.kollen.svendsen@akersolutions.com
> > [6] http://qt6shadertools.mk/
> > [7] http://qt6shadertools.mk/
> > [8] https://doc.qt.io/qt-6/qtshadertools-index.html
> > [9]
> https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
> > [10] http://qt6shadertools.mk/
> > [11] http://qt6shadertools.mk/
> > [12] http://qt6shadertools.mk/
> > [13] mailto:buildroot@buildroot.org
> > [14] https://lists.buildroot.org/mailman/listinfo/buildroot
> > [15] http://ymorin.is-a-geek.org/
>
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
> |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is
> no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> conspiracy. |
>
> '------------------------------^-------^------------------^--------------------'
>
[-- Attachment #1.2: Type: text/html, Size: 17132 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* [Buildroot] [PATCH v5 07/14] package/qt6/qt6svg: allow building for host
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (6 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 08/14] package/qt6/qt6languageserver: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (5 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..8193d7d14a
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz.sha256
+sha256 a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9 qtlanguageserver-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-06-01 17:15 ` Yann E. MORIN
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (4 subsequent siblings)
12 siblings, 2 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Call Stack (most recent call first):
qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:180 (qt_internal_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
To avoid the following build error, we also make sure the host qt6base is
built with Testlib enabled:
CMake Error at buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message):
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Call Stack (most recent call first):
buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool)
tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
package/qt6/qt6declarative/Config.in | 24 ++++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
5 files changed, 120 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..1daa645413
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6LANGUAGESERVER
+ select BR2_PACKAGE_QT6SHADERTOOLS
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_HOST_QT6SVG
+ select BR2_PACKAGE_HOST_QT6DECLARATIVE
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..480e3805ca
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
+sha256 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c qtdeclarative-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..2348ff2dae
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_FEATURE_qml_profiler=OFF \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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 \
+ -DQT_FEATURE_ssl=OFF
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools \
+ host-qt6declarative \
+ qt6base \
+ qt6shadertools \
+ qt6languageserver \
+ qt6svg
+
+HOST_QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-01 17:15 ` Yann E. MORIN
2024-06-02 8:03 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
1 sibling, 1 reply; 114+ messages in thread
From: Yann E. MORIN @ 2024-06-01 17:15 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
Roy, All,
On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
> is not available. FEATURE_ssl is defined by the Qt Network module. So
> we will get the following build failure if the patch is not applied and
> FEATURE_network=ON:
>
> CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
> Attempting to evaluate feature ssl but its definition is missing. Either
> the feature does not exist or a dependency to the module that defines it is
> missing
> Call Stack (most recent call first):
> qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
> qt6base-6.7.0/cmake/QtFeature.cmake:180 (qt_internal_evaluate_config_expression)
> qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression)
> qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
> qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
> src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
>
> To avoid the following build error, we also make sure the host qt6base is
> built with Testlib enabled:
>
> CMake Error at buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message):
> Failed to find the host tool "Qt6::qmltestrunner". It is part of the
This is the kind of explanation (even if a bit verbose) that we indeed
need for the requirement on the host qt6base having some modules
enabled. If you can provide that for the other packages, that would be
awesome!
Regards,
Yann E. MORIN.
> Qt6QmlTools package, but the package did not contain the tool. Make sure
> that the host module Qml was built with all features enabled (no explicitly
> disabled tools).
> Call Stack (most recent call first):
> buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool)
> tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
>
> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> ---
> Changes v4 -> v5:
> - Bump to v6.7.1
>
> package/qt6/Config.in | 1 +
> ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
> package/qt6/qt6declarative/Config.in | 24 ++++++++
> .../qt6/qt6declarative/qt6declarative.hash | 11 ++++
> package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
> 5 files changed, 120 insertions(+)
> create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
> create mode 100644 package/qt6/qt6declarative/Config.in
> create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
> create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
>
> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> index 81682af476..625134d281 100644
> --- a/package/qt6/Config.in
> +++ b/package/qt6/Config.in
> @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
>
> source "package/qt6/qt6base/Config.in"
> source "package/qt6/qt6core5compat/Config.in"
> +source "package/qt6/qt6declarative/Config.in"
> source "package/qt6/qt6languageserver/Config.in"
> source "package/qt6/qt6serialbus/Config.in"
> source "package/qt6/qt6serialport/Config.in"
> 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
> new file mode 100644
> index 0000000000..bef5794229
> --- /dev/null
> +++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
> @@ -0,0 +1,28 @@
> +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/Config.in b/package/qt6/qt6declarative/Config.in
> new file mode 100644
> index 0000000000..1daa645413
> --- /dev/null
> +++ b/package/qt6/qt6declarative/Config.in
> @@ -0,0 +1,24 @@
> +config BR2_PACKAGE_QT6DECLARATIVE
> + bool "qt6declarative"
> + # Enable host test module to ensure that qmltestrunner is built
> + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + This package corresponds to the qt6declarative module.
> +
> + https://doc.qt.io/qt-6/qtdeclarative-index.html
> +
> +if BR2_PACKAGE_QT6DECLARATIVE
> +
> +config BR2_PACKAGE_QT6DECLARATIVE_QUICK
> + bool "quick module"
> + select BR2_PACKAGE_QT6BASE_GUI
> + select BR2_PACKAGE_QT6LANGUAGESERVER
> + select BR2_PACKAGE_QT6SHADERTOOLS
> + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
> + select BR2_PACKAGE_HOST_QT6SVG
> + select BR2_PACKAGE_HOST_QT6DECLARATIVE
> +
> +endif
> diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
> new file mode 100644
> index 0000000000..480e3805ca
> --- /dev/null
> +++ b/package/qt6/qt6declarative/qt6declarative.hash
> @@ -0,0 +1,11 @@
> +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
> +sha256 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c qtdeclarative-everywhere-src-6.7.1.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
> +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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
> +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
> new file mode 100644
> index 0000000000..2348ff2dae
> --- /dev/null
> +++ b/package/qt6/qt6declarative/qt6declarative.mk
> @@ -0,0 +1,56 @@
> +################################################################################
> +#
> +# qt6declaratve
> +#
> +################################################################################
> +
> +QT6DECLARATIVE_VERSION = $(QT6_VERSION)
> +QT6DECLARATIVE_SITE = $(QT6_SITE)
> +QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
> +QT6DECLARATIVE_INSTALL_STAGING = YES
> +
> +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
> +
> +QT6DECLARATIVE_CMAKE_BACKEND = ninja
> +
> +QT6DECLARATIVE_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
> +
> +QT6DECLARATIVE_LICENSE_FILES = \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt
> +
> +QT6DECLARATIVE_CONF_OPTS = \
> + -DQT_FEATURE_qml_profiler=OFF \
> + -DQT_HOST_PATH=$(HOST_DIR) \
> + -DBUILD_WITH_PCH=OFF \
> + -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 \
> + -DQT_FEATURE_ssl=OFF
> +
> +QT6DECLARATIVE_DEPENDENCIES = \
> + host-qt6base \
> + host-qt6svg \
> + host-qt6shadertools \
> + host-qt6declarative \
> + qt6base \
> + qt6shadertools \
> + qt6languageserver \
> + qt6svg
> +
> +HOST_QT6DECLARATIVE_DEPENDENCIES = \
> + host-qt6base \
> + host-qt6svg \
> + host-qt6shadertools
> +
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
> --
> 2.45.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: new package
2024-06-01 17:15 ` Yann E. MORIN
@ 2024-06-02 8:03 ` Roy Kollen Svendsen
2024-06-03 9:24 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-02 8:03 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 11052 bytes --]
Hi Yann,
Ok, thanks for your feedback. I'll try to follow the same pattern for all
commit messages for new packages requiring new blind host options. I will
try to make the exlanations less verbose, move the explanations to the
commits which apply the blind host options and add an explanation for Qt
Tools selecting Qt::Sql.
I'll probably try to rebuild the packages without the blind host options
enabled, to get the error messages. And add those (in a more compact form)
+ maybe some explanation by referencing relevant lines in the Qt
buildsystem.
Best Regards
Roy
lør. 1. jun. 2024, 19:15 skrev Yann E. MORIN <yann.morin.1998@free.fr>:
> Roy, All,
>
> On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
> > We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
> > is not available. FEATURE_ssl is defined by the Qt Network module. So
> > we will get the following build failure if the patch is not applied and
> > FEATURE_network=ON:
> >
> > CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
> > Attempting to evaluate feature ssl but its definition is missing.
> Either
> > the feature does not exist or a dependency to the module that defines
> it is
> > missing
> > Call Stack (most recent call first):
> > qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
> > qt6base-6.7.0/cmake/QtFeature.cmake:180
> (qt_internal_evaluate_config_expression)
> > qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression)
> > qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
> > qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
> > src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
> >
> > To avoid the following build error, we also make sure the host qt6base is
> > built with Testlib enabled:
> >
> > CMake Error at
> buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684
> (message):
> > Failed to find the host tool "Qt6::qmltestrunner". It is part of the
>
> This is the kind of explanation (even if a bit verbose) that we indeed
> need for the requirement on the host qt6base having some modules
> enabled. If you can provide that for the other packages, that would be
> awesome!
>
> Regards,
> Yann E. MORIN.
>
> > Qt6QmlTools package, but the package did not contain the tool. Make
> sure
> > that the host module Qml was built with all features enabled (no
> explicitly
> > disabled tools).
> > Call Stack (most recent call first):
> > buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72
> (qt_internal_find_tool)
> > tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
> >
> > Signed-off-by: Roy Kollen Svendsen <
> roy.kollen.svendsen@akersolutions.com>
> > ---
> > Changes v4 -> v5:
> > - Bump to v6.7.1
> >
> > package/qt6/Config.in | 1 +
> > ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
> > package/qt6/qt6declarative/Config.in | 24 ++++++++
> > .../qt6/qt6declarative/qt6declarative.hash | 11 ++++
> > package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
> > 5 files changed, 120 insertions(+)
> > create mode 100644
> package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
> > create mode 100644 package/qt6/qt6declarative/Config.in
> > create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
> > create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
> >
> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> > index 81682af476..625134d281 100644
> > --- a/package/qt6/Config.in
> > +++ b/package/qt6/Config.in
> > @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
> >
> > source "package/qt6/qt6base/Config.in"
> > source "package/qt6/qt6core5compat/Config.in"
> > +source "package/qt6/qt6declarative/Config.in"
> > source "package/qt6/qt6languageserver/Config.in"
> > source "package/qt6/qt6serialbus/Config.in"
> > source "package/qt6/qt6serialport/Config.in"
> > 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
> > new file mode 100644
> > index 0000000000..bef5794229
> > --- /dev/null
> > +++
> b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
> > @@ -0,0 +1,28 @@
> > +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/Config.in
> b/package/qt6/qt6declarative/Config.in
> > new file mode 100644
> > index 0000000000..1daa645413
> > --- /dev/null
> > +++ b/package/qt6/qt6declarative/Config.in
> > @@ -0,0 +1,24 @@
> > +config BR2_PACKAGE_QT6DECLARATIVE
> > + bool "qt6declarative"
> > + # Enable host test module to ensure that qmltestrunner is built
> > + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
> > + help
> > + Qt is a cross-platform application and UI framework for
> > + developers using C++.
> > +
> > + This package corresponds to the qt6declarative module.
> > +
> > + https://doc.qt.io/qt-6/qtdeclarative-index.html
> > +
> > +if BR2_PACKAGE_QT6DECLARATIVE
> > +
> > +config BR2_PACKAGE_QT6DECLARATIVE_QUICK
> > + bool "quick module"
> > + select BR2_PACKAGE_QT6BASE_GUI
> > + select BR2_PACKAGE_QT6LANGUAGESERVER
> > + select BR2_PACKAGE_QT6SHADERTOOLS
> > + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
> > + select BR2_PACKAGE_HOST_QT6SVG
> > + select BR2_PACKAGE_HOST_QT6DECLARATIVE
> > +
> > +endif
> > diff --git a/package/qt6/qt6declarative/qt6declarative.hash
> b/package/qt6/qt6declarative/qt6declarative.hash
> > new file mode 100644
> > index 0000000000..480e3805ca
> > --- /dev/null
> > +++ b/package/qt6/qt6declarative/qt6declarative.hash
> > @@ -0,0 +1,11 @@
> > +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
> > +sha256
> 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c
> qtdeclarative-everywhere-src-6.7.1.tar.xz
> > +
> > +# Hashes for license files:
> > +sha256
> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
> LICENSES/BSD-3-Clause.txt
> > +sha256
> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
> LICENSES/GFDL-1.3-no-invariants-only.txt
> > +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
> 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
> LICENSES/LicenseRef-Qt-Commercial.txt
> > +sha256
> 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
> LICENSES/Qt-GPL-exception-1.0.txt
> > diff --git a/package/qt6/qt6declarative/qt6declarative.mk
> b/package/qt6/qt6declarative/qt6declarative.mk
> > new file mode 100644
> > index 0000000000..2348ff2dae
> > --- /dev/null
> > +++ b/package/qt6/qt6declarative/qt6declarative.mk
> > @@ -0,0 +1,56 @@
> >
> +################################################################################
> > +#
> > +# qt6declaratve
> > +#
> >
> +################################################################################
> > +
> > +QT6DECLARATIVE_VERSION = $(QT6_VERSION)
> > +QT6DECLARATIVE_SITE = $(QT6_SITE)
> > +QT6DECLARATIVE_SOURCE =
> qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
> > +QT6DECLARATIVE_INSTALL_STAGING = YES
> > +
> > +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
> > +
> > +QT6DECLARATIVE_CMAKE_BACKEND = ninja
> > +
> > +QT6DECLARATIVE_LICENSE = \
> > + GPL-2.0+ or LGPL-3.0, \
> > + GPL-3.0, GFDL-1.3 no invariants (docs)
> > +
> > +QT6DECLARATIVE_LICENSE_FILES = \
> > + LICENSES/GPL-2.0-only.txt \
> > + LICENSES/GPL-3.0-only.txt \
> > + LICENSES/LGPL-3.0-only.txt \
> > + LICENSES/GFDL-1.3-no-invariants-only.txt
> > +
> > +QT6DECLARATIVE_CONF_OPTS = \
> > + -DQT_FEATURE_qml_profiler=OFF \
> > + -DQT_HOST_PATH=$(HOST_DIR) \
> > + -DBUILD_WITH_PCH=OFF \
> > + -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 \
> > + -DQT_FEATURE_ssl=OFF
> > +
> > +QT6DECLARATIVE_DEPENDENCIES = \
> > + host-qt6base \
> > + host-qt6svg \
> > + host-qt6shadertools \
> > + host-qt6declarative \
> > + qt6base \
> > + qt6shadertools \
> > + qt6languageserver \
> > + qt6svg
> > +
> > +HOST_QT6DECLARATIVE_DEPENDENCIES = \
> > + host-qt6base \
> > + host-qt6svg \
> > + host-qt6shadertools
> > +
> > +$(eval $(cmake-package))
> > +$(eval $(host-cmake-package))
> > --
> > 2.45.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
> |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is
> no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> conspiracy. |
>
> '------------------------------^-------^------------------^--------------------'
>
[-- Attachment #1.2: Type: text/html, Size: 14350 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: new package
2024-06-02 8:03 ` Roy Kollen Svendsen
@ 2024-06-03 9:24 ` Roy Kollen Svendsen
2024-06-03 9:59 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 9:24 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 13423 bytes --]
Hi Yann,
I've rebuilt with all Qt6 packages and features enabled but with the blind
host options set to OFF to recreate the error messages.
I will try to extract the essential parts of these and add to commit
messages for both qt6base and the dependent packages.
I'm also tracing the host tool dependencies in Qt6' cmake files to try to
formulate some better explanations.
Currently I've added some comments to the blind host options in qt6base.mk.
Any comments on the following?:
# 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. qsb is also required
# when building host-qt6declarative with Quick support, which is necessary
for
# the qmltime host tool to be built. qt6declarative fails to build if
qmltime is
# not available. Gui support is also required when building Svg support and
# thereby the svgtoqml host tool. qt6declarative will also fail to build if
# svgtoqml is not available.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
endif
# We need host-qt6base with Testlib support when building
host-qt6declarative,
# with QuickTest support. QuickTest support is further required for
building the
# qmltestrunner host tool. qt6declarative will fail to build if
qmltestrunner is
# not available.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
endif
Best Regards,
Roy
søn. 2. juni 2024 kl. 10:03 skrev Roy Kollen Svendsen <
roykollensvendsen@gmail.com>:
> Hi Yann,
>
> Ok, thanks for your feedback. I'll try to follow the same pattern for all
> commit messages for new packages requiring new blind host options. I will
> try to make the exlanations less verbose, move the explanations to the
> commits which apply the blind host options and add an explanation for Qt
> Tools selecting Qt::Sql.
>
> I'll probably try to rebuild the packages without the blind host options
> enabled, to get the error messages. And add those (in a more compact form)
> + maybe some explanation by referencing relevant lines in the Qt
> buildsystem.
>
> Best Regards
> Roy
>
> lør. 1. jun. 2024, 19:15 skrev Yann E. MORIN <yann.morin.1998@free.fr>:
>
>> Roy, All,
>>
>> On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
>> > We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
>> > is not available. FEATURE_ssl is defined by the Qt Network module. So
>> > we will get the following build failure if the patch is not applied and
>> > FEATURE_network=ON:
>> >
>> > CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
>> > Attempting to evaluate feature ssl but its definition is missing.
>> Either
>> > the feature does not exist or a dependency to the module that defines
>> it is
>> > missing
>> > Call Stack (most recent call first):
>> > qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
>> > qt6base-6.7.0/cmake/QtFeature.cmake:180
>> (qt_internal_evaluate_config_expression)
>> > qt6base-6.7.0/cmake/QtFeature.cmake:396
>> (qt_evaluate_config_expression)
>> > qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
>> > qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
>> > src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
>> >
>> > To avoid the following build error, we also make sure the host qt6base
>> is
>> > built with Testlib enabled:
>> >
>> > CMake Error at
>> buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684
>> (message):
>> > Failed to find the host tool "Qt6::qmltestrunner". It is part of the
>>
>> This is the kind of explanation (even if a bit verbose) that we indeed
>> need for the requirement on the host qt6base having some modules
>> enabled. If you can provide that for the other packages, that would be
>> awesome!
>>
>> Regards,
>> Yann E. MORIN.
>>
>> > Qt6QmlTools package, but the package did not contain the tool. Make
>> sure
>> > that the host module Qml was built with all features enabled (no
>> explicitly
>> > disabled tools).
>> > Call Stack (most recent call first):
>> > buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72
>> (qt_internal_find_tool)
>> > tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
>> >
>> > Signed-off-by: Roy Kollen Svendsen <
>> roy.kollen.svendsen@akersolutions.com>
>> > ---
>> > Changes v4 -> v5:
>> > - Bump to v6.7.1
>> >
>> > package/qt6/Config.in | 1 +
>> > ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
>> > package/qt6/qt6declarative/Config.in | 24 ++++++++
>> > .../qt6/qt6declarative/qt6declarative.hash | 11 ++++
>> > package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
>> > 5 files changed, 120 insertions(+)
>> > create mode 100644
>> package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
>> > create mode 100644 package/qt6/qt6declarative/Config.in
>> > create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
>> > create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
>> >
>> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
>> > index 81682af476..625134d281 100644
>> > --- a/package/qt6/Config.in
>> > +++ b/package/qt6/Config.in
>> > @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
>> >
>> > source "package/qt6/qt6base/Config.in"
>> > source "package/qt6/qt6core5compat/Config.in"
>> > +source "package/qt6/qt6declarative/Config.in"
>> > source "package/qt6/qt6languageserver/Config.in"
>> > source "package/qt6/qt6serialbus/Config.in"
>> > source "package/qt6/qt6serialport/Config.in"
>> > 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
>> > new file mode 100644
>> > index 0000000000..bef5794229
>> > --- /dev/null
>> > +++
>> b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
>> > @@ -0,0 +1,28 @@
>> > +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/Config.in
>> b/package/qt6/qt6declarative/Config.in
>> > new file mode 100644
>> > index 0000000000..1daa645413
>> > --- /dev/null
>> > +++ b/package/qt6/qt6declarative/Config.in
>> > @@ -0,0 +1,24 @@
>> > +config BR2_PACKAGE_QT6DECLARATIVE
>> > + bool "qt6declarative"
>> > + # Enable host test module to ensure that qmltestrunner is built
>> > + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
>> > + help
>> > + Qt is a cross-platform application and UI framework for
>> > + developers using C++.
>> > +
>> > + This package corresponds to the qt6declarative module.
>> > +
>> > + https://doc.qt.io/qt-6/qtdeclarative-index.html
>> > +
>> > +if BR2_PACKAGE_QT6DECLARATIVE
>> > +
>> > +config BR2_PACKAGE_QT6DECLARATIVE_QUICK
>> > + bool "quick module"
>> > + select BR2_PACKAGE_QT6BASE_GUI
>> > + select BR2_PACKAGE_QT6LANGUAGESERVER
>> > + select BR2_PACKAGE_QT6SHADERTOOLS
>> > + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
>> > + select BR2_PACKAGE_HOST_QT6SVG
>> > + select BR2_PACKAGE_HOST_QT6DECLARATIVE
>> > +
>> > +endif
>> > diff --git a/package/qt6/qt6declarative/qt6declarative.hash
>> b/package/qt6/qt6declarative/qt6declarative.hash
>> > new file mode 100644
>> > index 0000000000..480e3805ca
>> > --- /dev/null
>> > +++ b/package/qt6/qt6declarative/qt6declarative.hash
>> > @@ -0,0 +1,11 @@
>> > +# Hash from:
>> https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
>> > +sha256
>> 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c
>> qtdeclarative-everywhere-src-6.7.1.tar.xz
>> > +
>> > +# Hashes for license files:
>> > +sha256
>> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
>> LICENSES/BSD-3-Clause.txt
>> > +sha256
>> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
>> LICENSES/GFDL-1.3-no-invariants-only.txt
>> > +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
>> 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
>> LICENSES/LicenseRef-Qt-Commercial.txt
>> > +sha256
>> 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
>> LICENSES/Qt-GPL-exception-1.0.txt
>> > diff --git a/package/qt6/qt6declarative/qt6declarative.mk
>> b/package/qt6/qt6declarative/qt6declarative.mk
>> > new file mode 100644
>> > index 0000000000..2348ff2dae
>> > --- /dev/null
>> > +++ b/package/qt6/qt6declarative/qt6declarative.mk
>> > @@ -0,0 +1,56 @@
>> >
>> +################################################################################
>> > +#
>> > +# qt6declaratve
>> > +#
>> >
>> +################################################################################
>> > +
>> > +QT6DECLARATIVE_VERSION = $(QT6_VERSION)
>> > +QT6DECLARATIVE_SITE = $(QT6_SITE)
>> > +QT6DECLARATIVE_SOURCE =
>> qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
>> > +QT6DECLARATIVE_INSTALL_STAGING = YES
>> > +
>> > +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
>> > +
>> > +QT6DECLARATIVE_CMAKE_BACKEND = ninja
>> > +
>> > +QT6DECLARATIVE_LICENSE = \
>> > + GPL-2.0+ or LGPL-3.0, \
>> > + GPL-3.0, GFDL-1.3 no invariants (docs)
>> > +
>> > +QT6DECLARATIVE_LICENSE_FILES = \
>> > + LICENSES/GPL-2.0-only.txt \
>> > + LICENSES/GPL-3.0-only.txt \
>> > + LICENSES/LGPL-3.0-only.txt \
>> > + LICENSES/GFDL-1.3-no-invariants-only.txt
>> > +
>> > +QT6DECLARATIVE_CONF_OPTS = \
>> > + -DQT_FEATURE_qml_profiler=OFF \
>> > + -DQT_HOST_PATH=$(HOST_DIR) \
>> > + -DBUILD_WITH_PCH=OFF \
>> > + -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 \
>> > + -DQT_FEATURE_ssl=OFF
>> > +
>> > +QT6DECLARATIVE_DEPENDENCIES = \
>> > + host-qt6base \
>> > + host-qt6svg \
>> > + host-qt6shadertools \
>> > + host-qt6declarative \
>> > + qt6base \
>> > + qt6shadertools \
>> > + qt6languageserver \
>> > + qt6svg
>> > +
>> > +HOST_QT6DECLARATIVE_DEPENDENCIES = \
>> > + host-qt6base \
>> > + host-qt6svg \
>> > + host-qt6shadertools
>> > +
>> > +$(eval $(cmake-package))
>> > +$(eval $(host-cmake-package))
>> > --
>> > 2.45.1
>> >
>> > _______________________________________________
>> > buildroot mailing list
>> > buildroot@buildroot.org
>> > https://lists.buildroot.org/mailman/listinfo/buildroot
>>
>> --
>>
>> .-----------------.--------------------.------------------.--------------------.
>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
>> conspiracy: |
>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
>> |
>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There
>> is no |
>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
>> conspiracy. |
>>
>> '------------------------------^-------^------------------^--------------------'
>>
>
[-- Attachment #1.2: Type: text/html, Size: 16999 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: new package
2024-06-03 9:24 ` Roy Kollen Svendsen
@ 2024-06-03 9:59 ` Roy Kollen Svendsen
0 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 9:59 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 15698 bytes --]
Hi Yann,
After adding a couple of more comments qt6base.mk looks like:
# 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. qsb is also required
# when building host-qt6declarative with Quick support, which is necessary
for
# the qmltime host tool to be built. qt6declarative fails to build if
qmltime is
# not available. Gui support is also required when building Svg support and
# thereby the svgtoqml host tool. qt6declarative will also fail to build if
# svgtoqml is not available.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
# The Network module is explicitly required by qt6tools.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
# We need host qt6base with Sql support for host-qt6tools to generate the
# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
is not
# available.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
endif
# We need host-qt6base with Testlib support when building
host-qt6declarative,
# with QuickTest support. QuickTest support is further required for
building the
# qmltestrunner host tool. qt6declarative will fail to build if
qmltestrunner is
# not available.
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
endif
Best Regards,
Roy
man. 3. juni 2024 kl. 11:24 skrev Roy Kollen Svendsen <
roykollensvendsen@gmail.com>:
> Hi Yann,
>
> I've rebuilt with all Qt6 packages and features enabled but with the blind
> host options set to OFF to recreate the error messages.
>
> I will try to extract the essential parts of these and add to commit
> messages for both qt6base and the dependent packages.
>
> I'm also tracing the host tool dependencies in Qt6' cmake files to try to
> formulate some better explanations.
>
> Currently I've added some comments to the blind host options in qt6base.mk.
> Any comments on the following?:
>
> # 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. qsb is also
> required
> # when building host-qt6declarative with Quick support, which is necessary
> for
> # the qmltime host tool to be built. qt6declarative fails to build if
> qmltime is
> # not available. Gui support is also required when building Svg support and
> # thereby the svgtoqml host tool. qt6declarative will also fail to build if
> # svgtoqml is not available.
> ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
> else
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
> else
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
> else
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
> endif
>
> # We need host-qt6base with Testlib support when building
> host-qt6declarative,
> # with QuickTest support. QuickTest support is further required for
> building the
> # qmltestrunner host tool. qt6declarative will fail to build if
> qmltestrunner is
> # not available.
> ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
> else
> HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
> endif
>
> Best Regards,
> Roy
>
> søn. 2. juni 2024 kl. 10:03 skrev Roy Kollen Svendsen <
> roykollensvendsen@gmail.com>:
>
>> Hi Yann,
>>
>> Ok, thanks for your feedback. I'll try to follow the same pattern for all
>> commit messages for new packages requiring new blind host options. I will
>> try to make the exlanations less verbose, move the explanations to the
>> commits which apply the blind host options and add an explanation for Qt
>> Tools selecting Qt::Sql.
>>
>> I'll probably try to rebuild the packages without the blind host options
>> enabled, to get the error messages. And add those (in a more compact form)
>> + maybe some explanation by referencing relevant lines in the Qt
>> buildsystem.
>>
>> Best Regards
>> Roy
>>
>> lør. 1. jun. 2024, 19:15 skrev Yann E. MORIN <yann.morin.1998@free.fr>:
>>
>>> Roy, All,
>>>
>>> On 2024-05-31 17:13 +0200, Roy Kollen Svendsen spake thusly:
>>> > We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
>>> > is not available. FEATURE_ssl is defined by the Qt Network module. So
>>> > we will get the following build failure if the patch is not applied and
>>> > FEATURE_network=ON:
>>> >
>>> > CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
>>> > Attempting to evaluate feature ssl but its definition is missing.
>>> Either
>>> > the feature does not exist or a dependency to the module that
>>> defines it is
>>> > missing
>>> > Call Stack (most recent call first):
>>> > qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
>>> > qt6base-6.7.0/cmake/QtFeature.cmake:180
>>> (qt_internal_evaluate_config_expression)
>>> > qt6base-6.7.0/cmake/QtFeature.cmake:396
>>> (qt_evaluate_config_expression)
>>> > qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
>>> > qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
>>> > src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
>>> >
>>> > To avoid the following build error, we also make sure the host qt6base
>>> is
>>> > built with Testlib enabled:
>>> >
>>> > CMake Error at
>>> buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684
>>> (message):
>>> > Failed to find the host tool "Qt6::qmltestrunner". It is part of the
>>>
>>> This is the kind of explanation (even if a bit verbose) that we indeed
>>> need for the requirement on the host qt6base having some modules
>>> enabled. If you can provide that for the other packages, that would be
>>> awesome!
>>>
>>> Regards,
>>> Yann E. MORIN.
>>>
>>> > Qt6QmlTools package, but the package did not contain the tool. Make
>>> sure
>>> > that the host module Qml was built with all features enabled (no
>>> explicitly
>>> > disabled tools).
>>> > Call Stack (most recent call first):
>>> > buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72
>>> (qt_internal_find_tool)
>>> > tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool)
>>> >
>>> > Signed-off-by: Roy Kollen Svendsen <
>>> roy.kollen.svendsen@akersolutions.com>
>>> > ---
>>> > Changes v4 -> v5:
>>> > - Bump to v6.7.1
>>> >
>>> > package/qt6/Config.in | 1 +
>>> > ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
>>> > package/qt6/qt6declarative/Config.in | 24 ++++++++
>>> > .../qt6/qt6declarative/qt6declarative.hash | 11 ++++
>>> > package/qt6/qt6declarative/qt6declarative.mk | 56
>>> +++++++++++++++++++
>>> > 5 files changed, 120 insertions(+)
>>> > create mode 100644
>>> package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
>>> > create mode 100644 package/qt6/qt6declarative/Config.in
>>> > create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
>>> > create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
>>> >
>>> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
>>> > index 81682af476..625134d281 100644
>>> > --- a/package/qt6/Config.in
>>> > +++ b/package/qt6/Config.in
>>> > @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
>>> >
>>> > source "package/qt6/qt6base/Config.in"
>>> > source "package/qt6/qt6core5compat/Config.in"
>>> > +source "package/qt6/qt6declarative/Config.in"
>>> > source "package/qt6/qt6languageserver/Config.in"
>>> > source "package/qt6/qt6serialbus/Config.in"
>>> > source "package/qt6/qt6serialport/Config.in"
>>> > 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
>>> > new file mode 100644
>>> > index 0000000000..bef5794229
>>> > --- /dev/null
>>> > +++
>>> b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
>>> > @@ -0,0 +1,28 @@
>>> > +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/Config.in
>>> b/package/qt6/qt6declarative/Config.in
>>> > new file mode 100644
>>> > index 0000000000..1daa645413
>>> > --- /dev/null
>>> > +++ b/package/qt6/qt6declarative/Config.in
>>> > @@ -0,0 +1,24 @@
>>> > +config BR2_PACKAGE_QT6DECLARATIVE
>>> > + bool "qt6declarative"
>>> > + # Enable host test module to ensure that qmltestrunner is built
>>> > + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
>>> > + help
>>> > + Qt is a cross-platform application and UI framework for
>>> > + developers using C++.
>>> > +
>>> > + This package corresponds to the qt6declarative module.
>>> > +
>>> > + https://doc.qt.io/qt-6/qtdeclarative-index.html
>>> > +
>>> > +if BR2_PACKAGE_QT6DECLARATIVE
>>> > +
>>> > +config BR2_PACKAGE_QT6DECLARATIVE_QUICK
>>> > + bool "quick module"
>>> > + select BR2_PACKAGE_QT6BASE_GUI
>>> > + select BR2_PACKAGE_QT6LANGUAGESERVER
>>> > + select BR2_PACKAGE_QT6SHADERTOOLS
>>> > + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
>>> > + select BR2_PACKAGE_HOST_QT6SVG
>>> > + select BR2_PACKAGE_HOST_QT6DECLARATIVE
>>> > +
>>> > +endif
>>> > diff --git a/package/qt6/qt6declarative/qt6declarative.hash
>>> b/package/qt6/qt6declarative/qt6declarative.hash
>>> > new file mode 100644
>>> > index 0000000000..480e3805ca
>>> > --- /dev/null
>>> > +++ b/package/qt6/qt6declarative/qt6declarative.hash
>>> > @@ -0,0 +1,11 @@
>>> > +# Hash from:
>>> https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
>>> > +sha256
>>> 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c
>>> qtdeclarative-everywhere-src-6.7.1.tar.xz
>>> > +
>>> > +# Hashes for license files:
>>> > +sha256
>>> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
>>> LICENSES/BSD-3-Clause.txt
>>> > +sha256
>>> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
>>> LICENSES/GFDL-1.3-no-invariants-only.txt
>>> > +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
>>> 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
>>> LICENSES/LicenseRef-Qt-Commercial.txt
>>> > +sha256
>>> 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
>>> LICENSES/Qt-GPL-exception-1.0.txt
>>> > diff --git a/package/qt6/qt6declarative/qt6declarative.mk
>>> b/package/qt6/qt6declarative/qt6declarative.mk
>>> > new file mode 100644
>>> > index 0000000000..2348ff2dae
>>> > --- /dev/null
>>> > +++ b/package/qt6/qt6declarative/qt6declarative.mk
>>> > @@ -0,0 +1,56 @@
>>> >
>>> +################################################################################
>>> > +#
>>> > +# qt6declaratve
>>> > +#
>>> >
>>> +################################################################################
>>> > +
>>> > +QT6DECLARATIVE_VERSION = $(QT6_VERSION)
>>> > +QT6DECLARATIVE_SITE = $(QT6_SITE)
>>> > +QT6DECLARATIVE_SOURCE =
>>> qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
>>> > +QT6DECLARATIVE_INSTALL_STAGING = YES
>>> > +
>>> > +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
>>> > +
>>> > +QT6DECLARATIVE_CMAKE_BACKEND = ninja
>>> > +
>>> > +QT6DECLARATIVE_LICENSE = \
>>> > + GPL-2.0+ or LGPL-3.0, \
>>> > + GPL-3.0, GFDL-1.3 no invariants (docs)
>>> > +
>>> > +QT6DECLARATIVE_LICENSE_FILES = \
>>> > + LICENSES/GPL-2.0-only.txt \
>>> > + LICENSES/GPL-3.0-only.txt \
>>> > + LICENSES/LGPL-3.0-only.txt \
>>> > + LICENSES/GFDL-1.3-no-invariants-only.txt
>>> > +
>>> > +QT6DECLARATIVE_CONF_OPTS = \
>>> > + -DQT_FEATURE_qml_profiler=OFF \
>>> > + -DQT_HOST_PATH=$(HOST_DIR) \
>>> > + -DBUILD_WITH_PCH=OFF \
>>> > + -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 \
>>> > + -DQT_FEATURE_ssl=OFF
>>> > +
>>> > +QT6DECLARATIVE_DEPENDENCIES = \
>>> > + host-qt6base \
>>> > + host-qt6svg \
>>> > + host-qt6shadertools \
>>> > + host-qt6declarative \
>>> > + qt6base \
>>> > + qt6shadertools \
>>> > + qt6languageserver \
>>> > + qt6svg
>>> > +
>>> > +HOST_QT6DECLARATIVE_DEPENDENCIES = \
>>> > + host-qt6base \
>>> > + host-qt6svg \
>>> > + host-qt6shadertools
>>> > +
>>> > +$(eval $(cmake-package))
>>> > +$(eval $(host-cmake-package))
>>> > --
>>> > 2.45.1
>>> >
>>> > _______________________________________________
>>> > buildroot mailing list
>>> > buildroot@buildroot.org
>>> > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>
>>> --
>>>
>>> .-----------------.--------------------.------------------.--------------------.
>>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
>>> conspiracy: |
>>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
>>> |
>>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There
>>> is no |
>>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
>>> conspiracy. |
>>>
>>> '------------------------------^-------^------------------^--------------------'
>>>
>>
[-- Attachment #1.2: Type: text/html, Size: 19369 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1
2024-05-31 15:13 ` [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
2024-06-01 17:15 ` Yann E. MORIN
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (12 more replies)
1 sibling, 13 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
For details see [1], [2], [3], [4], [5], [6], [7], [8], [9] and [10].
[1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
[2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
[3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
[4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
[5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
[6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
[7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
[8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
[9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
[10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6.mk | 4 ++--
package/qt6/qt6base/qt6base.hash | 4 ++--
package/qt6/qt6base/qt6base.mk | 1 -
package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++--
package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++--
package/qt6/qt6serialport/qt6serialport.hash | 4 ++--
package/qt6/qt6svg/qt6svg.hash | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 1edb252c96..ee426884f9 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QT6_VERSION_MAJOR = 6.4
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.7
+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 cb111bd405..488f4b0136 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz.sha256
+sha256 b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 qtbase-everywhere-src-6.7.1.tar.xz
# Hashes for license files
sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6857725ef5..5bc5370834 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -9,7 +9,6 @@ QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CPE_ID_VENDOR = qt
QT6BASE_CPE_ID_PRODUCT = qt
-
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0735df3af2..c50093c0a9 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz.sha256
+sha256 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009 qt5compat-everywhere-src-6.7.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 98c8931962..d9cf2260c1 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
-sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz.sha256
+sha256 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f qtserialbus-everywhere-src-6.7.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 9341978d86..527bc14fe4 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886 qtserialport-everywhere-src-6.7.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 bb239cb012..80924035f0 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
-sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz.sha256
+sha256 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce qtsvg-everywhere-src-6.7.1.tar.xz
# Hashes for license files:
sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (11 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
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. qsb is also required
when building host-qt6declarative with Quick support, which is necessary for
the qmltime host tool to be built. qt6declarative fails to build if qmltime is
not available. Gui support is also required when building Svg support and
thereby the svgtoqml host tool. qt6declarative will also fail to build if
svgtoqml is not available.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
- Add explanation to qt6base blind host gui option
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 15 ++++++++++++++-
4 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 986b2854d0..cbf54f5752 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -95,6 +95,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5bc5370834..5b9ddc4d77 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,7 +83,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -97,6 +96,20 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+# 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. qsb is also required
+# when building host-qt6declarative with Quick support, which is necessary for
+# the qmltime host tool to be built. qt6declarative fails to build if qmltime is
+# not available. Gui support is also required when building Svg support and
+# thereby the svgtoqml host tool. qt6declarative will also fail to build if
+# svgtoqml is not available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (10 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
The Network module is explicitly required by qt6tools.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
- Add explanation to qt6base blind host network option
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5b9ddc4d77..6d2d3ef377 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -110,6 +109,13 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+# The Network module is explicitly required by qt6tools.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (9 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
We need host-qt6base with Testlib support when building host-qt6declarative
with QuickTest support. QuickTest support is further required for building the
qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
not available.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
- Add explanation to qt6base blind host testlib option
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6d2d3ef377..63584aa293 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -116,6 +115,16 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host-qt6base with Testlib support when building host-qt6declarative
+# with QuickTest support. QuickTest support is further required for building the
+# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
+# not available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (8 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
We need host qt6base with Sql support for host-qt6tools to generate the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
available.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
- Add explanation to qt6base blind host sql option
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 63584aa293..9adc03d59c 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -85,7 +85,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -115,6 +114,15 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host qt6base with Sql support for host-qt6tools to generate the
+# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
+# available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
# We need host-qt6base with Testlib support when building host-qt6declarative
# with QuickTest support. QuickTest support is further required for building the
# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 06/14] package/qt6/qt6shadertools: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (7 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
We need host-qt6base with Gui support when building host-qt6shadertools,
otherwise the build is skipped and no qsb host tool is generated:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
qt6shadertools fail to build if qsb is not available:
Failed to find the host tool "Qt6::qsb". It is part of the
Qt6ShaderToolsTools package, but the package could not be found. Make sure
you have built and installed the host ShaderTools module, which will ensure
the creation of the Qt6ShaderToolsTools package.
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..8e80d64851
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 qtshadertools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 07/14] package/qt6/qt6svg: allow building for host
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (6 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 08/14] package/qt6/qt6languageserver: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (5 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..8193d7d14a
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz.sha256
+sha256 a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9 qtlanguageserver-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-13 22:01 ` Hannah Kiekens via buildroot
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (4 subsequent siblings)
12 siblings, 2 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
We need host-qt6base with Gui support when building host-qt6shadertools,
otherwise the build is skipped and no qsb host tool is generated.
qsb is required when building host-qt6declarative with Quick support,
which is necessary for the qmltime host tool to be built. qt6declarative
fails to build if qmltime is not available:
Failed to find the host tool "Qt6::qmltime". It is part of the Qt6QmlTools
package, but the package did not contain the tool. Make sure that the host
module Qml was built with all features enabled (no explicitly disabled
tools).
Gui support is also required when building Svg support and thereby the
svgtoqml host tool. qt6declarative will also fail to build if svgtoqmlis not
available:
Failed to find the host tool "Qt6::svgtoqml". It is part of the
Qt6QuickTools package, but the package could not be found. Make sure you
have built and installed the host Quick module, which will ensure the
creation of the Qt6QuickTools package.
We need host-qt6base with Testlib support when building host-qt6declarative
with QuickTest support. QuickTest support is further required for building the
qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
not available:
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++
package/qt6/qt6declarative/Config.in | 24 ++++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
5 files changed, 120 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..1daa645413
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6LANGUAGESERVER
+ select BR2_PACKAGE_QT6SHADERTOOLS
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_HOST_QT6SVG
+ select BR2_PACKAGE_HOST_QT6DECLARATIVE
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..480e3805ca
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
+sha256 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c qtdeclarative-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..2348ff2dae
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_FEATURE_qml_profiler=OFF \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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 \
+ -DQT_FEATURE_ssl=OFF
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools \
+ host-qt6declarative \
+ qt6base \
+ qt6shadertools \
+ qt6languageserver \
+ qt6svg
+
+HOST_QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-13 22:01 ` Hannah Kiekens via buildroot
2024-06-16 6:55 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
1 sibling, 1 reply; 114+ messages in thread
From: Hannah Kiekens via buildroot @ 2024-06-13 22:01 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 277 bytes --]
config BR2_PACKAGE_QT6DECLARATIVE needs to have
select BR2_PACKAGE_QT6SVG
otherwise I get:
Makefile:574: *** qt6svg is in the dependency chain of qt6declarative that
has added it to its _DEPENDENCIES variable without selecting it or
depending on it from Config.in. Stop.
[-- Attachment #1.2: Type: text/html, Size: 355 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: new package
2024-06-13 22:01 ` Hannah Kiekens via buildroot
@ 2024-06-16 6:55 ` Roy Kollen Svendsen
0 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-16 6:55 UTC (permalink / raw)
To: Hannah Kiekens
Cc: Roy Kollen Svendsen, Samuel Martin, Thomas Petazzoni, buildroot,
Zoltan Gyarmati, Jesse Van Gavere
[-- Attachment #1.1: Type: text/plain, Size: 510 bytes --]
Hi Hannah,
Thank you for testing and and reporting this.
I will try to fix this and other dependency related problems.
Best Regards,
Roy
fre. 14. juni 2024 kl. 00:01 skrev Hannah Kiekens <hannah.kiekens@mind.be>:
> config BR2_PACKAGE_QT6DECLARATIVE needs to have
> select BR2_PACKAGE_QT6SVG
>
> otherwise I get:
> Makefile:574: *** qt6svg is in the dependency chain of qt6declarative that
> has added it to its _DEPENDENCIES variable without selecting it or
> depending on it from Config.in. Stop.
>
[-- Attachment #1.2: Type: text/html, Size: 952 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1
2024-06-03 11:51 ` [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
2024-06-13 22:01 ` Hannah Kiekens via buildroot
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (12 more replies)
1 sibling, 13 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
For details see [1], [2], [3], [4], [5], [6], [7], [8], [9] and [10].
[1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
[2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
[3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
[4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
[5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
[6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
[7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
[8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
[9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
[10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6.mk | 4 ++--
package/qt6/qt6base/qt6base.hash | 4 ++--
package/qt6/qt6base/qt6base.mk | 1 -
package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++--
package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++--
package/qt6/qt6serialport/qt6serialport.hash | 4 ++--
package/qt6/qt6svg/qt6svg.hash | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 1edb252c96..ee426884f9 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QT6_VERSION_MAJOR = 6.4
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.7
+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 cb111bd405..488f4b0136 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz.sha256
+sha256 b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 qtbase-everywhere-src-6.7.1.tar.xz
# Hashes for license files
sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 211808d2af..13999bbd44 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -9,7 +9,6 @@ QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CPE_ID_VENDOR = qt
QT6BASE_CPE_ID_PRODUCT = qt
-
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0735df3af2..c50093c0a9 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz.sha256
+sha256 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009 qt5compat-everywhere-src-6.7.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 98c8931962..d9cf2260c1 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
-sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz.sha256
+sha256 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f qtserialbus-everywhere-src-6.7.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 9341978d86..527bc14fe4 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886 qtserialport-everywhere-src-6.7.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 bb239cb012..80924035f0 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
-sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz.sha256
+sha256 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce qtsvg-everywhere-src-6.7.1.tar.xz
# Hashes for license files:
sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (11 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
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.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- Simplify explanation in commit message
- Simplify explanation for blind host gui option
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
4 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 9cdca62633..66f3a6fa9d 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -92,6 +92,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 13999bbd44..a229c62844 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,7 +83,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -97,6 +96,15 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+# 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.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (10 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index a229c62844..509c6b0066 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -105,6 +104,13 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+# The Network module is explicitly required by qt6tools.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (9 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host-qt6base with Testlib support when building host-qt6declarative
with QuickTest support. QuickTest support is further required for building the
qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
not available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 509c6b0066..6b9f425255 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -111,6 +110,16 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host-qt6base with Testlib support when building host-qt6declarative
+# with QuickTest support. QuickTest support is further required for building the
+# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
+# not available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (8 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host qt6base with Sql support for host-qt6tools to generate the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6b9f425255..d8d68e5254 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -85,7 +85,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -110,6 +109,15 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host qt6base with Sql support for host-qt6tools to generate the
+# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
+# available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
# We need host-qt6base with Testlib support when building host-qt6declarative
# with QuickTest support. QuickTest support is further required for building the
# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 06/14] package/qt6/qt6shadertools: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (7 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
We need host-qt6base with Gui support when building host-qt6shadertools,
otherwise the build is skipped and no qsb host tool is generated:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
qt6shadertools fail to build if qsb is not available:
Failed to find the host tool "Qt6::qsb". It is part of the
Qt6ShaderToolsTools package, but the package could not be found. Make sure
you have built and installed the host ShaderTools module, which will ensure
the creation of the Qt6ShaderToolsTools package.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..8e80d64851
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 qtshadertools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 07/14] package/qt6/qt6svg: allow building for host
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (6 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 08/14] package/qt6/qt6languageserver: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (5 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..8193d7d14a
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz.sha256
+sha256 a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9 qtlanguageserver-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 09/14] package/qt6/qt6declarative: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 10/14] package/qt6/qt6websockets: new package Roy Kollen Svendsen
` (4 subsequent siblings)
12 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host-qt6svg when qt6svg is available to build the required
svgtoqml host tool:
Failed to find the host tool "Qt6::svgtoqml". It is part of the
Qt6QuickTools package, but the package could not be found. Make sure you
have built and installed the host Quick module, which will ensure the
creation of the Qt6QuickTools package.
We need host-qt6base with Testlib support when building
host-qt6declarative with QuickTest support. QuickTest support is
required for building the qmltestrunner host tool. qt6declarative will
fail to build if qmltestrunner is not available:
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
We add the patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- Simplify commit message
- We don't need Testlib support for host when not building the quick module
- Remove dependencies on qt6svg and qt6languageserver
- Only add qt6svg and qt6shadertools to dependencies when Quick is enabled
- Don't turn off QT_FEATURE_ssl and QT_FEATURE_qml_profiler
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 +++++++++
package/qt6/qt6declarative/Config.in | 21 +++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 61 +++++++++++++++++++
5 files changed, 122 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..9cff83d982
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST # qmltestrunner
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_QT6SHADERTOOLS
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..480e3805ca
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
+sha256 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c qtdeclarative-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..e3af0e80ef
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6declarative \
+ qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE_QUICK),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6shadertools
+QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6base \
+ qt6shadertools
+
+# We need host-qt6svg, when qt6svg is available to build the required
+# svgtoqml host tool
+ifeq ($(BR2_PACKAGE_QT6SVG),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += host-qt6svg
+endif
+
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1
2024-06-18 13:18 ` [Buildroot] [PATCH v7 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (13 more replies)
0 siblings, 14 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
For details see [1], [2], [3], [4], [5], [6], [7], [8], [9] and [10].
[1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
[2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
[3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
[4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
[5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
[6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
[7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
[8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
[9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
[10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6.mk | 4 ++--
package/qt6/qt6base/qt6base.hash | 4 ++--
package/qt6/qt6base/qt6base.mk | 1 -
package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++--
package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++--
package/qt6/qt6serialport/qt6serialport.hash | 4 ++--
package/qt6/qt6svg/qt6svg.hash | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 1edb252c96..ee426884f9 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QT6_VERSION_MAJOR = 6.4
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.7
+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 cb111bd405..488f4b0136 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz.sha256
+sha256 b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 qtbase-everywhere-src-6.7.1.tar.xz
# Hashes for license files
sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 211808d2af..13999bbd44 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -9,7 +9,6 @@ QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CPE_ID_VENDOR = qt
QT6BASE_CPE_ID_PRODUCT = qt
-
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0735df3af2..c50093c0a9 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz.sha256
+sha256 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009 qt5compat-everywhere-src-6.7.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 98c8931962..d9cf2260c1 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
-sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz.sha256
+sha256 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f qtserialbus-everywhere-src-6.7.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 9341978d86..527bc14fe4 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886 qtserialport-everywhere-src-6.7.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 bb239cb012..80924035f0 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
-sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz.sha256
+sha256 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce qtsvg-everywhere-src-6.7.1.tar.xz
# Hashes for license files:
sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (12 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
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.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
4 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 9cdca62633..66f3a6fa9d 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -92,6 +92,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 13999bbd44..a229c62844 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,7 +83,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -97,6 +96,15 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+# 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.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (11 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index a229c62844..509c6b0066 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -105,6 +104,13 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+# The Network module is explicitly required by qt6tools.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (10 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host-qt6base with Testlib support when building host-qt6declarative
with QuickTest support. QuickTest support is further required for building the
qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
not available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 509c6b0066..6b9f425255 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -111,6 +110,16 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host-qt6base with Testlib support when building host-qt6declarative
+# with QuickTest support. QuickTest support is further required for building the
+# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
+# not available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (9 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host qt6base with Sql support for host-qt6tools to generate the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6b9f425255..d8d68e5254 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -85,7 +85,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -110,6 +109,15 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host qt6base with Sql support for host-qt6tools to generate the
+# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
+# available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
# We need host-qt6base with Testlib support when building host-qt6declarative
# with QuickTest support. QuickTest support is further required for building the
# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 06/14] package/qt6/qt6shadertools: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (8 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
We need host-qt6base with Gui support when building host-qt6shadertools,
otherwise the build is skipped and no qsb host tool is generated:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
qt6shadertools fail to build if qsb is not available:
Failed to find the host tool "Qt6::qsb". It is part of the
Qt6ShaderToolsTools package, but the package could not be found. Make sure
you have built and installed the host ShaderTools module, which will ensure
the creation of the Qt6ShaderToolsTools package.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..8e80d64851
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 qtshadertools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 07/14] package/qt6/qt6svg: allow building for host
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (7 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 08/14] package/qt6/qt6languageserver: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (6 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..8193d7d14a
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz.sha256
+sha256 a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9 qtlanguageserver-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 09/14] package/qt6/qt6declarative: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (5 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Add host-qt6svg to dependencies when qt6svg is available to build the
required svgtoqml host tool:
Failed to find the host tool "Qt6::svgtoqml". It is part of the
Qt6QuickTools package, but the package could not be found. Make sure you
have built and installed the host Quick module, which will ensure the
creation of the Qt6QuickTools package.
Select the host-qt6base Testlib module to build the qmltestrunner host
tool when the qt6base Testlib module is enabled:
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Select the host-qt6base Network module to build the qmlprofiler host
tool when the qt6base Network module is enabled:
Failed to find the host tool "Qt6::qmlprofiler". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Add patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v7 -> v8:
- Simplify commit message
- Add section about missing qmlprofiler host tool to commit message
- Fix build caused by missing qmlprofiler host tool
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 +++++++++
package/qt6/qt6declarative/Config.in | 22 +++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 61 +++++++++++++++++++
5 files changed, 123 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..0a977ed808
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST # qmltestrunner
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK if BR2_PACKAGE_QT6BASE_NETWORK # qmlprofiler
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_QT6SHADERTOOLS
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..480e3805ca
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz.sha256
+sha256 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c qtdeclarative-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..e3af0e80ef
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6declarative \
+ qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE_QUICK),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6shadertools
+QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6base \
+ qt6shadertools
+
+# We need host-qt6svg, when qt6svg is available to build the required
+# svgtoqml host tool
+ifeq ($(BR2_PACKAGE_QT6SVG),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += host-qt6svg
+endif
+
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 10/14] package/qt6/qt6websockets: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (4 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 10 +++++
package/qt6/qt6websockets/qt6websockets.hash | 11 ++++++
package/qt6/qt6websockets/qt6websockets.mk | 39 ++++++++++++++++++++
4 files changed, 61 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..7d65a8e65a
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4fa6bdb79f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz.sha256
+sha256 fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb qtwebsockets-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..5dd5c8c50f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WEBSOCKETS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 11/14] package/qt6/qt6wayland: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (3 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Add host-qt6wayland as dependency to build the qtwaylandscanner host
tool:
Failed to find the host tool "Qt6::qtwaylandscanner". It is part of the
Qt6WaylandScannerTools package, but the package could not be found. Make
sure you have built and installed the host WaylandScanner module, which
will ensure the creation of the Qt6WaylandScannerTools package.
Select the qt6base and host-qt6base Gui modules to avoid skipping the
build:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 27 +++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 +++++
package/qt6/qt6wayland/qt6wayland.mk | 56 ++++++++++++++++++++++++++
4 files changed, 95 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..11179a4416
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,27 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..b0760f661e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20 qtwayland-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..62fa966577
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ wayland \
+ host-qt6wayland
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DFEATURE_wayland_client=OFF \
+ -DFEATURE_wayland_server=OFF
+
+HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WAYLAND_DEPENDENCIES += qt6declarative
+endif
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+QT6WAYLAND_DEPENDENCIES += libxkbcommon
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 12/14] package/qt6/qt6tools: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
` (2 subsequent siblings)
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools:
Failed to find required Qt component "Network".
We need host-qt6base with Sql support for host-qt6tools to build the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
is not available:
Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
Qt6ToolsTools package, but the package did not contain the tool. Make sure
that the host module Tools was built with all features enabled (no
explicitly disabled tools).
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 ++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 ++++++++
package/qt6/qt6tools/qt6tools.mk | 40 ++++++++++++++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..2e0484af2e
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..bc034a5e16
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 qttools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..2dd6670dff
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ host-qt6tools
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6TOOLS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 13/14] package/qt6/qt6virtualkeyboard: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-18 21:26 ` [Buildroot] [PATCH v8 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 11 +++++
.../qt6virtualkeyboard.hash | 12 ++++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 41 +++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..c183e14001
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ select BR2_PACKAGE_QT6DECLERATIVE
+ select BR2_PACKAGE_QT6SVG
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..3f7f067de5
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7b6cd83d1b7f622f909b38bd429536b9d0829621f2d111b3a2f90d8bcdcba85d qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e65e955808
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v8 14/14] package/qt6/qt6mqtt: new package
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-06-18 21:26 ` Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
13 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 21:26 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index ee426884f9..5431629ede 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ 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
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..658bddaa75
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 f1c3b739296832befe24309130ead4ef4167f4cc2029a9c258821f92e7733fb4 qt6mqtt-6.7.1-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2
2024-06-18 21:26 ` [Buildroot] [PATCH v8 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (12 preceding siblings ...)
2024-06-18 21:26 ` [Buildroot] [PATCH v8 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (14 more replies)
13 siblings, 15 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
For details see [1], [2], [3], [4], [5], [6], [7], [8], [9], [10] and [11].
[1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
[2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
[3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
[4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
[5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
[6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
[7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
[8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
[9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
[10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
[11] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- add release note link for 6.7.2 to commit message
- bump version from 6.7.1 to 6.7.2
- update hashes for existing qt6 packages
package/qt6/qt6.mk | 4 ++--
package/qt6/qt6base/qt6base.hash | 4 ++--
package/qt6/qt6base/qt6base.mk | 1 -
package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++--
package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++--
package/qt6/qt6serialport/qt6serialport.hash | 4 ++--
package/qt6/qt6svg/qt6svg.hash | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 1edb252c96..372a92f413 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QT6_VERSION_MAJOR = 6.4
-QT6_VERSION = $(QT6_VERSION_MAJOR).3
+QT6_VERSION_MAJOR = 6.7
+QT6_VERSION = $(QT6_VERSION_MAJOR).2
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 cb111bd405..b1b81b4992 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.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz.sha256
+sha256 c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 qtbase-everywhere-src-6.7.2.tar.xz
# Hashes for license files
sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 211808d2af..13999bbd44 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -9,7 +9,6 @@ QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CPE_ID_VENDOR = qt
QT6BASE_CPE_ID_PRODUCT = qt
-
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash
index 0735df3af2..36421b53ca 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qt5compat-everywhere-src-6.7.2.tar.xz.sha256
+sha256 8826b5189efc4d9bdb64fdb1aa89d0fdf4e53c60948ed7995621ed046e38c003 qt5compat-everywhere-src-6.7.2.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 98c8931962..1b854284a3 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.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256
-sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtserialbus-everywhere-src-6.7.2.tar.xz.sha256
+sha256 67641ca99b455746d7d956c516dfaa5f2c48696834c71d5720d63e736d374b2b qtserialbus-everywhere-src-6.7.2.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 9341978d86..c8708c2231 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.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256
-sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtserialport-everywhere-src-6.7.2.tar.xz.sha256
+sha256 21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc qtserialport-everywhere-src-6.7.2.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 bb239cb012..7adfd7f2fb 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.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256
-sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtsvg-everywhere-src-6.7.2.tar.xz.sha256
+sha256 fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 qtsvg-everywhere-src-6.7.2.tar.xz
# Hashes for license files:
sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:47 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
` (13 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
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.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
4 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 9cdca62633..66f3a6fa9d 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -92,6 +92,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# 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
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 13999bbd44..a229c62844 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,7 +83,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -97,6 +96,15 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+# 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.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-07-12 8:47 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:47 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:26 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> +# 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.
> +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
> +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
> +else
> +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
> +endif
This was failing to build here with:
ERROR: The OpenGL functionality tests failed! You might need to modify the OpenGL package search path by setting the OpenGL_DIR CMake variable to the OpenGL library's installation directory
So to fix this, I changed to:
ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
HOST_QT6BASE_CONF_OPTS += \
-DFEATURE_gui=ON \
-DFEATURE_freetype=OFF \
-DFEATURE_vulkan=OFF \
-DFEATURE_linuxfb=ON \
-DFEATURE_xcb=OFF \
-DFEATURE_opengl=OFF -DINPUT_opengl=no \
-DFEATURE_harfbuzz=OFF \
-DFEATURE_png=OFF \
-DFEATURE_gif=OFF \
-DFEATURE_jpeg=OFF \
-DFEATURE_printsupport=OFF \
-DFEATURE_kms=OFF \
-DFEATURE_fontconfig=OFF \
-DFEATURE_widgets=OFF \
-DFEATURE_libinput=OFF \
-DFEATURE_tslib=OFF \
-DFEATURE_eglfs=OFF
else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
So basically, I've disabled every option that we have support for for
the target GUI support, except linuxfb=ON, to have one backend enabled.
Applied with this change. Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:47 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
` (12 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index a229c62844..509c6b0066 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -105,6 +104,13 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+# The Network module is explicitly required by qt6tools.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 03/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-07-12 8:47 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:47 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
On Tue, 25 Jun 2024 23:18:27 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> The Network module is explicitly required by qt6tools.
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> package/qt6/qt6base/Config.in.host | 5 +++++
> package/qt6/qt6base/qt6base.mk | 8 +++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
Applied to master, thanks.
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] 114+ messages in thread
* [Buildroot] [PATCH v9 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 02/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
2024-06-25 21:18 ` [Buildroot] [PATCH v9 03/14] package/qt6/qt6base: add blind option to enable Network " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:47 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
` (11 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host-qt6base with Testlib support when building host-qt6declarative
with QuickTest support. QuickTest support is further required for building the
qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
not available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 286da0ff03..80bc13c7dc 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
# (e.g. Qt Tools).
config BR2_PACKAGE_HOST_QT6BASE_NETWORK
bool
+
+# Select this if you need host qt6 tools that require the Qt::Test module
+# (e.g. qmltestrunner).
+config BR2_PACKAGE_HOST_QT6BASE_TEST
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 509c6b0066..6b9f425255 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
- -DFEATURE_testlib=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -111,6 +110,16 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host-qt6base with Testlib support when building host-qt6declarative
+# with QuickTest support. QuickTest support is further required for building the
+# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
+# not available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 04/14] package/qt6/qt6base: add blind option to enable Test support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-07-12 8:47 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:47 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
On Tue, 25 Jun 2024 23:18:28 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> We need host-qt6base with Testlib support when building host-qt6declarative
> with QuickTest support. QuickTest support is further required for building the
> qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
> not available.
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> package/qt6/qt6base/Config.in.host | 5 +++++
> package/qt6/qt6base/qt6base.mk | 11 ++++++++++-
> 2 files changed, 15 insertions(+), 1 deletion(-)
Applied to master, thanks.
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] 114+ messages in thread
* [Buildroot] [PATCH v9 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 04/14] package/qt6/qt6base: add blind option to enable Test " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:47 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (10 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
We need host qt6base with Sql support for host-qt6tools to generate the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
available.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 80bc13c7dc..46fb668817 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
# (e.g. qmltestrunner).
config BR2_PACKAGE_HOST_QT6BASE_TEST
bool
+
+# Select this if you need host qt6 tools that require the Qt::Sql module
+# (e.g. qhelpgenerator).
+config BR2_PACKAGE_HOST_QT6BASE_SQL
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6b9f425255..d8d68e5254 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -85,7 +85,6 @@ HOST_QT6BASE_DEPENDENCIES = \
HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
- -DFEATURE_sql=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -110,6 +109,15 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+# We need host qt6base with Sql support for host-qt6tools to generate the
+# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
+# available.
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
# We need host-qt6base with Testlib support when building host-qt6declarative
# with QuickTest support. QuickTest support is further required for building the
# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 05/14] package/qt6/qt6base: add blind option to enable Sql support on host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-07-12 8:47 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:47 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
On Tue, 25 Jun 2024 23:18:29 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> We need host qt6base with Sql support for host-qt6tools to generate the
> qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
> available.
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> package/qt6/qt6base/Config.in.host | 5 +++++
> package/qt6/qt6base/qt6base.mk | 10 +++++++++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
Applied to master, thanks.
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] 114+ messages in thread
* [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 05/14] package/qt6/qt6base: add blind option to enable Sql " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:51 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (9 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
We need host-qt6base with Gui support when building host-qt6shadertools,
otherwise the build is skipped and no qsb host tool is generated:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
qt6shadertools fail to build if qsb is not available:
Failed to find the host tool "Qt6::qsb". It is part of the
Qt6ShaderToolsTools package, but the package could not be found. Make sure
you have built and installed the host ShaderTools module, which will ensure
the creation of the Qt6ShaderToolsTools package.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..9cb423c90f
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtshadertools-everywhere-src-6.7.2.tar.xz.sha256
+sha256 edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 qtshadertools-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-07-12 8:51 ` Thomas Petazzoni via buildroot
2024-07-14 8:33 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:51 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:30 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
> new file mode 100644
> index 0000000000..1b47dc6132
> --- /dev/null
> +++ b/package/qt6/qt6shadertools/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_QT6SHADERTOOLS
> + bool "qt6shadertools"
> + select BR2_PACKAGE_HOST_QT6BASE_GUI
I've added a comment above this line (taken from your commit log) to
explain why we are selecting this, as it's not obvious.
> +QT6SHADERTOOLS_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
This licensing information looked not correct, and actually the
licensing info was also not correct for qt6languageserver, it seems to
just be copy/pasted. So I'm wondering if the licensing information for
qt6 packages we already have in the tree is correct. Could you do a
review?
To do this review, just do:
grep -r SPDX *
in the source tree.
For shadertools, this gives us:
buildroot-build/include/QtShaderTools/qtshadertoolsexports.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
buildroot-build/include/QtShaderTools/6.7.2/QtShaderTools/private/qtshadertoolsexports_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
buildroot-build/lib/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake:# SPDX-License-Identifier: BSD-3-Clause
buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersion.cmake:# SPDX-License-Identifier: BSD-3-Clause
CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
licenseRule.json: "spdx: list of SPDX-License-Expression's allowed in the matching files.",
src/SPIRV-Cross/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/3rdparty/SPIRV-Cross/spirv_hlsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_hlsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/GLSL.std.450.h: * SPDX-License-Identifier: MIT
src/3rdparty/SPIRV-Cross/spirv_glsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cpp.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_c.h: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cfg.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_util.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_msl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_parser.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_util.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cfg.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_c.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_error_handling.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_parser.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_reflect.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cpp.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_common.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_glsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_cross.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_reflect.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/3rdparty/SPIRV-Cross/spirv_msl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
src/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/shadertools/qshaderrewriter_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshader_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvcompiler.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
src/shadertools/qspirvcompiler_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshaderremap.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qtshadertoolsglobal.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderrewriter.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/doc/src/qtshadertools-index.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-qsb.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-overview.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/doc/src/qtshadertools-build.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
src/shadertools/qspirvshaderremap_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qspirvshader.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qshaderbaker.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/shadertools/qtshadertoolsglobal_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
src/glslang/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/cmake/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/qshaderbaker/tst_qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/auto/qshaderbaker/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/buildtimeqsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tests/auto/buildtimeqsb/tst_buildtimeqsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/main.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/main.qml:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
tests/manual/qmlappshadermacro/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/qsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
tools/qsb/qsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
tools/qsb/Qt6ShaderToolsMacros.cmake:# SPDX-License-Identifier: BSD-3-Clause
So, I've summarized that as:
+QT6SHADERTOOLS_LICENSE = \
+ Apache-2.0 or MIT (SPIRV-Cross), \
+ GPL-2.0 or LGPL-3.0 or GPL-3.0, \
+ GPL-3.0 (tests), GFDL-1.3 no invariants (docs), \
+ GPL-3.0 WITH Qt-GPL-exception-1.0 (tools)
> +QT6SHADERTOOLS_LICENSE_FILES = \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt
I've added:
LICENSES/Qt-GPL-exception-1.0.txt
Could you do a similar review on *existing* qt6 packages? I'll do the
review for the next qt6 packages in your series, while applying them.
I've applied your patch with those changes.
Thanks!
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] 114+ messages in thread
* Re: [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package
2024-07-12 8:51 ` Thomas Petazzoni via buildroot
@ 2024-07-14 8:33 ` Roy Kollen Svendsen
2024-08-28 11:14 ` Roy Kollen Svendsen
0 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-07-14 8:33 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 9312 bytes --]
Hi Thomas,
Thanks for the example, I'll do a review as soon as possible.
Best Regards,
Roy
fre. 12. juli 2024 kl. 10:51 skrev Thomas Petazzoni <
thomas.petazzoni@bootlin.com>:
> Hello Roy,
>
> On Tue, 25 Jun 2024 23:18:30 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
> > diff --git a/package/qt6/qt6shadertools/Config.in
> b/package/qt6/qt6shadertools/Config.in
> > new file mode 100644
> > index 0000000000..1b47dc6132
> > --- /dev/null
> > +++ b/package/qt6/qt6shadertools/Config.in
> > @@ -0,0 +1,13 @@
> > +config BR2_PACKAGE_QT6SHADERTOOLS
> > + bool "qt6shadertools"
> > + select BR2_PACKAGE_HOST_QT6BASE_GUI
>
> I've added a comment above this line (taken from your commit log) to
> explain why we are selecting this, as it's not obvious.
>
>
> > +QT6SHADERTOOLS_LICENSE = \
> > + GPL-2.0+ or LGPL-3.0, \
> > + GPL-3.0, GFDL-1.3 no invariants (docs)
>
> This licensing information looked not correct, and actually the
> licensing info was also not correct for qt6languageserver, it seems to
> just be copy/pasted. So I'm wondering if the licensing information for
> qt6 packages we already have in the tree is correct. Could you do a
> review?
>
> To do this review, just do:
>
> grep -r SPDX *
>
> in the source tree.
>
> For shadertools, this gives us:
>
> buildroot-build/include/QtShaderTools/qtshadertoolsexports.h://
> SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR
> GPL-2.0-only OR GPL-3.0-only
> buildroot-build/include/QtShaderTools/6.7.2/QtShaderTools/private/qtshadertoolsexports_p.h://
> SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR
> GPL-2.0-only OR GPL-3.0-only
> buildroot-build/lib/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake:#
> SPDX-License-Identifier: BSD-3-Clause
> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake:#
> SPDX-License-Identifier: BSD-3-Clause
> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake:#
> SPDX-License-Identifier: BSD-3-Clause
> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersion.cmake:#
> SPDX-License-Identifier: BSD-3-Clause
> CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> licenseRule.json: "spdx: list of
> SPDX-License-Expression's allowed in the matching files.",
> src/SPIRV-Cross/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> src/3rdparty/SPIRV-Cross/spirv_hlsl.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_hlsl.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/GLSL.std.450.h: * SPDX-License-Identifier: MIT
> src/3rdparty/SPIRV-Cross/spirv_glsl.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.hpp: *
> SPDX-License-Identifier: Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp: *
> SPDX-License-Identifier: Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cpp.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_c.h: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cfg.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_util.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_msl.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_parser.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_util.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cfg.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_c.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_error_handling.hpp: *
> SPDX-License-Identifier: Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_parser.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_reflect.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cpp.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_common.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_glsl.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.cpp: *
> SPDX-License-Identifier: Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_cross.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_reflect.hpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/3rdparty/SPIRV-Cross/spirv_msl.cpp: * SPDX-License-Identifier:
> Apache-2.0 OR MIT
> src/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> src/shadertools/qshaderrewriter_p.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qspirvshader_p.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qspirvcompiler.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> src/shadertools/qspirvcompiler_p.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qspirvshaderremap.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qtshadertoolsglobal.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qshaderrewriter.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qshaderbaker.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/doc/src/qtshadertools-index.qdoc://
> SPDX-License-Identifier: LicenseRef-Qt-Commercial OR
> GFDL-1.3-no-invariants-only
> src/shadertools/doc/src/qtshadertools-qsb.qdoc:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
> src/shadertools/doc/src/qtshadertools-overview.qdoc://
> SPDX-License-Identifier: LicenseRef-Qt-Commercial OR
> GFDL-1.3-no-invariants-only
> src/shadertools/doc/src/qtshadertools-build.qdoc://
> SPDX-License-Identifier: LicenseRef-Qt-Commercial OR
> GFDL-1.3-no-invariants-only
> src/shadertools/qspirvshaderremap_p.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qspirvshader.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qshaderbaker.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/shadertools/qtshadertoolsglobal_p.h:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
> src/glslang/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> tests/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> tests/auto/cmake/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> tests/auto/qshaderbaker/tst_qshaderbaker.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR GPL-3.0-only
> tests/auto/qshaderbaker/CMakeLists.txt:# SPDX-License-Identifier:
> BSD-3-Clause
> tests/auto/buildtimeqsb/CMakeLists.txt:# SPDX-License-Identifier:
> BSD-3-Clause
> tests/auto/buildtimeqsb/tst_buildtimeqsb.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR GPL-3.0-only
> tests/manual/qmlappshadermacro/main.cpp:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR GPL-3.0-only
> tests/manual/qmlappshadermacro/main.qml:// SPDX-License-Identifier:
> LicenseRef-Qt-Commercial OR GPL-3.0-only
> tests/manual/qmlappshadermacro/CMakeLists.txt:# SPDX-License-Identifier:
> BSD-3-Clause
> tools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> tools/qsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
> tools/qsb/qsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR
> GPL-3.0-only WITH Qt-GPL-exception-1.0
> tools/qsb/Qt6ShaderToolsMacros.cmake:# SPDX-License-Identifier:
> BSD-3-Clause
>
> So, I've summarized that as:
>
> +QT6SHADERTOOLS_LICENSE = \
> + Apache-2.0 or MIT (SPIRV-Cross), \
> + GPL-2.0 or LGPL-3.0 or GPL-3.0, \
> + GPL-3.0 (tests), GFDL-1.3 no invariants (docs), \
> + GPL-3.0 WITH Qt-GPL-exception-1.0 (tools)
>
> > +QT6SHADERTOOLS_LICENSE_FILES = \
> > + LICENSES/GPL-2.0-only.txt \
> > + LICENSES/GPL-3.0-only.txt \
> > + LICENSES/LGPL-3.0-only.txt \
> > + LICENSES/GFDL-1.3-no-invariants-only.txt
>
> I've added:
>
> LICENSES/Qt-GPL-exception-1.0.txt
>
> Could you do a similar review on *existing* qt6 packages? I'll do the
> review for the next qt6 packages in your series, while applying them.
>
> I've applied your patch with those changes.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
>
[-- Attachment #1.2: Type: text/html, Size: 10266 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* Re: [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package
2024-07-14 8:33 ` Roy Kollen Svendsen
@ 2024-08-28 11:14 ` Roy Kollen Svendsen
0 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-08-28 11:14 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hi Thomas,
Here I've tried to fix the license information for qt6 (except for qt6base):
https://patchwork.ozlabs.org/project/buildroot/patch/20240828110647.150583-1-roykollensvendsen@gmail.com/
Regards,
Roy
søn. 14. juli 2024 kl. 10:33 skrev Roy Kollen Svendsen
<roykollensvendsen@gmail.com>:
>
> Hi Thomas,
>
> Thanks for the example, I'll do a review as soon as possible.
>
> Best Regards,
> Roy
>
> fre. 12. juli 2024 kl. 10:51 skrev Thomas Petazzoni <thomas.petazzoni@bootlin.com>:
>>
>> Hello Roy,
>>
>> On Tue, 25 Jun 2024 23:18:30 +0200
>> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>>
>> > diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
>> > new file mode 100644
>> > index 0000000000..1b47dc6132
>> > --- /dev/null
>> > +++ b/package/qt6/qt6shadertools/Config.in
>> > @@ -0,0 +1,13 @@
>> > +config BR2_PACKAGE_QT6SHADERTOOLS
>> > + bool "qt6shadertools"
>> > + select BR2_PACKAGE_HOST_QT6BASE_GUI
>>
>> I've added a comment above this line (taken from your commit log) to
>> explain why we are selecting this, as it's not obvious.
>>
>>
>> > +QT6SHADERTOOLS_LICENSE = \
>> > + GPL-2.0+ or LGPL-3.0, \
>> > + GPL-3.0, GFDL-1.3 no invariants (docs)
>>
>> This licensing information looked not correct, and actually the
>> licensing info was also not correct for qt6languageserver, it seems to
>> just be copy/pasted. So I'm wondering if the licensing information for
>> qt6 packages we already have in the tree is correct. Could you do a
>> review?
>>
>> To do this review, just do:
>>
>> grep -r SPDX *
>>
>> in the source tree.
>>
>> For shadertools, this gives us:
>>
>> buildroot-build/include/QtShaderTools/qtshadertoolsexports.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> buildroot-build/include/QtShaderTools/6.7.2/QtShaderTools/private/qtshadertoolsexports_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> buildroot-build/lib/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
>> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake:# SPDX-License-Identifier: BSD-3-Clause
>> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake:# SPDX-License-Identifier: BSD-3-Clause
>> buildroot-build/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersion.cmake:# SPDX-License-Identifier: BSD-3-Clause
>> CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> licenseRule.json: "spdx: list of SPDX-License-Expression's allowed in the matching files.",
>> src/SPIRV-Cross/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> src/3rdparty/SPIRV-Cross/spirv_hlsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_hlsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/GLSL.std.450.h: * SPDX-License-Identifier: MIT
>> src/3rdparty/SPIRV-Cross/spirv_glsl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cpp.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_c.h: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cfg.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_util.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_msl.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_parser.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_util.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cfg.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_c.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_error_handling.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_parser.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_reflect.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cpp.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_common.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_glsl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross_parsed_ir.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_cross.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_reflect.hpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/3rdparty/SPIRV-Cross/spirv_msl.cpp: * SPDX-License-Identifier: Apache-2.0 OR MIT
>> src/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> src/shadertools/qshaderrewriter_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qspirvshader_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qspirvcompiler.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> src/shadertools/qspirvcompiler_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qspirvshaderremap.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qtshadertoolsglobal.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qshaderrewriter.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/doc/src/qtshadertools-index.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
>> src/shadertools/doc/src/qtshadertools-qsb.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
>> src/shadertools/doc/src/qtshadertools-overview.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
>> src/shadertools/doc/src/qtshadertools-build.qdoc:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
>> src/shadertools/qspirvshaderremap_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qspirvshader.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qshaderbaker.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/shadertools/qtshadertoolsglobal_p.h:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
>> src/glslang/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tests/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tests/auto/cmake/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tests/auto/qshaderbaker/tst_qshaderbaker.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
>> tests/auto/qshaderbaker/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tests/auto/buildtimeqsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tests/auto/buildtimeqsb/tst_buildtimeqsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
>> tests/manual/qmlappshadermacro/main.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
>> tests/manual/qmlappshadermacro/main.qml:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
>> tests/manual/qmlappshadermacro/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tools/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tools/qsb/CMakeLists.txt:# SPDX-License-Identifier: BSD-3-Clause
>> tools/qsb/qsb.cpp:// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
>> tools/qsb/Qt6ShaderToolsMacros.cmake:# SPDX-License-Identifier: BSD-3-Clause
>>
>> So, I've summarized that as:
>>
>> +QT6SHADERTOOLS_LICENSE = \
>> + Apache-2.0 or MIT (SPIRV-Cross), \
>> + GPL-2.0 or LGPL-3.0 or GPL-3.0, \
>> + GPL-3.0 (tests), GFDL-1.3 no invariants (docs), \
>> + GPL-3.0 WITH Qt-GPL-exception-1.0 (tools)
>>
>> > +QT6SHADERTOOLS_LICENSE_FILES = \
>> > + LICENSES/GPL-2.0-only.txt \
>> > + LICENSES/GPL-3.0-only.txt \
>> > + LICENSES/LGPL-3.0-only.txt \
>> > + LICENSES/GFDL-1.3-no-invariants-only.txt
>>
>> I've added:
>>
>> LICENSES/Qt-GPL-exception-1.0.txt
>>
>> Could you do a similar review on *existing* qt6 packages? I'll do the
>> review for the next qt6 packages in your series, while applying them.
>>
>> I've applied your patch with those changes.
>>
>> Thanks!
>>
>> 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] 114+ messages in thread
* [Buildroot] [PATCH v9 07/14] package/qt6/qt6svg: allow building for host
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 06/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:51 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (8 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v9 08/14] package/qt6/qt6languageserver: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 07/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 8:59 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (7 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..7266474428
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtlanguageserver-everywhere-src-6.7.2.tar.xz.sha256
+sha256 b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 qtlanguageserver-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 08/14] package/qt6/qt6languageserver: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-07-12 8:59 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:59 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:32 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
> new file mode 100644
> index 0000000000..8a54ae1911
> --- /dev/null
> +++ b/package/qt6/qt6languageserver/Config.in
> @@ -0,0 +1,9 @@
> +config BR2_PACKAGE_QT6LANGUAGESERVER
> + bool "qt6languageserver"
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + This package corresponds to the qt6languageserver module.
> +
> + https://doc.qt.io/qt-6/qtlanguageserver-index.html
This link is a 404. I couldn't find a really good home page for this
particular module, so I used:
https://github.com/qt/qtlanguageserver
> +QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
> +
> +QT6LANGUAGESERVER_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
Same comment on the licensing terms, these are not correct I believe,
so I changed them to:
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0 or LGPL-3.0 or GPL-3.0, \
+ GPL-3.0 (tests)
when applying.
> +QT6LANGUAGESERVER_LICENSE_FILES = \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt
I should have dropped this GFDL-1.3-no-invariants-only.txt though, as
there is no documentation under this license in this submodule. Maybe
something to fix as a follow-up patch.
Applied with the changes detailed above. Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 09/14] package/qt6/qt6declarative: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 08/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:02 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (6 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Add host-qt6svg to dependencies when qt6svg is available to build the
required svgtoqml host tool:
Failed to find the host tool "Qt6::svgtoqml". It is part of the
Qt6QuickTools package, but the package could not be found. Make sure you
have built and installed the host Quick module, which will ensure the
creation of the Qt6QuickTools package.
Select the host-qt6base Testlib module to build the qmltestrunner host
tool when the qt6base Testlib module is enabled:
Failed to find the host tool "Qt6::qmltestrunner". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Select the host-qt6base Network module to build the qmlprofiler host
tool when the qt6base Network module is enabled:
Failed to find the host tool "Qt6::qmlprofiler". It is part of the
Qt6QmlTools package, but the package did not contain the tool. Make sure
that the host module Qml was built with all features enabled (no explicitly
disabled tools).
Add patch to avoid checking for FEATURE_ssl when FEATURE_network
is not available. FEATURE_ssl is defined by the Qt Network module. So
we will get the following build failure if the patch is not applied and
FEATURE_network=ON:
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
...1-Fix-build-with--no-feature-network.patch | 28 +++++++++
package/qt6/qt6declarative/Config.in | 22 +++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 61 +++++++++++++++++++
5 files changed, 123 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
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
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..0a977ed808
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ # Enable host test module to ensure that qmltestrunner is built
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST # qmltestrunner
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK if BR2_PACKAGE_QT6BASE_NETWORK # qmlprofiler
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_QT6SHADERTOOLS
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..006b49e4b1
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz.sha256
+sha256 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999 qtdeclarative-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..e3af0e80ef
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -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
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6declarative \
+ qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE_QUICK),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6shadertools
+QT6DECLARATIVE_DEPENDENCIES += \
+ host-qt6base \
+ qt6shadertools
+
+# We need host-qt6svg, when qt6svg is available to build the required
+# svgtoqml host tool
+ifeq ($(BR2_PACKAGE_QT6SVG),y)
+HOST_QT6DECLARATIVE_DEPENDENCIES += host-qt6svg
+endif
+
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 09/14] package/qt6/qt6declarative: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-07-12 10:02 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 10:02 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:33 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> Add host-qt6svg to dependencies when qt6svg is available to build the
> required svgtoqml host tool:
>
> Failed to find the host tool "Qt6::svgtoqml". It is part of the
> Qt6QuickTools package, but the package could not be found. Make sure you
> have built and installed the host Quick module, which will ensure the
> creation of the Qt6QuickTools package.
>
> Select the host-qt6base Testlib module to build the qmltestrunner host
> tool when the qt6base Testlib module is enabled:
>
> Failed to find the host tool "Qt6::qmltestrunner". It is part of the
> Qt6QmlTools package, but the package did not contain the tool. Make sure
> that the host module Qml was built with all features enabled (no explicitly
> disabled tools).
>
> Select the host-qt6base Network module to build the qmlprofiler host
> tool when the qt6base Network module is enabled:
>
> Failed to find the host tool "Qt6::qmlprofiler". It is part of the
> Qt6QmlTools package, but the package did not contain the tool. Make sure
> that the host module Qml was built with all features enabled (no explicitly
> disabled tools).
>
> Add patch to avoid checking for FEATURE_ssl when FEATURE_network
> is not available. FEATURE_ssl is defined by the Qt Network module. So
> we will get the following build failure if the patch is not applied and
> FEATURE_network=ON:
>
> Attempting to evaluate feature ssl but its definition is missing. Either
> the feature does not exist or a dependency to the module that defines it is
> missing
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> Changes v8 -> v9:
> - bump version from 6.7.1 to 6.7.2
> - update hash
Applied to master after fixing the license information as follows:
QT6DECLARATIVE_LICENSE = \
LGPL-3.0 or GPL-3.0 or GPL-2.0, \
BSD-3-Clause (docs), \
GFDL-1.3 no invariants (docs), \
BSD-3-Clause (examples), \
GPL-3.0 (tests), \
GPL-3.0 WITH Qt-GPL-exception-1.0 (tools)
Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 10/14] package/qt6/qt6websockets: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:03 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (5 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 10 +++++
package/qt6/qt6websockets/qt6websockets.hash | 11 ++++++
package/qt6/qt6websockets/qt6websockets.mk | 39 ++++++++++++++++++++
4 files changed, 61 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..7d65a8e65a
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..5dfeeef01d
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwebsockets-everywhere-src-6.7.2.tar.xz.sha256
+sha256 5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f qtwebsockets-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..5dd5c8c50f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WEBSOCKETS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:05 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (4 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Add host-qt6wayland as dependency to build the qtwaylandscanner host
tool:
Failed to find the host tool "Qt6::qtwaylandscanner". It is part of the
Qt6WaylandScannerTools package, but the package could not be found. Make
sure you have built and installed the host WaylandScanner module, which
will ensure the creation of the Qt6WaylandScannerTools package.
Select the qt6base and host-qt6base Gui modules to avoid skipping the
build:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 27 +++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 +++++
package/qt6/qt6wayland/qt6wayland.mk | 56 ++++++++++++++++++++++++++
4 files changed, 95 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..11179a4416
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,27 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..3d0ded7bec
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz.sha256
+sha256 a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b qtwayland-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..62fa966577
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ wayland \
+ host-qt6wayland
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DFEATURE_wayland_client=OFF \
+ -DFEATURE_wayland_server=OFF
+
+HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WAYLAND_DEPENDENCIES += qt6declarative
+endif
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+QT6WAYLAND_DEPENDENCIES += libxkbcommon
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-07-12 10:05 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 10:05 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:35 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
> new file mode 100644
> index 0000000000..11179a4416
> --- /dev/null
> +++ b/package/qt6/qt6wayland/Config.in
> @@ -0,0 +1,27 @@
> +comment "qt6wayland needs an OpenGL-capable backend"
> + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
> +
> +config BR2_PACKAGE_QT6WAYLAND
> + bool "qt6wayland"
> + depends on BR2_PACKAGE_QT6_GL_SUPPORTS
> + select BR2_PACKAGE_WAYLAND
> + select BR2_PACKAGE_QT6BASE_GUI
> + select BR2_PACKAGE_HOST_QT6BASE_GUI
I added a small comment above this line that explains why it is needed.
> +QT6WAYLAND_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
Changed to:
QT6WAYLAND_LICENSE = \
BSD-3-Clause (examples, tests), \
GPL-3.0 (compositor), \
LGPL-3.0 or GPL-2.0 or GPL-3.0, \
GPL-3.0 WITH Qt-GPL-exception-1.0 (tests), \
GFDL-1.3 no invariants (docs)
> +QT6WAYLAND_DEPENDENCIES = \
> + qt6base \
> + wayland \
> + host-qt6wayland
Added a comment that explains why host-qt6wayland is needed.
> +
> +HOST_QT6WAYLAND_CONF_OPTS = \
> + -DFEATURE_wayland_client=OFF \
> + -DFEATURE_wayland_server=OFF
> +
> +HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base
I have moved these HOST_ variables further down, to not mix variable
definitions for the host package and for the target package.
> +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
> +QT6WAYLAND_DEPENDENCIES += qt6declarative
> +endif
> +
> +ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
> +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
> +QT6WAYLAND_DEPENDENCIES += libxkbcommon
> +else
> +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
> +endif
Applied with those changes. Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:24 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
` (3 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools:
Failed to find required Qt component "Network".
We need host-qt6base with Sql support for host-qt6tools to build the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
is not available:
Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
Qt6ToolsTools package, but the package did not contain the tool. Make sure
that the host module Tools was built with all features enabled (no
explicitly disabled tools).
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 ++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 ++++++++
package/qt6/qt6tools/qt6tools.mk | 40 ++++++++++++++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..2e0484af2e
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..9437e57d25
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz.sha256
+sha256 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a qttools-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..2dd6670dff
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ host-qt6tools
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6TOOLS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-07-12 10:24 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 10:24 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:36 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> The Network module is explicitly required by qt6tools:
>
> Failed to find required Qt component "Network".
>
> We need host-qt6base with Sql support for host-qt6tools to build the
> qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
> is not available:
>
> Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
> Qt6ToolsTools package, but the package did not contain the tool. Make sure
> that the host module Tools was built with all features enabled (no
> explicitly disabled tools).
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Thanks, I've applied, with a number of changes. See below.
> diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
> new file mode 100644
> index 0000000000..2e0484af2e
> --- /dev/null
> +++ b/package/qt6/qt6tools/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_QT6TOOLS
> + bool "qt6tools"
> + select BR2_PACKAGE_QT6BASE_NETWORK
> + select BR2_PACKAGE_HOST_QT6BASE_NETWORK
> + select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
I've added comments above those two selects:
+ # qt6tools needs host-qt6tools, and host-qt6tools needs
+ # network support in qt6base. In addition, we also need
+ # host-qt6base with Sql support to build the qhelpgenerator
+ # tool, if target support for Sql is present
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + Qt Tools provides tools facilitate the development
> + and design of applications.
> +
> + https://doc.qt.io/qt-6/qtmodules.html#qt-tools
This link anchor doesn't exist, so I've instead used:
https://github.com/qt/qttools
> diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
> new file mode 100644
> index 0000000000..9437e57d25
> --- /dev/null
> +++ b/package/qt6/qt6tools/qt6tools.hash
> @@ -0,0 +1,11 @@
> +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz.sha256
> +sha256 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a qttools-everywhere-src-6.7.2.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
LICENSES/BSL-1.0.txt was missing here.
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
> +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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
> +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
> new file mode 100644
> index 0000000000..2dd6670dff
> --- /dev/null
> +++ b/package/qt6/qt6tools/qt6tools.mk
> @@ -0,0 +1,40 @@
> +################################################################################
> +#
> +# qt6tools
> +#
> +################################################################################
> +
> +QT6TOOLS_VERSION = $(QT6_VERSION)
> +QT6TOOLS_SITE = $(QT6_SITE)
> +QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
> +QT6TOOLS_INSTALL_STAGING = YES
> +QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> +
> +QT6TOOLS_CMAKE_BACKEND = ninja
> +
> +QT6TOOLS_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0, GFDL-1.3 no invariants (docs)
> +
> +QT6TOOLS_LICENSE_FILES = \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt
Changed to:
QT6TOOLS_LICENSE = \
BSD-3-Clause (examples), \
BSD-3-Clause (corecon), \
BSL-1.0 (catch), \
LGPL-3.0 or GPL-3.0 or GPL-2.0, \
GPL-3.0 WITH Qt-GPL-exception-1.0
QT6TOOLS_LICENSE_FILES = \
LICENSES/BSD-3-Clause.txt \
LICENSES/BSL-1.0.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
which I believe is more accurate.
Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 13/14] package/qt6/qt6virtualkeyboard: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:43 ` Thomas Petazzoni via buildroot
2024-06-25 21:18 ` [Buildroot] [PATCH v9 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
` (2 subsequent siblings)
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 11 +++++
.../qt6virtualkeyboard.hash | 12 ++++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 41 +++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..c183e14001
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ select BR2_PACKAGE_QT6DECLERATIVE
+ select BR2_PACKAGE_QT6SVG
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..f34eb11e9e
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz.sha256
+sha256 320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e65e955808
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 13/14] package/qt6/qt6virtualkeyboard: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-07-12 10:43 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 10:43 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:37 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> +QT6VIRTUALKEYBOARD_LICENSE = \
> + GPL-3.0-only, GFDL-1.3 no invariants (docs), \
> + BSD-3-Clause
Changed to:
+QT6VIRTUALKEYBOARD_LICENSE = \
+ BSD-3-Clause (examples), \
+ GPL-3.0, \
+ Apache-2.0 (openwnn, pinyin, tcime plugins)
And applied. Thanks!
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] 114+ messages in thread
* [Buildroot] [PATCH v9 14/14] package/qt6/qt6mqtt: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-06-25 21:18 ` Roy Kollen Svendsen
2024-07-12 10:54 ` Thomas Petazzoni via buildroot
2024-07-12 8:45 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Thomas Petazzoni via buildroot
2024-07-12 9:20 ` Thomas Petazzoni via buildroot
14 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-25 21:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v8 -> v9:
- bump version from 6.7.1 to 6.7.2
- update hash
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index 372a92f413..f2e0186f56 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ QT6_VERSION = $(QT6_VERSION_MAJOR).2
QT6_SOURCE_TARBALL_PREFIX = everywhere-src
QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..67ae6d0de3
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 be2d3f12378a8e2a103c328201b1e308f8c6c09bd752322592b3164cebba5bde qt6mqtt-6.7.2-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* Re: [Buildroot] [PATCH v9 14/14] package/qt6/qt6mqtt: new package
2024-06-25 21:18 ` [Buildroot] [PATCH v9 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
@ 2024-07-12 10:54 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 10:54 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
On Tue, 25 Jun 2024 23:18:38 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> Changes v8 -> v9:
> - bump version from 6.7.1 to 6.7.2
> - update hash
Applied to master after changing the licensing details to:
+QT6MQTT_LICENSE = \
+ BSD-3-Clause (examples), \
+ GFDL-1.3-invariants-only (docs), \
+ GPL-3.0
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt
Thanks!
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] 114+ messages in thread
* Re: [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (12 preceding siblings ...)
2024-06-25 21:18 ` [Buildroot] [PATCH v9 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
@ 2024-07-12 8:45 ` Thomas Petazzoni via buildroot
2024-07-12 9:20 ` Thomas Petazzoni via buildroot
14 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 8:45 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
On Tue, 25 Jun 2024 23:18:25 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> For details see [1], [2], [3], [4], [5], [6], [7], [8], [9], [10] and [11].
>
> [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
> [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
> [3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
> [4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
>
> [5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
> [6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
> [7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
> [8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
>
> [9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
> [10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
> [11] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> Changes v8 -> v9:
> - add release note link for 6.7.2 to commit message
> - bump version from 6.7.1 to 6.7.2
> - update hashes for existing qt6 packages
Applied to master, thanks. Please note that when sending new versions,
we prefer to see them as a new thread rather than a reply to the
previous version. Thanks!
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] 114+ messages in thread* Re: [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2
2024-06-25 21:18 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Roy Kollen Svendsen
` (13 preceding siblings ...)
2024-07-12 8:45 ` [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2 Thomas Petazzoni via buildroot
@ 2024-07-12 9:20 ` Thomas Petazzoni via buildroot
2024-07-14 9:08 ` Roy Kollen Svendsen
14 siblings, 1 reply; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-12 9:20 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Tue, 25 Jun 2024 23:18:25 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> For details see [1], [2], [3], [4], [5], [6], [7], [8], [9], [10] and [11].
>
> [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
> [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
> [3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
> [4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
>
> [5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
> [6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
> [7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
> [8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
>
> [9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
> [10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
> [11] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md
>
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> ---
> Changes v8 -> v9:
> - add release note link for 6.7.2 to commit message
> - bump version from 6.7.1 to 6.7.2
> - update hashes for existing qt6 packages
Another request: would you mind adding yourself to the DEVELOPERS file
for package/qt6/ ? This way you would:
1. Be Cc'ed on patches posted that touch qt6
2. Be reported build issues detected by our autobuilders on qt6
Considering how involved you are in the qt6 packaging in Buildroot, I
think it would make a lot of sense.
Best regards,
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] 114+ messages in thread* Re: [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2
2024-07-12 9:20 ` Thomas Petazzoni via buildroot
@ 2024-07-14 9:08 ` Roy Kollen Svendsen
2024-07-14 12:46 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-07-14 9:08 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 2163 bytes --]
Hi Thomas,
Added myself to DEVELOPERS for package/qt6:
https://patchwork.ozlabs.org/project/buildroot/patch/20240714090141.407553-1-roykollensvendsen@gmail.com/
Best regards,
Roy
fre. 12. juli 2024 kl. 11:20 skrev Thomas Petazzoni <
thomas.petazzoni@bootlin.com>:
> Hello Roy,
>
> On Tue, 25 Jun 2024 23:18:25 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
> > For details see [1], [2], [3], [4], [5], [6], [7], [8], [9], [10] and
> [11].
> >
> > [1]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
> > [2]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md
> > [3]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
> > [4]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md
> >
> > [5]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
> > [6]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
> > [7]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md
> > [8]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
> >
> > [9]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md
> > [10]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md
> > [11]
> https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md
> >
> > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> > ---
> > Changes v8 -> v9:
> > - add release note link for 6.7.2 to commit message
> > - bump version from 6.7.1 to 6.7.2
> > - update hashes for existing qt6 packages
>
> Another request: would you mind adding yourself to the DEVELOPERS file
> for package/qt6/ ? This way you would:
>
> 1. Be Cc'ed on patches posted that touch qt6
>
> 2. Be reported build issues detected by our autobuilders on qt6
>
> Considering how involved you are in the qt6 packaging in Buildroot, I
> think it would make a lot of sense.
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
[-- Attachment #1.2: Type: text/html, Size: 4447 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 114+ messages in thread
* Re: [Buildroot] [PATCH v9 01/14] package/qt6: bump version to 6.7.2
2024-07-14 9:08 ` Roy Kollen Svendsen
@ 2024-07-14 12:46 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 114+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-14 12:46 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin, buildroot
Hello Roy,
On Sun, 14 Jul 2024 11:08:57 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> Added myself to DEVELOPERS for package/qt6:
>
> https://patchwork.ozlabs.org/project/buildroot/patch/20240714090141.407553-1-roykollensvendsen@gmail.com/
Thanks for it, we will definitely merge it!
Best regards,
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] 114+ messages in thread
* [Buildroot] [PATCH v7 10/14] package/qt6/qt6websockets: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (3 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- The Qt6 Network module is required, so select it
- Don't support building for host
- Only depend on qt6declarative if available
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 10 +++++
package/qt6/qt6websockets/qt6websockets.hash | 11 ++++++
package/qt6/qt6websockets/qt6websockets.mk | 39 ++++++++++++++++++++
4 files changed, 61 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..7d65a8e65a
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4fa6bdb79f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz.sha256
+sha256 fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb qtwebsockets-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..5dd5c8c50f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WEBSOCKETS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 11/14] package/qt6/qt6wayland: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 10/14] package/qt6/qt6websockets: new package Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (2 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Add host-qt6wayland as dependency to build the qtwaylandscanner host
tool:
Failed to find the host tool "Qt6::qtwaylandscanner". It is part of the
Qt6WaylandScannerTools package, but the package could not be found. Make
sure you have built and installed the host WaylandScanner module, which
will ensure the creation of the Qt6WaylandScannerTools package.
Select the qt6base and host-qt6base Gui modules to avoid skipping the
build:
Skipping the build as the condition "TARGET Qt::Gui" is not met.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- Add libxkbcommon to dependencies when compositor is selected
- Only depend on qt6declarative if available
- Don't build client and server for host
- Select the gui module to avoid skipping build
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 27 +++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 +++++
package/qt6/qt6wayland/qt6wayland.mk | 56 ++++++++++++++++++++++++++
4 files changed, 95 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..11179a4416
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,27 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..b0760f661e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20 qtwayland-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..62fa966577
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ wayland \
+ host-qt6wayland
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DFEATURE_wayland_client=OFF \
+ -DFEATURE_wayland_server=OFF
+
+HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6WAYLAND_DEPENDENCIES += qt6declarative
+endif
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+QT6WAYLAND_DEPENDENCIES += libxkbcommon
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 12/14] package/qt6/qt6tools: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
The Network module is explicitly required by qt6tools:
Failed to find required Qt component "Network".
We need host-qt6base with Sql support for host-qt6tools to build the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
is not available:
Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
Qt6ToolsTools package, but the package did not contain the tool. Make sure
that the host module Tools was built with all features enabled (no
explicitly disabled tools).
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- Only select host qt6base SQL support when needed
- qt5declarative is optional, so only add it to dependenceies when available
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 ++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 ++++++++
package/qt6/qt6tools/qt6tools.mk | 40 ++++++++++++++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..2e0484af2e
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..bc034a5e16
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 qttools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..2dd6670dff
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ host-qt6tools
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6TOOLS_DEPENDENCIES += qt6declarative
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 13/14] package/qt6/qt6virtualkeyboard: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
2024-06-18 13:18 ` [Buildroot] [PATCH v7 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v6 -> v7:
- Make sure we select the required modules qt6declarative and qt6svg
- Don't support building for host
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 11 +++++
.../qt6virtualkeyboard.hash | 12 ++++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 41 +++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..c183e14001
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ select BR2_PACKAGE_QT6DECLERATIVE
+ select BR2_PACKAGE_QT6SVG
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..3f7f067de5
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7b6cd83d1b7f622f909b38bd429536b9d0829621f2d111b3a2f90d8bcdcba85d qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e65e955808
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v7 14/14] package/qt6/qt6mqtt: new package
2024-06-18 13:18 ` [Buildroot] [PATCH v7 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-06-18 13:18 ` [Buildroot] [PATCH v7 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-06-18 13:18 ` Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-18 13:18 UTC (permalink / raw)
To: buildroot
Cc: Zoltan Gyarmati, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index ee426884f9..5431629ede 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ 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
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..658bddaa75
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 f1c3b739296832befe24309130ead4ef4167f4cc2029a9c258821f92e7733fb4 qt6mqtt-6.7.1-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread
* [Buildroot] [PATCH v6 10/14] package/qt6/qt6websockets: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (3 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 9 ++++
package/qt6/qt6websockets/qt6websockets.hash | 11 +++++
package/qt6/qt6websockets/qt6websockets.mk | 46 ++++++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..a201483922
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4fa6bdb79f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz.sha256
+sha256 fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb qtwebsockets-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..cc17085d10
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 11/14] package/qt6/qt6wayland: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (2 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 25 ++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++
package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++
4 files changed, 90 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..a47c9e888c
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,25 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..b0760f661e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20 qtwayland-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..cf8727287e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6wayland \
+ wayland \
+ host-wayland
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 12/14] package/qt6/qt6tools: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
The Network module is explicitly required by qt6tools:
Failed to find required Qt component "Network".
We need host qt6base with Sql support for host-qt6tools to generate the
qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not
available:
Failed to find the host tool "Qt6::qhelpgenerator". It is part of the
Qt6ToolsTools package, but the package did not contain the tool. Make sure
that the host module Tools was built with all features enabled (no
explicitly disabled tools).
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v5 -> v6:
- Add explanation to commit message (suggested by Yann)
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 +++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 +++++++++
package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..6e5298de35
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..bc034a5e16
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 qttools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..8779e8c00f
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6tools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 13/14] package/qt6/qt6virtualkeyboard: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
2024-06-03 11:51 ` [Buildroot] [PATCH v6 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 9 ++++
.../qt6virtualkeyboard.hash | 12 +++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 49 +++++++++++++++++++
4 files changed, 71 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..59e9dc3595
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..3f7f067de5
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7b6cd83d1b7f622f909b38bd429536b9d0829621f2d111b3a2f90d8bcdcba85d qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e49643149e
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v6 14/14] package/qt6/qt6mqtt: new package
2024-06-03 11:51 ` [Buildroot] [PATCH v6 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-06-03 11:51 ` [Buildroot] [PATCH v6 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-06-03 11:51 ` Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-06-03 11:51 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index ee426884f9..5431629ede 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ 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
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..658bddaa75
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 f1c3b739296832befe24309130ead4ef4167f4cc2029a9c258821f92e7733fb4 qt6mqtt-6.7.1-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread
* [Buildroot] [PATCH v5 10/14] package/qt6/qt6websockets: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 09/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (3 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 9 ++++
package/qt6/qt6websockets/qt6websockets.hash | 11 +++++
package/qt6/qt6websockets/qt6websockets.mk | 46 ++++++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..a201483922
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4fa6bdb79f
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz.sha256
+sha256 fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb qtwebsockets-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..cc17085d10
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 11/14] package/qt6/qt6wayland: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 10/14] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
` (2 subsequent siblings)
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 25 ++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++
package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++
4 files changed, 90 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..a47c9e888c
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,25 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ select BR2_PACKAGE_LIBXKBCOMMON
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..b0760f661e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20 qtwayland-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..cf8727287e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6wayland \
+ wayland \
+ host-wayland
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 12/14] package/qt6/qt6tools: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 11/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 13 +++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 +++++++++
package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..6e5298de35
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_SQL
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ Qt Tools provides tools facilitate the development
+ and design of applications.
+
+ https://doc.qt.io/qt-6/qtmodules.html#qt-tools
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..bc034a5e16
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz.sha256
+sha256 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 qttools-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+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 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
new file mode 100644
index 0000000000..8779e8c00f
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# qt6tools
+#
+################################################################################
+
+QT6TOOLS_VERSION = $(QT6_VERSION)
+QT6TOOLS_SITE = $(QT6_SITE)
+QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
+QT6TOOLS_INSTALL_STAGING = YES
+QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6TOOLS_CMAKE_BACKEND = ninja
+
+QT6TOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6TOOLS_LICENSE_FILES = \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6tools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 13/14] package/qt6/qt6virtualkeyboard: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 12/14] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
2024-05-31 15:13 ` [Buildroot] [PATCH v5 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 9 ++++
.../qt6virtualkeyboard.hash | 12 +++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 49 +++++++++++++++++++
4 files changed, 71 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..59e9dc3595
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..3f7f067de5
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz.sha256
+sha256 7b6cd83d1b7f622f909b38bd429536b9d0829621f2d111b3a2f90d8bcdcba85d qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e49643149e
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread* [Buildroot] [PATCH v5 14/14] package/qt6/qt6mqtt: new package
2024-05-31 15:13 ` [Buildroot] [PATCH v5 01/14] package/qt6: bump version to 6.7.1 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-05-31 15:13 ` [Buildroot] [PATCH v5 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-05-31 15:13 ` Roy Kollen Svendsen
12 siblings, 0 replies; 114+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-31 15:13 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
Changes v4 -> v5:
- Bump to v6.7.1
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index ee426884f9..5431629ede 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ 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
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..658bddaa75
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 f1c3b739296832befe24309130ead4ef4167f4cc2029a9c258821f92e7733fb4 qt6mqtt-6.7.1-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 114+ messages in thread