* [Buildroot] [PATCH v2 01/29] package/qt6/qt6base: Add qt6base hash file
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 8:06 ` Thomas Petazzoni via buildroot
2022-08-26 6:47 ` [Buildroot] [PATCH v2 02/29] package/qt6/qt6base: Add license information Jesse Van Gavere
` (27 subsequent siblings)
28 siblings, 1 reply; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
Hash file with only the qt6base tarball hash
---
package/qt6/qt6base/qt6base.hash | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 package/qt6/qt6base/qt6base.hash
diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash
new file mode 100644
index 0000000000..31ed2494af
--- /dev/null
+++ b/package/qt6/qt6base/qt6base.hash
@@ -0,0 +1,2 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz.sha256
+sha256 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 qtbase-everywhere-src-6.3.1.tar.xz
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 02/29] package/qt6/qt6base: Add license information
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 01/29] package/qt6/qt6base: Add qt6base hash file Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 03/29] package/qt6/qt6base: add support for network module Jesse Van Gavere
` (26 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
Add license hashes to the hash file and add the information into the makefile
---
package/qt6/qt6base/qt6base.hash | 6 ++++++
package/qt6/qt6base/qt6base.mk | 2 ++
2 files changed, 8 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash
index 31ed2494af..5efc5c2815 100644
--- a/package/qt6/qt6base/qt6base.hash
+++ b/package/qt6/qt6base/qt6base.hash
@@ -1,2 +1,8 @@
# Hash from: https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz.sha256
sha256 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 qtbase-everywhere-src-6.3.1.tar.xz
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index c67d94e193..7a0838b2bc 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -7,6 +7,8 @@
QT6BASE_VERSION = $(QT6_VERSION)
QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
+QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
QT6BASE_DEPENDENCIES = \
host-ninja \
host-qt6base \
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 03/29] package/qt6/qt6base: add support for network module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 01/29] package/qt6/qt6base: Add qt6base hash file Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 02/29] package/qt6/qt6base: Add license information Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 04/29] package/qt6/qt6base: add support for concurrent module Jesse Van Gavere
` (25 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 9 +++++++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 15 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index a489ce39fc..68bca728e2 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -14,3 +14,12 @@ config BR2_PACKAGE_QT6BASE
QtWidgets, etc.
http://qt.io
+
+if BR2_PACKAGE_QT6BASE
+
+config BR2_PACKAGE_QT6BASE_NETWORK
+ bool "network module"
+ help
+ This options enables the Qt6Network library.
+
+endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 7a0838b2bc..b4b6450bf1 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -77,5 +77,11 @@ define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
+ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y)
+QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 04/29] package/qt6/qt6base: add support for concurrent module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (2 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 03/29] package/qt6/qt6base: add support for network module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 8:07 ` Thomas Petazzoni via buildroot
2022-08-26 6:47 ` [Buildroot] [PATCH v2 05/29] package/qt6/qt6base: add support for xml module Jesse Van Gavere
` (24 subsequent siblings)
28 siblings, 1 reply; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 5 +++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 68bca728e2..50cdb52761 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -22,4 +22,9 @@ config BR2_PACKAGE_QT6BASE_NETWORK
help
This options enables the Qt6Network library.
+config BR2_PACKAGE_QT6BASE_CONCURRENT
+ bool "concurrent module"
+ help
+ This options enables the Qt6Concurrent library.
+
endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index b4b6450bf1..302aecab31 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -83,5 +83,11 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y)
+QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
+endif
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [Buildroot] [PATCH v2 04/29] package/qt6/qt6base: add support for concurrent module
2022-08-26 6:47 ` [Buildroot] [PATCH v2 04/29] package/qt6/qt6base: add support for concurrent module Jesse Van Gavere
@ 2022-08-26 8:07 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 33+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-26 8:07 UTC (permalink / raw)
To: Jesse Van Gavere; +Cc: Yann E . Morin, buildroot
On Fri, 26 Aug 2022 08:47:33 +0200
Jesse Van Gavere <jesseevg@gmail.com> wrote:
> ---
> package/qt6/qt6base/Config.in | 5 +++++
> package/qt6/qt6base/qt6base.mk | 6 ++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
> index 68bca728e2..50cdb52761 100644
> --- a/package/qt6/qt6base/Config.in
> +++ b/package/qt6/qt6base/Config.in
> @@ -22,4 +22,9 @@ config BR2_PACKAGE_QT6BASE_NETWORK
> help
> This options enables the Qt6Network library.
>
> +config BR2_PACKAGE_QT6BASE_CONCURRENT
Please sort options alphabetically, i.e BR2_PACKAGE_QT6BASE_CONCURRENT
should be before BR2_PACKAGE_QT6BASE_NETWORK.
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] 33+ messages in thread
* [Buildroot] [PATCH v2 05/29] package/qt6/qt6base: add support for xml module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (3 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 04/29] package/qt6/qt6base: add support for concurrent module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 06/29] package/qt6/qt6base: add support for test module Jesse Van Gavere
` (23 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 5 +++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 50cdb52761..4203ca7588 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -27,4 +27,9 @@ config BR2_PACKAGE_QT6BASE_CONCURRENT
help
This options enables the Qt6Concurrent library.
+config BR2_PACKAGE_QT6BASE_XML
+ bool "XML module"
+ help
+ This options enables the Qt6Xml library.
+
endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 302aecab31..1af24334a9 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -89,5 +89,11 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_XML),y)
+QT6BASE_CONF_OPTS += -DFEATURE_xml=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF
+endif
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 06/29] package/qt6/qt6base: add support for test module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (4 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 05/29] package/qt6/qt6base: add support for xml module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 07/29] package/qt6/qt6base: add support for building examples Jesse Van Gavere
` (22 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 5 +++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 4203ca7588..2ed780e913 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -27,6 +27,11 @@ config BR2_PACKAGE_QT6BASE_CONCURRENT
help
This options enables the Qt6Concurrent library.
+config BR2_PACKAGE_QT6BASE_TEST
+ bool "test module"
+ help
+ This options enables the Qt6Test library.
+
config BR2_PACKAGE_QT6BASE_XML
bool "XML module"
help
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 1af24334a9..fd1e0a2847 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -89,6 +89,12 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y)
+QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_XML),y)
QT6BASE_CONF_OPTS += -DFEATURE_xml=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 07/29] package/qt6/qt6base: add support for building examples
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (5 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 06/29] package/qt6/qt6base: add support for test module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 8:07 ` Thomas Petazzoni via buildroot
2022-08-26 6:47 ` [Buildroot] [PATCH v2 08/29] package/qt6/qt6base: add support for dbus module Jesse Van Gavere
` (21 subsequent siblings)
28 siblings, 1 reply; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 7 +++++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 2ed780e913..061861880c 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -17,6 +17,13 @@ config BR2_PACKAGE_QT6BASE
if BR2_PACKAGE_QT6BASE
+config BR2_PACKAGE_QT6BASE_EXAMPLES
+ bool "Compile and install examples (with code)"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_QT6BASE_XML
+ help
+ If unsure, say N.
+
config BR2_PACKAGE_QT6BASE_NETWORK
bool "network module"
help
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index fd1e0a2847..f66610ea0c 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -77,6 +77,12 @@ define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
+ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y)
+QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON
+else
+QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y)
QT6BASE_CONF_OPTS += -DFEATURE_network=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [Buildroot] [PATCH v2 07/29] package/qt6/qt6base: add support for building examples
2022-08-26 6:47 ` [Buildroot] [PATCH v2 07/29] package/qt6/qt6base: add support for building examples Jesse Van Gavere
@ 2022-08-26 8:07 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 33+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-26 8:07 UTC (permalink / raw)
To: Jesse Van Gavere; +Cc: Yann E . Morin, buildroot
On Fri, 26 Aug 2022 08:47:36 +0200
Jesse Van Gavere <jesseevg@gmail.com> wrote:
> ---
> package/qt6/qt6base/Config.in | 7 +++++++
> package/qt6/qt6base/qt6base.mk | 6 ++++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
> index 2ed780e913..061861880c 100644
> --- a/package/qt6/qt6base/Config.in
> +++ b/package/qt6/qt6base/Config.in
> @@ -17,6 +17,13 @@ config BR2_PACKAGE_QT6BASE
>
> if BR2_PACKAGE_QT6BASE
>
> +config BR2_PACKAGE_QT6BASE_EXAMPLES
> + bool "Compile and install examples (with code)"
Did you check that indeed with qt6 examples are still installed with
their source code?
> + select BR2_PACKAGE_QT6BASE_NETWORK
> + select BR2_PACKAGE_QT6BASE_XML
Did you check that with qt6 examples indeed need network and xml, and
just that?
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] 33+ messages in thread
* [Buildroot] [PATCH v2 08/29] package/qt6/qt6base: add support for dbus module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (6 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 07/29] package/qt6/qt6base: add support for building examples Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 09/29] package/qt6/qt6base: add support for syslog backend Jesse Van Gavere
` (20 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 8 ++++++++
package/qt6/qt6base/qt6base.mk | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 061861880c..fb573303d5 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -44,4 +44,12 @@ config BR2_PACKAGE_QT6BASE_XML
help
This options enables the Qt6Xml library.
+config BR2_PACKAGE_QT6BASE_DBUS
+ bool "DBus module"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_DBUS
+ help
+ This option enables the D-Bus module.
+
endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index f66610ea0c..bdb7f00e65 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -77,6 +77,17 @@ define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
+ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y)
+QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON
+QT6BASE_CONF_OPTS += -DINPUT_dbus=linked
+QT6BASE_DEPENDENCIES += dbus
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON
+HOST_QT6BASE_DEPENDENCIES += host-dbus
+else
+QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y)
QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 09/29] package/qt6/qt6base: add support for syslog backend
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (7 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 08/29] package/qt6/qt6base: add support for dbus module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 10/29] package/qt6/qt6base: add qt support for journald when using systemd Jesse Van Gavere
` (19 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 5 +++++
package/qt6/qt6base/qt6base.mk | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index fb573303d5..4d75fcb111 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -44,6 +44,11 @@ config BR2_PACKAGE_QT6BASE_XML
help
This options enables the Qt6Xml library.
+config BR2_PACKAGE_QT6BASE_SYSLOG
+ bool "syslog support"
+ help
+ Logs to the standard UNIX logging mechanism.
+
config BR2_PACKAGE_QT6BASE_DBUS
bool "DBus module"
depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index bdb7f00e65..7d6a79d00a 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -118,5 +118,11 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y)
+QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF
+endif
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 10/29] package/qt6/qt6base: add qt support for journald when using systemd
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (8 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 09/29] package/qt6/qt6base: add support for syslog backend Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 11/29] package/qt6/qt6base: add qt support for zstd when using the package Jesse Van Gavere
` (18 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 7d6a79d00a..d7c3e8a592 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -118,6 +118,13 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+QT6BASE_CONF_OPTS += -DFEATURE_journald=ON
+QT6BASE_DEPENDENCIES += systemd
+else
+QT6BASE_CONF_OPTS += -DFEATURE_journald=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y)
QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 11/29] package/qt6/qt6base: add qt support for zstd when using the package
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (9 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 10/29] package/qt6/qt6base: add qt support for journald when using systemd Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 12/29] package/qt6/qt6base: add qt support for SSE/AVX SIMD extensions Jesse Van Gavere
` (17 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index d7c3e8a592..440617ba74 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -125,6 +125,13 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_journald=OFF
endif
+ifeq ($(BR2_PACKAGE_ZSTD),y)
+QT6BASE_CONF_OPTS += -DFEATURE_zstd=ON
+QT6BASE_DEPENDENCIES += zstd
+else
+QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y)
QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 12/29] package/qt6/qt6base: add qt support for SSE/AVX SIMD extensions
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (10 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 11/29] package/qt6/qt6base: add qt support for zstd when using the package Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 13/29] package/qt6/qt6base: add linking to libatomic Jesse Van Gavere
` (16 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 440617ba74..5474a80302 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -35,6 +35,25 @@ QT6BASE_CONF_OPTS = \
-DFEATURE_system_zlib=ON \
-DFEATURE_system_libb2=ON
+QT6BASE_CONF_OPTS += -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF)
+QT6BASE_CONF_OPTS += -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF)
+# no buildroot BR2_X86_CPU_HAS_AVX512 option yet
+QT6BASE_CONF_OPTS += \
+ -DFEATURE_avx512bw=OFF \
+ -DFEATURE_avx512cd=OFF \
+ -DFEATURE_avx512dq=OFF \
+ -DFEATURE_avx512er=OFF \
+ -DFEATURE_avx512f=OFF \
+ -DFEATURE_avx512ifma=OFF \
+ -DFEATURE_avx512pf=OFF \
+ -DFEATURE_avx512vbmi=OFF \
+ -DFEATURE_avx512vl=OFF
+
define QT6BASE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR)
endef
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 13/29] package/qt6/qt6base: add linking to libatomic
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (11 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 12/29] package/qt6/qt6base: add qt support for SSE/AVX SIMD extensions Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 14/29] package/qt6/qt6base: add support to link qt to openssl Jesse Van Gavere
` (15 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
This patch might not be necessary for qt6 but I can't find anything
indicating so, Yann E. made the original commit for this on qt5 so
he might be aware of current necessity
---
package/qt6/qt6base/qt6base.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5474a80302..033e92c26b 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -157,5 +157,10 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF
endif
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+# Qt needs atomics, which on various architectures are in -latomic
+QT6BASE_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-latomic"
+endif
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 14/29] package/qt6/qt6base: add support to link qt to openssl
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (12 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 13/29] package/qt6/qt6base: add linking to libatomic Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 15/29] package/qt6/qt6base: add qt icu support Jesse Van Gavere
` (14 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 033e92c26b..9784a9bd73 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -96,6 +96,14 @@ define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+QT6BASE_CONF_OPTS += -DINPUT_openssl=yes
+QT6BASE_DEPENDENCIES += openssl
+else
+QT6BASE_CONF_OPTS += -DINPUT_openssl=no
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y)
QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON
QT6BASE_CONF_OPTS += -DINPUT_dbus=linked
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 15/29] package/qt6/qt6base: add qt icu support
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (13 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 14/29] package/qt6/qt6base: add support to link qt to openssl Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 16/29] package/qt6/qt6base: add qt libudev support Jesse Van Gavere
` (13 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 15 +++++++++++++++
package/qt6/qt6base/qt6base.mk | 7 +++++++
2 files changed, 22 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 4d75fcb111..e9bb7602a9 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -57,4 +57,19 @@ config BR2_PACKAGE_QT6BASE_DBUS
help
This option enables the D-Bus module.
+config BR2_PACKAGE_QT6BASE_ICU
+ bool "Enable ICU support"
+ depends on !BR2_BINFMT_FLAT # icu
+ depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu
+ select BR2_PACKAGE_ICU
+ help
+ This option enables ICU support in Qt6. This is for example
+ needed for Qt6Webkit.
+
+comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9"
+ depends on !BR2_BINFMT_FLAT
+ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
+ !BR2_HOST_GCC_AT_LEAST_4_9
+
endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 9784a9bd73..aa2def64ae 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -115,6 +115,13 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_ICU),y)
+QT6BASE_CONF_OPTS += -DFEATURE_icu=ON
+QT6BASE_DEPENDENCIES += icu
+else
+QT6BASE_CONF_OPTS += -DFEATURE_icu=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y)
QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON
else
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 16/29] package/qt6/qt6base: add qt libudev support
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (14 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 15/29] package/qt6/qt6base: add qt icu support Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 17/29] package/qt6/qt6base: add qt libglib2 support Jesse Van Gavere
` (12 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index aa2def64ae..22034c8b3e 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -96,6 +96,12 @@ define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+QT6BASE_CONF_OPTS += -DFEATURE_libudev=ON
+QT6BASE_DEPENDENCIES += udev
+else
+QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF
+endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
QT6BASE_CONF_OPTS += -DINPUT_openssl=yes
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 17/29] package/qt6/qt6base: add qt libglib2 support
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (15 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 16/29] package/qt6/qt6base: add qt libudev support Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 18/29] package/qt6/qt6base: add support for passing custom options Jesse Van Gavere
` (11 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 22034c8b3e..4a51d530d7 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -121,6 +121,13 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF
endif
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+QT6BASE_CONF_OPTS += -DFEATURE_glib=ON
+QT6BASE_DEPENDENCIES += libglib2
+else
+QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_ICU),y)
QT6BASE_CONF_OPTS += -DFEATURE_icu=ON
QT6BASE_DEPENDENCIES += icu
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 18/29] package/qt6/qt6base: add support for passing custom options
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (16 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 17/29] package/qt6/qt6base: add qt libglib2 support Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 19/29] package/qt6/qt6base: add support for sql module w/ mysql Jesse Van Gavere
` (10 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 10 ++++++++++
package/qt6/qt6base/qt6base.mk | 3 +++
2 files changed, 13 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index e9bb7602a9..949bf26843 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -17,6 +17,16 @@ config BR2_PACKAGE_QT6BASE
if BR2_PACKAGE_QT6BASE
+config BR2_PACKAGE_QT6BASE_CUSTOM_CONF_OPTS
+ string "Custom configuration options"
+ help
+ Define custom qt6 configuration options which can be used to
+ enable or disable options not managed by buildroot. These
+ options are appended to the ones generated by buildroot and
+ passed to qt6base during configuration.
+
+ Use cmake style '-Doption_name=ON' or -Doption_name=OFF'.
+
config BR2_PACKAGE_QT6BASE_EXAMPLES
bool "Compile and install examples (with code)"
select BR2_PACKAGE_QT6BASE_NETWORK
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 4a51d530d7..ce937300d0 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -190,5 +190,8 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
QT6BASE_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-latomic"
endif
+# Must be last so can override all options set by Buildroot
+QT6BASE_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_QT6BASE_CUSTOM_CONF_OPTS))
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 19/29] package/qt6/qt6base: add support for sql module w/ mysql
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (17 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 18/29] package/qt6/qt6base: add support for passing custom options Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 20/29] package/qt6/qt6base: add support for sql module with postgresql Jesse Van Gavere
` (9 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 18 ++++++++++++++++++
package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 949bf26843..35a83beb92 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -44,6 +44,24 @@ config BR2_PACKAGE_QT6BASE_CONCURRENT
help
This options enables the Qt6Concurrent library.
+config BR2_PACKAGE_QT6BASE_SQL
+ bool "sql module"
+ help
+ This options enables the Qt6Sql library.
+
+if BR2_PACKAGE_QT6BASE_SQL
+config BR2_PACKAGE_QT6BASE_MYSQL
+ bool "MySQL Plugin"
+ depends on BR2_USE_MMU # mysql
+ select BR2_PACKAGE_MYSQL
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
+ help
+ Build MySQL plugin
+ If unsure, say n.
+
+endif
+
config BR2_PACKAGE_QT6BASE_TEST
bool "test module"
help
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index ce937300d0..5a3798a1d2 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -103,6 +103,22 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF
endif
+# Qt6 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT6BASE_SQL),y)
+QT6BASE_CONF_OPTS += -DFEATURE_sql=ON
+QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql_oci=OFF -DFEATURE_sql_odbc=OFF
+
+ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y)
+QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON
+QT6BASE_DEPENDENCIES += mysql
+else
+QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF
+endif
+
+else
+QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
QT6BASE_CONF_OPTS += -DINPUT_openssl=yes
QT6BASE_DEPENDENCIES += openssl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 20/29] package/qt6/qt6base: add support for sql module with postgresql
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (18 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 19/29] package/qt6/qt6base: add support for sql module w/ mysql Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 21/29] package/qt6/qt6base: add support for sql module with sqlite Jesse Van Gavere
` (8 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 14 ++++++++++++++
package/qt6/qt6base/qt6base.mk | 7 +++++++
2 files changed, 21 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 35a83beb92..9cbbce6e4c 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -60,6 +60,20 @@ config BR2_PACKAGE_QT6BASE_MYSQL
Build MySQL plugin
If unsure, say n.
+config BR2_PACKAGE_QT6BASE_PSQL
+ bool "PostgreSQL Plugin"
+ depends on BR2_USE_MMU # postgresql
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_USE_WCHAR # postgresql
+ select BR2_PACKAGE_POSTGRESQL
+ help
+ Build PostgreSQL plugin
+ If unsure, say n.
+
+comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library"
+ depends on BR2_USE_MMU
+ depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
+
endif
config BR2_PACKAGE_QT6BASE_TEST
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5a3798a1d2..69c59b8d6f 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -115,6 +115,13 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_PSQL),y)
+QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=ON
+QT6BASE_DEPENDENCIES += postgresql
+else
+QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=OFF
+endif
+
else
QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 21/29] package/qt6/qt6base: add support for sql module with sqlite
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (19 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 20/29] package/qt6/qt6base: add support for sql module with postgresql Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 22/29] package/qt6/qt6base: add support for gui module Jesse Van Gavere
` (7 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 25 +++++++++++++++++++++++++
package/qt6/qt6base/qt6base.mk | 9 +++++++++
2 files changed, 34 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 9cbbce6e4c..469e6b642c 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -74,6 +74,31 @@ comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
+choice
+ prompt "SQLite 3 support"
+ default BR2_PACKAGE_QT6BASE_SQLITE_NONE
+ help
+ Select SQLite support.
+
+config BR2_PACKAGE_QT6BASE_SQLITE_NONE
+ bool "No sqlite support"
+ help
+ Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT6BASE_SQLITE_QT
+ bool "Qt SQLite"
+ help
+ Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT6BASE_SQLITE_SYSTEM
+ bool "System SQLite"
+ select BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
+ help
+ Use system SQLite.
+
+endchoice
+
endif
config BR2_PACKAGE_QT6BASE_TEST
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 69c59b8d6f..de65711cde 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -122,6 +122,15 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE_SYSTEM),y)
+QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON
+QT6BASE_DEPENDENCIES += sqlite
+else ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE_QT),y)
+QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=OFF
+else
+QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=OFF
+endif
+
else
QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 22/29] package/qt6/qt6base: add support for gui module
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (20 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 21/29] package/qt6/qt6base: add support for sql module with sqlite Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 23/29] package/qt6/qt6base: add support for gui module fontconfig/harfbuzz Jesse Van Gavere
` (6 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 6 ++++++
package/qt6/qt6base/qt6base.mk | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 469e6b642c..8959a59431 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -111,6 +111,12 @@ config BR2_PACKAGE_QT6BASE_XML
help
This options enables the Qt6Xml library.
+config BR2_PACKAGE_QT6BASE_GUI
+ bool "gui module"
+ select BR2_PACKAGE_FREETYPE
+ help
+ This option enables the Qt6Gui library.
+
config BR2_PACKAGE_QT6BASE_SYSLOG
bool "syslog support"
help
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index de65711cde..6378614526 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -135,6 +135,14 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF
+QT6BASE_DEPENDENCIES += freetype
+
+else
+QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
QT6BASE_CONF_OPTS += -DINPUT_openssl=yes
QT6BASE_DEPENDENCIES += openssl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 23/29] package/qt6/qt6base: add support for gui module fontconfig/harfbuzz
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (21 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 22/29] package/qt6/qt6base: add support for gui module Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 24/29] package/qt6/qt6base: Add support for gui module jpeg/png/gif image format Jesse Van Gavere
` (5 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 21 +++++++++++++++++++++
package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 8959a59431..e78fd45421 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -117,6 +117,27 @@ config BR2_PACKAGE_QT6BASE_GUI
help
This option enables the Qt6Gui library.
+if BR2_PACKAGE_QT6BASE_GUI
+
+config BR2_PACKAGE_QT6BASE_FONTCONFIG
+ bool "fontconfig support"
+ select BR2_PACKAGE_FONTCONFIG
+ help
+ This option enables Fontconfig and Freetype support using
+ the system fontconfig and freetype2 libraries.
+
+config BR2_PACKAGE_QT6BASE_HARFBUZZ
+ bool "harfbuzz support"
+ select BR2_PACKAGE_HARFBUZZ if \
+ BR2_TOOLCHAIN_HAS_SYNC_4 && \
+ BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+ help
+ This option enables HarfBuzz support (either system harfbuzz
+ if the toolchain supports __sync for 4 bytes, or the qt
+ provided one which avoids this dependency by using QAtomic).
+
+endif
+
config BR2_PACKAGE_QT6BASE_SYSLOG
bool "syslog support"
help
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6378614526..c92239f2fd 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -139,6 +139,29 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y)
QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF
QT6BASE_DEPENDENCIES += freetype
+ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y)
+QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
+# system harfbuzz in case __sync for 4 bytes is supported
+QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF
+QT6BASE_DEPENDENCIES += harfbuzz
+else #BR2_TOOLCHAIN_HAS_SYNC_4
+# qt harfbuzz otherwise (using QAtomic instead)
+QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON
+QT6BASE_LICENSE += , MIT (harfbuzz)
+QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
+endif
+else
+QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y)
+QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON
+QT6BASE_DEPENDENCIES += fontconfig
+else
+QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF
+endif
+
else
QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 24/29] package/qt6/qt6base: Add support for gui module jpeg/png/gif image format
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (22 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 23/29] package/qt6/qt6base: add support for gui module fontconfig/harfbuzz Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 25/29] package/qt6/qt6base: add support for gui module widgets/opengl/graphics backends Jesse Van Gavere
` (4 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 19 +++++++++++++++++++
package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index e78fd45421..128a2682e3 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -136,6 +136,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ
if the toolchain supports __sync for 4 bytes, or the qt
provided one which avoids this dependency by using QAtomic).
+config BR2_PACKAGE_QT6BASE_GIF
+ bool "GIF support"
+ help
+ This compiles and installs the plugin for GIF reading support.
+
+config BR2_PACKAGE_QT6BASE_JPEG
+ bool "JPEG support"
+ select BR2_PACKAGE_JPEG
+ help
+ This option enables JPEG support using the system libjpeg
+ library.
+
+config BR2_PACKAGE_QT6BASE_PNG
+ bool "PNG support"
+ select BR2_PACKAGE_LIBPNG
+ help
+ This option enables PNG support using the system libpng
+ library.
+
endif
config BR2_PACKAGE_QT6BASE_SYSLOG
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index c92239f2fd..877ab382a2 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -155,6 +155,26 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y)
+QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON
+QT6BASE_DEPENDENCIES += libpng
+else
+QT6BASE_CONF_OPTS += -DFEATURE_png=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gif=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y)
+QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON
+QT6BASE_DEPENDENCIES += jpeg
+else
+QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y)
QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON
QT6BASE_DEPENDENCIES += fontconfig
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 25/29] package/qt6/qt6base: add support for gui module widgets/opengl/graphics backends
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (23 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 24/29] package/qt6/qt6base: Add support for gui module jpeg/png/gif image format Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 26/29] package/qt6/qt6base: add support for gui module tslib Jesse Van Gavere
` (3 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
This is a rather large patch as most of these options interact with each
other one way or another, so it's very difficult to split it much
further into sensible patches that still work
---
package/qt6/Config.in | 5 ++
package/qt6/qt6base/Config.in | 98 ++++++++++++++++++++++++++++++++++
package/qt6/qt6base/qt6base.mk | 84 +++++++++++++++++++++++++++++
3 files changed, 187 insertions(+)
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 4b2b9a1174..32f32eb162 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS
default y if BR2_sparc64
depends on BR2_USE_MMU
+config BR2_PACKAGE_QT6_GL_AVAILABLE
+ bool
+ default y
+ depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
+
comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8"
depends on !BR2_PACKAGE_QT5
depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 128a2682e3..2c61cac9f6 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -114,11 +114,109 @@ config BR2_PACKAGE_QT6BASE_XML
config BR2_PACKAGE_QT6BASE_GUI
bool "gui module"
select BR2_PACKAGE_FREETYPE
+ # At least one graphic backend must be enabled, so enable
+ # linuxfb if nothing is enabled.
+ select BR2_PACKAGE_QT6BASE_LINUXFB if \
+ !BR2_PACKAGE_QT6BASE_DIRECTFB && \
+ !BR2_PACKAGE_QT6BASE_XCB && \
+ !BR2_PACKAGE_QT6BASE_EGLFS
help
This option enables the Qt6Gui library.
if BR2_PACKAGE_QT6BASE_GUI
+config BR2_PACKAGE_QT6BASE_WIDGETS
+ bool "widgets module"
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB
+ help
+ This option enables the Qt6Widgets library.
+
+comment "OpenGL support needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_AVAILABLE
+
+config BR2_PACKAGE_QT6BASE_OPENGL
+ bool "OpenGL support"
+ depends on BR2_PACKAGE_QT6_GL_AVAILABLE
+ help
+ This option enables OpenGL support.
+
+if BR2_PACKAGE_QT6BASE_OPENGL
+
+choice
+ prompt "OpenGL API"
+ help
+ Select OpenGL API.
+
+config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP
+ bool "Desktop OpenGL"
+ depends on BR2_PACKAGE_HAS_LIBGL
+ help
+ Use desktop OpenGL.
+
+config BR2_PACKAGE_QT6BASE_OPENGL_ES2
+ bool "OpenGL ES 2.0+"
+ depends on BR2_PACKAGE_HAS_LIBGLES
+ help
+ Use OpenGL ES 2.0 and later versions.
+
+endchoice
+
+config BR2_PACKAGE_QT6BASE_OPENGL_LIB
+ bool "opengl module"
+ select BR2_PACKAGE_QT6BASE_WIDGETS
+ help
+ This option enables the Qt6OpenGL library. This library
+ includes OpenGL support classes provided to ease porting
+ from Qt 4.x.
+
+endif
+
+config BR2_PACKAGE_QT6BASE_LINUXFB
+ bool "linuxfb support"
+
+config BR2_PACKAGE_QT6BASE_DIRECTFB
+ bool "directfb support"
+ depends on BR2_PACKAGE_DIRECTFB
+
+comment "directfb backend available if directfb is enabled"
+ depends on !BR2_PACKAGE_DIRECTFB
+
+config BR2_PACKAGE_QT6BASE_XCB
+ bool "X.org XCB support"
+ depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XCB_UTIL_IMAGE
+ select BR2_PACKAGE_XCB_UTIL_KEYSYMS
+ select BR2_PACKAGE_XCB_UTIL_RENDERUTIL
+ select BR2_PACKAGE_XCB_UTIL_WM
+ select BR2_PACKAGE_LIBXKBCOMMON
+
+comment "X.org XCB backend available if X.org is enabled"
+ depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_QT6BASE_EGLFS
+ bool "eglfs support"
+ depends on BR2_PACKAGE_HAS_LIBEGL
+ depends on BR2_PACKAGE_QT6_GL_AVAILABLE
+ select BR2_PACKAGE_QT6BASE_OPENGL
+
+comment "eglfs backend available if OpenGL and EGL are enabled"
+ depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT6_GL_AVAILABLE
+
+config BR2_PACKAGE_QT6BASE_DEFAULT_QPA
+ string "Default graphical platform"
+ help
+ Choose the default platform abstraction to use for graphical
+ applications (e.g xcb, linuxfb, eglfs, ...). If this is
+ empty, the default for your architecture will be used
+ (usually this is eglfs).
+
+ You can get a list of supported platforms by running a Qt
+ application with the option "-platform help" on your
+ target. You can choose a different platform at runtime with
+ the -platform option.
+
config BR2_PACKAGE_QT6BASE_FONTCONFIG
bool "fontconfig support"
select BR2_PACKAGE_FONTCONFIG
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 877ab382a2..e20be63287 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -182,10 +182,94 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF
endif
+# Uses libgbm from mesa3d
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON
+QT6BASE_DEPENDENCIES += mesa3d
+else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON
+QT6BASE_DEPENDENCIES += gcnano-binaries
+else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON
+QT6BASE_DEPENDENCIES += ti-sgx-libgbm
+else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y)
+QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON
+QT6BASE_DEPENDENCIES += imx-gpu-viv
+else
+QT6BASE_CONF_OPTS += -DFEATURE_gbm=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y)
+QT6BASE_CONF_OPTS += -DFEATURE_eglfs=ON
+QT6BASE_DEPENDENCIES += libegl
+else
+QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y)
+QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON
+QT6BASE_DEPENDENCIES += libgl
+else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y)
+QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON
+QT6BASE_DEPENDENCIES += libgles
+else
+QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no
+endif
+
+# only enable gtk support if libgtk3 X11 backend is enabled
+ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy)
+QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON
+QT6BASE_DEPENDENCIES += libgtk3
+else
+QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y)
+QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON
+
+ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y)
+QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_DIRECTFB),y)
+QT6BASE_CONF_OPTS += -DFEATURE_directfb=ON
+QT6BASE_DEPENDENCIES += directfb
+else
+QT6BASE_CONF_OPTS += -DFEATURE_directfb=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y)
+QT6BASE_CONF_OPTS += \
+ -DFEATURE_xcb=ON \
+ -DFEATURE_xcb_xlib=ON \
+ -DFEATURE_xkbcommon=ON \
+ -DFEATURE_xkbcommon_x11=ON
+QT6BASE_DEPENDENCIES += \
+ libxcb \
+ xcb-util-wm \
+ xcb-util-image \
+ xcb-util-keysyms \
+ xcb-util-renderutil \
+ xlib_libX11 \
+ libxkbcommon
+QT6BASE_DEPENDENCIES += xlib_libXext
+else
+QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF
+endif
+
+else
+QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF
+endif
+
else
QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA))
+QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA))
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
QT6BASE_CONF_OPTS += -DINPUT_openssl=yes
QT6BASE_DEPENDENCIES += openssl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 26/29] package/qt6/qt6base: add support for gui module tslib
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (24 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 25/29] package/qt6/qt6base: add support for gui module widgets/opengl/graphics backends Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 27/29] package/qt6/qt6base: add support for gui module libinput Jesse Van Gavere
` (2 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 6 ++++++
package/qt6/qt6base/qt6base.mk | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 2c61cac9f6..f33dd2c636 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -283,4 +283,10 @@ comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9"
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_HOST_GCC_AT_LEAST_4_9
+config BR2_PACKAGE_QT6BASE_TSLIB
+ bool "Enable Tslib support"
+ select BR2_PACKAGE_TSLIB
+ help
+ This options enables the Tslib plugin
+
endif
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index e20be63287..3644abc4f9 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -206,6 +206,14 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF
endif
+
+ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y)
+QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON
+QT6BASE_DEPENDENCIES += tslib
+else
+QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y)
QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON
QT6BASE_DEPENDENCIES += libgl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 27/29] package/qt6/qt6base: add support for gui module libinput
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (25 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 26/29] package/qt6/qt6base: add support for gui module tslib Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 28/29] package/qt6/qt6base: add support for gui module kms Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 29/29] package/qt6/qt6base: add support for gui module printsupport/cups Jesse Van Gavere
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 3644abc4f9..7f76b195d5 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -206,6 +206,12 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF
endif
+ifeq ($(BR2_PACKAGE_LIBINPUT),y)
+QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON
+QT6BASE_DEPENDENCIES += libinput
+else
+QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF
+endif
ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y)
QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 28/29] package/qt6/qt6base: add support for gui module kms
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (26 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 27/29] package/qt6/qt6base: add support for gui module libinput Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
2022-08-26 6:47 ` [Buildroot] [PATCH v2 29/29] package/qt6/qt6base: add support for gui module printsupport/cups Jesse Van Gavere
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/qt6base.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 7f76b195d5..5e9b504b87 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -175,6 +175,13 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF
endif
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
+QT6BASE_CONF_OPTS += -DFEATURE_kms=ON
+QT6BASE_DEPENDENCIES += libdrm
+else
+QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF
+endif
+
ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y)
QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON
QT6BASE_DEPENDENCIES += fontconfig
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread* [Buildroot] [PATCH v2 29/29] package/qt6/qt6base: add support for gui module printsupport/cups
2022-08-26 6:47 [Buildroot] [PATCH v2] Extend Qt6 configuration Jesse Van Gavere
` (27 preceding siblings ...)
2022-08-26 6:47 ` [Buildroot] [PATCH v2 28/29] package/qt6/qt6base: add support for gui module kms Jesse Van Gavere
@ 2022-08-26 6:47 ` Jesse Van Gavere
28 siblings, 0 replies; 33+ messages in thread
From: Jesse Van Gavere @ 2022-08-26 6:47 UTC (permalink / raw)
To: buildroot; +Cc: Jesse Van Gavere, Yann E . Morin, Thomas Petazzoni
---
package/qt6/qt6base/Config.in | 4 ++++
package/qt6/qt6base/qt6base.mk | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
index f33dd2c636..244e7d6760 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -217,6 +217,10 @@ config BR2_PACKAGE_QT6BASE_DEFAULT_QPA
target. You can choose a different platform at runtime with
the -platform option.
+config BR2_PACKAGE_QT6BASE_PRINTSUPPORT
+ depends on BR2_PACKAGE_QT6BASE_WIDGETS
+ def_bool y
+
config BR2_PACKAGE_QT6BASE_FONTCONFIG
bool "fontconfig support"
select BR2_PACKAGE_FONTCONFIG
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 5e9b504b87..2324d3825c 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -175,6 +175,18 @@ else
QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF
endif
+ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y)
+QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON
+ifeq ($(BR2_PACKAGE_CUPS), y)
+QT6BASE_CONF_OPTS += -DFEATURE_cups=ON
+QT6BASE_DEPENDENCIES += cups
+else
+QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF
+endif
+else
+QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF
+endif
+
ifeq ($(BR2_PACKAGE_LIBDRM),y)
QT6BASE_CONF_OPTS += -DFEATURE_kms=ON
QT6BASE_DEPENDENCIES += libdrm
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 33+ messages in thread