* [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-05-09 14:42 ` Thomas Petazzoni via buildroot
2024-04-17 8:05 ` [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (8 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, Thomas Petazzoni
Fixes the following error:
ERROR: Feature "opengles2": Forcing to "ON" breaks its condition:
NOT WIN32 AND NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND
Condition values dump:
WIN32 = ""
WATCHOS = "0"
QT_FEATURE_opengl_desktop = "ON"
GLESv2_FOUND = "TRUE"
CMake Error at cmake/QtBuildInformation.cmake:209 (message):
Check the configuration messages for an error that has occurred.
Call Stack (most recent call first):
cmake/QtBuildInformation.cmake:39 (qt_configure_print_summary)
cmake/QtBuildRepoHelpers.cmake:332 (qt_print_feature_summary)
CMakeLists.txt:208 (qt_build_repo_end)
Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
---
package/qt6/qt6base/qt6base.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6857725ef5..211808d2af 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -259,10 +259,15 @@ 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_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_CONF_OPTS += \
+ -DFEATURE_opengl=ON \
+ -DFEATURE_opengles2=ON \
+ -DFEATURE_opengl_desktop=OFF
QT6BASE_DEPENDENCIES += libgles
else
QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl
2024-04-17 8:05 ` [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl Roy Kollen Svendsen
@ 2024-05-09 14:42 ` Thomas Petazzoni via buildroot
2024-05-10 7:56 ` Roy Kollen Svendsen
0 siblings, 1 reply; 18+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-09 14:42 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, buildroot
Hello Roy,
On Wed, 17 Apr 2024 10:05:23 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> Fixes the following error:
>
> ERROR: Feature "opengles2": Forcing to "ON" breaks its condition:
> NOT WIN32 AND NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND
> Condition values dump:
> WIN32 = ""
> WATCHOS = "0"
> QT_FEATURE_opengl_desktop = "ON"
> GLESv2_FOUND = "TRUE"
>
> CMake Error at cmake/QtBuildInformation.cmake:209 (message):
> Check the configuration messages for an error that has occurred.
> Call Stack (most recent call first):
> cmake/QtBuildInformation.cmake:39 (qt_configure_print_summary)
> cmake/QtBuildRepoHelpers.cmake:332 (qt_print_feature_summary)
> CMakeLists.txt:208 (qt_build_repo_end)
>
> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
I don't see any failures for this in our autobuilders. Could you
provide a simple Buildroot defconfig that exhibits this issue?
Also, does this issue already appears with qt6base 6.4.3 that we have
in Buildroot today, or only after the bump to qt 6.7 ? This is
important to understand if the fix needs to be backported to our stable
branches or not.
Thanks a lot,
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] 18+ messages in thread
* Re: [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl
2024-05-09 14:42 ` Thomas Petazzoni via buildroot
@ 2024-05-10 7:56 ` Roy Kollen Svendsen
0 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-10 7:56 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1791 bytes --]
Hi Thomas,
I moved this change into a separate patch, since it also applies to the
current Qt6.4.3 version, and updated the commit message with a defconfig
for recreating the build failure.
I intend to remove the change from this patch series and fix the other
issues.
Best regards,
Roy
tor. 9. mai 2024 kl. 16:42 skrev Thomas Petazzoni <
thomas.petazzoni@bootlin.com>:
> Hello Roy,
>
> On Wed, 17 Apr 2024 10:05:23 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
> > Fixes the following error:
> >
> > ERROR: Feature "opengles2": Forcing to "ON" breaks its condition:
> > NOT WIN32 AND NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND
> GLESv2_FOUND
> > Condition values dump:
> > WIN32 = ""
> > WATCHOS = "0"
> > QT_FEATURE_opengl_desktop = "ON"
> > GLESv2_FOUND = "TRUE"
> >
> > CMake Error at cmake/QtBuildInformation.cmake:209 (message):
> > Check the configuration messages for an error that has occurred.
> > Call Stack (most recent call first):
> > cmake/QtBuildInformation.cmake:39 (qt_configure_print_summary)
> > cmake/QtBuildRepoHelpers.cmake:332 (qt_print_feature_summary)
> > CMakeLists.txt:208 (qt_build_repo_end)
> >
> > Signed-off-by: Roy Kollen Svendsen <
> roy.kollen.svendsen@akersolutions.com>
>
> I don't see any failures for this in our autobuilders. Could you
> provide a simple Buildroot defconfig that exhibits this issue?
>
> Also, does this issue already appears with qt6base 6.4.3 that we have
> in Buildroot today, or only after the bump to qt 6.7 ? This is
> important to understand if the fix needs to be backported to our stable
> branches or not.
>
> Thanks a lot,
>
> 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: 2949 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] 18+ messages in thread
* [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-05-09 14:45 ` Thomas Petazzoni via buildroot
2024-04-17 8:05 ` [Buildroot] [PATCH v2 04/11] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (7 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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 v1 -> v2:
- don't add unnecessary Config.in.host
- add required BR2_PACKAGE_HOST_QT6BASE_GUI config element to qt6base/Config.in
package/qt6/Config.in | 1 +
package/qt6/qt6base/Config.in | 3 ++
package/qt6/qt6base/qt6base.mk | 7 +++-
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
6 files changed, 72 insertions(+), 1 deletion(-)
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/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 3b15d40c83..5b598aa938 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -1,3 +1,6 @@
+config BR2_PACKAGE_HOST_QT6BASE_GUI
+ bool
+
config BR2_PACKAGE_QT6BASE
bool "qt6base"
select BR2_PACKAGE_DOUBLE_CONVERSION
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 211808d2af..a7101ca043 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.
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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-04-17 8:05 ` [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-05-09 14:45 ` Thomas Petazzoni via buildroot
2024-05-09 20:37 ` Yann E. MORIN
2024-05-09 20:49 ` Arnout Vandecappelle via buildroot
0 siblings, 2 replies; 18+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-09 14:45 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, buildroot, Zoltan Gyarmati,
Romain Naour, Jesse Van Gavere, Yann E. MORIN
Hello,
Added some Buildroot maintainers in Cc, for a question below.
On Wed, 17 Apr 2024 10:05:24 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> ---
> Changes v1 -> v2:
> - don't add unnecessary Config.in.host
> - add required BR2_PACKAGE_HOST_QT6BASE_GUI config element to qt6base/Config.in
It would be good to expand the commit log with some explanations on why
host-qt6base needs to be built with GUI support for this package to
build for the target. Indeed, this is a non-trivial packaging thing, so
it makes sense to clarify it explicitly.
> diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
> index 3b15d40c83..5b598aa938 100644
> --- a/package/qt6/qt6base/Config.in
> +++ b/package/qt6/qt6base/Config.in
> @@ -1,3 +1,6 @@
> +config BR2_PACKAGE_HOST_QT6BASE_GUI
> + bool
My question to other maintainers: do we want this blind option that
allows to enable GUI support in the *host* qt6base to be present in the
Config.in file (normally reserved for options for the target package),
or do we want a simple Config.in.host, which even if it doesn't have a
visible option for host-qt6base would carry this blind option allowing
to enable GUI support in host-qt6base ?
Thanks for your feedback,
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] 18+ messages in thread
* Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-05-09 14:45 ` Thomas Petazzoni via buildroot
@ 2024-05-09 20:37 ` Yann E. MORIN
2024-05-09 20:43 ` Thomas Petazzoni via buildroot
2024-05-09 20:49 ` Arnout Vandecappelle via buildroot
1 sibling, 1 reply; 18+ messages in thread
From: Yann E. MORIN @ 2024-05-09 20:37 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
buildroot, Zoltan Gyarmati, Romain Naour, Jesse Van Gavere
Thomas, Roy, All,
On 2024-05-09 16:45 +0200, Thomas Petazzoni via buildroot spake thusly:
[--SNIP--]
> > diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
> > index 3b15d40c83..5b598aa938 100644
> > --- a/package/qt6/qt6base/Config.in
> > +++ b/package/qt6/qt6base/Config.in
> > @@ -1,3 +1,6 @@
> > +config BR2_PACKAGE_HOST_QT6BASE_GUI
> > + bool
> My question to other maintainers: do we want this blind option that
> allows to enable GUI support in the *host* qt6base to be present in the
> Config.in file (normally reserved for options for the target package),
> or do we want a simple Config.in.host, which even if it doesn't have a
> visible option for host-qt6base would carry this blind option allowing
> to enable GUI support in host-qt6base ?
We have a few other host packages that have a no-prompt boolean option,
like dracut, eudev, patchelf, systemd.
The converse is non-existent; we only have ARCH_SUPPORTS for a few host
packages for languages:
$ git grep -E 'config BR2_PACKAGE_HOST_' -- '*/Config.in'
package/erlang/Config.in:config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
package/mono/Config.in:config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
package/openjdk/Config.in:config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
package/protobuf/Config.in:config BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
So, yes, I'd rather have BR2_PACKAGE_HOST_QT6BASE_GUI in its own
Config.in.host.
Also, it is a bit weird that this is an option for a host package
without a kconfig symbol for the host package itself...
Also, adding the support for GUI in host qt6base should be in its own
patch, separate from the one introducing qt6shadertools.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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] 18+ messages in thread* Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-05-09 20:37 ` Yann E. MORIN
@ 2024-05-09 20:43 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-09 20:43 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
buildroot, Zoltan Gyarmati, Romain Naour, Jesse Van Gavere
Hello,
On Thu, 9 May 2024 22:37:27 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> We have a few other host packages that have a no-prompt boolean option,
> like dracut, eudev, patchelf, systemd.
>
> The converse is non-existent; we only have ARCH_SUPPORTS for a few host
> packages for languages:
>
> $ git grep -E 'config BR2_PACKAGE_HOST_' -- '*/Config.in'
> package/erlang/Config.in:config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
> package/mono/Config.in:config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
> package/openjdk/Config.in:config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
> package/protobuf/Config.in:config BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
>
> So, yes, I'd rather have BR2_PACKAGE_HOST_QT6BASE_GUI in its own
> Config.in.host.
ACK.
> Also, it is a bit weird that this is an option for a host package
> without a kconfig symbol for the host package itself...
I don't find it weird. We need host-qt6base with some specific
features (which we don't want to build in all cases, as it takes time),
but really host-qt6base doesn't have to be user-visible in menuconfig,
as it's merely a build dependency.
> Also, adding the support for GUI in host qt6base should be in its own
> patch, separate from the one introducing qt6shadertools.
Agreed.
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] 18+ messages in thread
* Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-05-09 14:45 ` Thomas Petazzoni via buildroot
2024-05-09 20:37 ` Yann E. MORIN
@ 2024-05-09 20:49 ` Arnout Vandecappelle via buildroot
2024-05-09 20:58 ` Jesse Van Gavere
1 sibling, 1 reply; 18+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-05-09 20:49 UTC (permalink / raw)
To: Thomas Petazzoni, Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, buildroot, Zoltan Gyarmati,
Romain Naour, Jesse Van Gavere, Yann E. MORIN
On 09/05/2024 16:45, Thomas Petazzoni wrote:
> Hello,
>
> Added some Buildroot maintainers in Cc, for a question below.
>
> On Wed, 17 Apr 2024 10:05:24 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
>> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
>> ---
>> Changes v1 -> v2:
>> - don't add unnecessary Config.in.host
>> - add required BR2_PACKAGE_HOST_QT6BASE_GUI config element to qt6base/Config.in
>
> It would be good to expand the commit log with some explanations on why
> host-qt6base needs to be built with GUI support for this package to
> build for the target. Indeed, this is a non-trivial packaging thing, so
> it makes sense to clarify it explicitly.
>
>
>> diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
>> index 3b15d40c83..5b598aa938 100644
>> --- a/package/qt6/qt6base/Config.in
>> +++ b/package/qt6/qt6base/Config.in
>> @@ -1,3 +1,6 @@
>> +config BR2_PACKAGE_HOST_QT6BASE_GUI
>> + bool
>
> My question to other maintainers: do we want this blind option that
> allows to enable GUI support in the *host* qt6base to be present in the
> Config.in file (normally reserved for options for the target package),
> or do we want a simple Config.in.host, which even if it doesn't have a
> visible option for host-qt6base would carry this blind option allowing
> to enable GUI support in host-qt6base ?
It should be in Config.in.host. We have a few examples like that already, e.g.
package/systemd/Config.in.host. In that case, there's also a comment in the file
to explain when it should be selected, and I think that's appropriate here as well.
Regards,
Arnout
>
> Thanks for your feedback,
>
> Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
2024-05-09 20:49 ` Arnout Vandecappelle via buildroot
@ 2024-05-09 20:58 ` Jesse Van Gavere
0 siblings, 0 replies; 18+ messages in thread
From: Jesse Van Gavere @ 2024-05-09 20:58 UTC (permalink / raw)
To: Arnout Vandecappelle, Thomas Petazzoni, Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Samuel Martin, buildroot@buildroot.org,
Zoltan Gyarmati, Romain Naour, Yann E. MORIN
[-- Attachment #1.1: Type: text/plain, Size: 2961 bytes --]
________________________________
From: Arnout Vandecappelle <arnout@mind.be>
Sent: Thursday, May 9, 2024 10:50:03 pm
To: Thomas Petazzoni <thomas.petazzoni@bootlin.com>; Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Cc: buildroot@buildroot.org <buildroot@buildroot.org>; Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>; Zoltan Gyarmati <zgyarmati@zgyarmati.de>; Jesse Van Gavere <jesseevg@gmail.com>; Samuel Martin <s.martin49@gmail.com>; Yann E. MORIN <yann.morin.1998@free.fr>; Peter Korsgaard <peter@korsgaard.com>; Romain Naour <romain.naour@smile.fr>
Subject: Re: [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package
On 09/05/2024 16:45, Thomas Petazzoni wrote:
> Hello,
>
> Added some Buildroot maintainers in Cc, for a question below.
>
> On Wed, 17 Apr 2024 10:05:24 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
>> Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
>> ---
>> Changes v1 -> v2:
>> - don't add unnecessary Config.in.host
>> - add required BR2_PACKAGE_HOST_QT6BASE_GUI config element to qt6base/Config.in
>
> It would be good to expand the commit log with some explanations on why
> host-qt6base needs to be built with GUI support for this package to
> build for the target. Indeed, this is a non-trivial packaging thing, so
> it makes sense to clarify it explicitly.
>
>
>> diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in
>> index 3b15d40c83..5b598aa938 100644
>> --- a/package/qt6/qt6base/Config.in
>> +++ b/package/qt6/qt6base/Config.in
>> @@ -1,3 +1,6 @@
>> +config BR2_PACKAGE_HOST_QT6BASE_GUI
>> + bool
>
> My question to other maintainers: do we want this blind option that
> allows to enable GUI support in the *host* qt6base to be present in the
> Config.in file (normally reserved for options for the target package),
> or do we want a simple Config.in.host, which even if it doesn't have a
> visible option for host-qt6base would carry this blind option allowing
> to enable GUI support in host-qt6base ?
It should be in Config.in.host. We have a few examples like that already, e.g.
package/systemd/Config.in.host. In that case, there's also a comment in the file
to explain when it should be selected, and I think that's appropriate here as well.
Regards,
Arnout
>
> Thanks for your feedback,
>
> Thomas
Hey,
It was something I struggled a bit with how to properly do that dependency too since it's quite hefty if you don't need it and the qt one is a bit tricky as you always need it anyway and it's only relevant for that package, so to me not splitting it up seemed an ok way to do it, but if it's already done in a separate host file for other packages might be best to stay consistent, and in the case of eudev it's there also relevant only for the package itself, so that seems like an agreeable solution.
Regards,
Jesse
[-- Attachment #1.2: Type: text/html, Size: 4404 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] 18+ messages in thread
* [Buildroot] [PATCH v2 04/11] package/qt6/qt6svg: allow building for host
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 02/11] package/qt6base: avoid enabling both desktop and es2 opengl Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 03/11] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 05/11] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (6 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 05/11] package/qt6/qt6languageserver: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 04/11] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 06/11] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (5 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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..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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 06/11] package/qt6/qt6declarative: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 05/11] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 07/11] package/qt6/qt6websockets: " Roy Kollen Svendsen
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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/qt6declarative/Config.in | 22 ++++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
4 files changed, 90 insertions(+)
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/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..5c089668e4
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ 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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 07/11] package/qt6/qt6websockets: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 06/11] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 08/11] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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..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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 08/11] package/qt6/qt6wayland: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 07/11] package/qt6/qt6websockets: " Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 09/11] package/qt6/qt6tools: " Roy Kollen Svendsen
` (2 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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 | 24 ++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++
package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++
4 files changed, 89 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..814f9e1722
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,24 @@
+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)"
+ 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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 09/11] package/qt6/qt6tools: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 08/11] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 10/11] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 11/11] package/qt6/qt6mqtt: " Roy Kollen Svendsen
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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 v1 -> v2:
- add required BR2_PACKAGE_HOST_QT6BASE_NETWORK config element to qt6base/Config.in
package/qt6/Config.in | 1 +
package/qt6/qt6base/Config.in | 3 +++
package/qt6/qt6base/qt6base.mk | 7 +++++-
package/qt6/qt6tools/Config.in | 11 +++++++++
package/qt6/qt6tools/qt6tools.hash | 11 +++++++++
package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++
6 files changed, 69 insertions(+), 1 deletion(-)
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/qt6base/Config.in b/package/qt6/qt6base/Config.in
index 5b598aa938..5cfee728f7 100644
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@@ -1,6 +1,9 @@
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
+
config BR2_PACKAGE_QT6BASE
bool "qt6base"
select BR2_PACKAGE_DOUBLE_CONVERSION
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index a7101ca043..7a289a42c3 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.
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..fb7650a2d5
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ 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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 10/11] package/qt6/qt6virtualkeyboard: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 09/11] package/qt6/qt6tools: " Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
2024-04-17 8:05 ` [Buildroot] [PATCH v2 11/11] package/qt6/qt6mqtt: " Roy Kollen Svendsen
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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..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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 11/11] package/qt6/qt6mqtt: new package
2024-04-17 8:05 [Buildroot] [PATCH v2 01/11] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-04-17 8:05 ` [Buildroot] [PATCH v2 10/11] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-04-17 8:05 ` Roy Kollen Svendsen
9 siblings, 0 replies; 18+ messages in thread
From: Roy Kollen Svendsen @ 2024-04-17 8:05 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 | 9 ++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 55 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..b9b8269773
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ 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..4d2f18884f
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 c07243179e09874720361ae4f5a3e7f90244363eb98f177b9413c9f13b159e63 qt6mqtt-6.7.0-br1.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.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 18+ messages in thread