* [Buildroot] [PATCH] package/qt6/qt6scxml: new package
@ 2024-09-11 13:15 Christian Hitz via buildroot
2024-09-11 13:48 ` Roy Kollen Svendsen
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Christian Hitz via buildroot @ 2024-09-11 13:15 UTC (permalink / raw)
To: buildroot
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
From: Christian Hitz <christian.hitz@bbv.ch>
Cross-compiling requires the host variant of the same package.
Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
---
package/qt6/Config.in | 1 +
package/qt6/qt6scxml/Config.in | 11 ++++++++
package/qt6/qt6scxml/qt6scxml.hash | 11 ++++++++
package/qt6/qt6scxml/qt6scxml.mk | 40 ++++++++++++++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6scxml/Config.in
create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 29c1c25c7f..4cbb60322c 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6opcua/Config.in"
+source "package/qt6/qt6scxml/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/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in
new file mode 100644
index 0000000000..23561f61bc
--- /dev/null
+++ b/package/qt6/qt6scxml/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT6SCXML
+ bool "qt6scxml"
+ select BR2_PACKAGE_QT6DECLARATIVE
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt SCXML module provides functionality to create state
+ machines from SCXML files.
+
+ https://doc.qt.io/qt-6/qtscxml-index.html
diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
new file mode 100644
index 0000000000..6c39be214a
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
+sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f qtscxml-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk
new file mode 100644
index 0000000000..a455b01257
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt6scxml
+#
+################################################################################
+
+QT6SCXML_VERSION = $(QT6_VERSION)
+QT6SCXML_SITE = $(QT6_SITE)
+QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CONNECTIVITY_VERSION).tar.xz
+QT6SCXML_INSTALL_STAGING = YES
+QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SCXML_CMAKE_BACKEND = ninja
+
+QT6SCXML_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0 with exception(tools), \
+ GFDL-1.3 (docs)
+
+QT6SCXML_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
+
+QT6SCXML_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SCXML_DEPENDENCIES = \
+ host-qt6scxml \
+ qt6base
+
+HOST_QT6SCXML_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.46.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH] package/qt6/qt6scxml: new package
2024-09-11 13:15 [Buildroot] [PATCH] package/qt6/qt6scxml: new package Christian Hitz via buildroot
@ 2024-09-11 13:48 ` Roy Kollen Svendsen
2024-09-11 14:05 ` Roy Kollen Svendsen
2024-09-11 14:02 ` [Buildroot] [PATCH v2] " Christian Hitz via buildroot
2024-09-11 21:07 ` [Buildroot] [PATCH] " Roy Kollen Svendsen
2 siblings, 1 reply; 10+ messages in thread
From: Roy Kollen Svendsen @ 2024-09-11 13:48 UTC (permalink / raw)
To: Christian Hitz
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin, Thomas Petazzoni,
buildroot
ons. 11. sep. 2024 kl. 15:15 skrev Christian Hitz <christian@klarinett.li>:
>
> From: Christian Hitz <christian.hitz@bbv.ch>
>
> Cross-compiling requires the host variant of the same package.
>
> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> ---
> package/qt6/Config.in | 1 +
> package/qt6/qt6scxml/Config.in | 11 ++++++++
> package/qt6/qt6scxml/qt6scxml.hash | 11 ++++++++
> package/qt6/qt6scxml/qt6scxml.mk | 40 ++++++++++++++++++++++++++++++
> 4 files changed, 63 insertions(+)
> create mode 100644 package/qt6/qt6scxml/Config.in
> create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
> create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
>
> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> index 29c1c25c7f..4cbb60322c 100644
> --- a/package/qt6/Config.in
> +++ b/package/qt6/Config.in
> @@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
> source "package/qt6/qt6languageserver/Config.in"
> source "package/qt6/qt6mqtt/Config.in"
> source "package/qt6/qt6opcua/Config.in"
> +source "package/qt6/qt6scxml/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/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in
> new file mode 100644
> index 0000000000..23561f61bc
> --- /dev/null
> +++ b/package/qt6/qt6scxml/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_QT6SCXML
> + bool "qt6scxml"
> + select BR2_PACKAGE_QT6DECLARATIVE
According to dependencies.yaml qtdeclarative is optional:
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
> +
> + The Qt SCXML module provides functionality to create state
> + machines from SCXML files.
> +
> + https://doc.qt.io/qt-6/qtscxml-index.html
> diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
> new file mode 100644
> index 0000000000..6c39be214a
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.hash
> @@ -0,0 +1,11 @@
> +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
> +sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f qtscxml-everywhere-src-6.7.2.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
> +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt
> +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
> +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt
> +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
> +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk
> new file mode 100644
> index 0000000000..a455b01257
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.mk
> @@ -0,0 +1,40 @@
> +################################################################################
> +#
> +# qt6scxml
> +#
> +################################################################################
> +
> +QT6SCXML_VERSION = $(QT6_VERSION)
> +QT6SCXML_SITE = $(QT6_SITE)
> +QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CONNECTIVITY_VERSION).tar.xz
> +QT6SCXML_INSTALL_STAGING = YES
> +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
> +
> +QT6SCXML_CMAKE_BACKEND = ninja
> +
> +QT6SCXML_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0 with exception(tools), \
> + GFDL-1.3 (docs)
> +
> +QT6SCXML_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
> +
> +QT6SCXML_CONF_OPTS = \
> + -DQT_HOST_PATH=$(HOST_DIR) \
> + -DBUILD_WITH_PCH=OFF \
> + -DQT_BUILD_EXAMPLES=OFF \
> + -DQT_BUILD_TESTS=OFF
> +
> +QT6SCXML_DEPENDENCIES = \
> + host-qt6scxml \
> + qt6base
> +
> +HOST_QT6SCXML_DEPENDENCIES = \
> + host-qt6base
> +
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
> --
> 2.46.0
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2] package/qt6/qt6scxml: new package
2024-09-11 13:15 [Buildroot] [PATCH] package/qt6/qt6scxml: new package Christian Hitz via buildroot
2024-09-11 13:48 ` Roy Kollen Svendsen
@ 2024-09-11 14:02 ` Christian Hitz via buildroot
2024-09-12 9:02 ` [Buildroot] [PATCH v3] " Christian Hitz via buildroot
2024-09-11 21:07 ` [Buildroot] [PATCH] " Roy Kollen Svendsen
2 siblings, 1 reply; 10+ messages in thread
From: Christian Hitz via buildroot @ 2024-09-11 14:02 UTC (permalink / raw)
To: buildroot
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
From: Christian Hitz <christian.hitz@bbv.ch>
Cross-compiling requires the host variant of the same package.
Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
---
Changes v1 -> v2:
- make dependency on qt6declarative optional
---
package/qt6/Config.in | 1 +
package/qt6/qt6scxml/Config.in | 10 +++++++
package/qt6/qt6scxml/qt6scxml.hash | 11 ++++++++
package/qt6/qt6scxml/qt6scxml.mk | 44 ++++++++++++++++++++++++++++++
4 files changed, 66 insertions(+)
create mode 100644 package/qt6/qt6scxml/Config.in
create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 29c1c25c7f..4cbb60322c 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6opcua/Config.in"
+source "package/qt6/qt6scxml/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/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in
new file mode 100644
index 0000000000..253b1e25ec
--- /dev/null
+++ b/package/qt6/qt6scxml/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6SCXML
+ bool "qt6scxml"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt SCXML module provides functionality to create state
+ machines from SCXML files.
+
+ https://doc.qt.io/qt-6/qtscxml-index.html
diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
new file mode 100644
index 0000000000..6c39be214a
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
+sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f qtscxml-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk
new file mode 100644
index 0000000000..92ce1c15ba
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# qt6scxml
+#
+################################################################################
+
+QT6SCXML_VERSION = $(QT6_VERSION)
+QT6SCXML_SITE = $(QT6_SITE)
+QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CONNECTIVITY_VERSION).tar.xz
+QT6SCXML_INSTALL_STAGING = YES
+QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SCXML_CMAKE_BACKEND = ninja
+
+QT6SCXML_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0 with exception(tools), \
+ GFDL-1.3 (docs)
+
+QT6SCXML_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
+
+QT6SCXML_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SCXML_DEPENDENCIES = \
+ host-qt6scxml \
+ qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6SCXML_DEPENDENCIES += qt6declarative
+endif
+
+HOST_QT6SCXML_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.46.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH] package/qt6/qt6scxml: new package
2024-09-11 13:48 ` Roy Kollen Svendsen
@ 2024-09-11 14:05 ` Roy Kollen Svendsen
0 siblings, 0 replies; 10+ messages in thread
From: Roy Kollen Svendsen @ 2024-09-11 14:05 UTC (permalink / raw)
To: Christian Hitz
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin, Thomas Petazzoni,
buildroot
Hi Christian,
Unfortunately i hit Ctrl+Enter immediately after starting a review. So
my previous response was a bit sparse.
Your changes are relevant for what I'm working on, so I'll do some
tests and try to send you some constructive comments when I get the
chance.
Regards,
Roy
ons. 11. sep. 2024 kl. 15:48 skrev Roy Kollen Svendsen
<roykollensvendsen@gmail.com>:
>
> ons. 11. sep. 2024 kl. 15:15 skrev Christian Hitz <christian@klarinett.li>:
> >
> > From: Christian Hitz <christian.hitz@bbv.ch>
> >
> > Cross-compiling requires the host variant of the same package.
> >
> > Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> > ---
> > package/qt6/Config.in | 1 +
> > package/qt6/qt6scxml/Config.in | 11 ++++++++
> > package/qt6/qt6scxml/qt6scxml.hash | 11 ++++++++
> > package/qt6/qt6scxml/qt6scxml.mk | 40 ++++++++++++++++++++++++++++++
> > 4 files changed, 63 insertions(+)
> > create mode 100644 package/qt6/qt6scxml/Config.in
> > create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
> > create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
> >
> > diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> > index 29c1c25c7f..4cbb60322c 100644
> > --- a/package/qt6/Config.in
> > +++ b/package/qt6/Config.in
> > @@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
> > source "package/qt6/qt6languageserver/Config.in"
> > source "package/qt6/qt6mqtt/Config.in"
> > source "package/qt6/qt6opcua/Config.in"
> > +source "package/qt6/qt6scxml/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/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in
> > new file mode 100644
> > index 0000000000..23561f61bc
> > --- /dev/null
> > +++ b/package/qt6/qt6scxml/Config.in
> > @@ -0,0 +1,11 @@
> > +config BR2_PACKAGE_QT6SCXML
> > + bool "qt6scxml"
> > + select BR2_PACKAGE_QT6DECLARATIVE
>
> According to dependencies.yaml qtdeclarative is optional:
>
>
> > + help
> > + Qt is a cross-platform application and UI framework for
> > + developers using C++.
> > +
> > + The Qt SCXML module provides functionality to create state
> > + machines from SCXML files.
> > +
> > + https://doc.qt.io/qt-6/qtscxml-index.html
> > diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
> > new file mode 100644
> > index 0000000000..6c39be214a
> > --- /dev/null
> > +++ b/package/qt6/qt6scxml/qt6scxml.hash
> > @@ -0,0 +1,11 @@
> > +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
> > +sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f qtscxml-everywhere-src-6.7.2.tar.xz
> > +
> > +# Hashes for license files:
> > +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
> > +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
> > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt
> > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
> > +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt
> > +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
> > +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
> > diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk
> > new file mode 100644
> > index 0000000000..a455b01257
> > --- /dev/null
> > +++ b/package/qt6/qt6scxml/qt6scxml.mk
> > @@ -0,0 +1,40 @@
> > +################################################################################
> > +#
> > +# qt6scxml
> > +#
> > +################################################################################
> > +
> > +QT6SCXML_VERSION = $(QT6_VERSION)
> > +QT6SCXML_SITE = $(QT6_SITE)
> > +QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CONNECTIVITY_VERSION).tar.xz
> > +QT6SCXML_INSTALL_STAGING = YES
> > +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
> > +
> > +QT6SCXML_CMAKE_BACKEND = ninja
> > +
> > +QT6SCXML_LICENSE = \
> > + GPL-2.0+ or LGPL-3.0, \
> > + GPL-3.0 with exception(tools), \
> > + GFDL-1.3 (docs)
> > +
> > +QT6SCXML_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
> > +
> > +QT6SCXML_CONF_OPTS = \
> > + -DQT_HOST_PATH=$(HOST_DIR) \
> > + -DBUILD_WITH_PCH=OFF \
> > + -DQT_BUILD_EXAMPLES=OFF \
> > + -DQT_BUILD_TESTS=OFF
> > +
> > +QT6SCXML_DEPENDENCIES = \
> > + host-qt6scxml \
> > + qt6base
> > +
> > +HOST_QT6SCXML_DEPENDENCIES = \
> > + host-qt6base
> > +
> > +$(eval $(cmake-package))
> > +$(eval $(host-cmake-package))
> > --
> > 2.46.0
> >
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH] package/qt6/qt6scxml: new package
2024-09-11 13:15 [Buildroot] [PATCH] package/qt6/qt6scxml: new package Christian Hitz via buildroot
2024-09-11 13:48 ` Roy Kollen Svendsen
2024-09-11 14:02 ` [Buildroot] [PATCH v2] " Christian Hitz via buildroot
@ 2024-09-11 21:07 ` Roy Kollen Svendsen
2 siblings, 0 replies; 10+ messages in thread
From: Roy Kollen Svendsen @ 2024-09-11 21:07 UTC (permalink / raw)
To: Christian Hitz
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin, Thomas Petazzoni,
buildroot
[-- Attachment #1.1: Type: text/plain, Size: 8250 bytes --]
Hi Christian and Thomas,
Good to see you are working on this, Christian!
Thomas, please verify the sanity if my comments.
ons. 11. sep. 2024 kl. 15:15 skrev Christian Hitz <christian@klarinett.li>:
>
> From: Christian Hitz <christian.hitz@bbv.ch>
>
> Cross-compiling requires the host variant of the same package.
>
> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> ---
> package/qt6/Config.in | 1 +
> package/qt6/qt6scxml/Config.in | 11 ++++++++
> package/qt6/qt6scxml/qt6scxml.hash | 11 ++++++++
> package/qt6/qt6scxml/qt6scxml.mk | 40 ++++++++++++++++++++++++++++++
> 4 files changed, 63 insertions(+)
> create mode 100644 package/qt6/qt6scxml/Config.in
> create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
> create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
>
> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> index 29c1c25c7f..4cbb60322c 100644
> --- a/package/qt6/Config.in
> +++ b/package/qt6/Config.in
> @@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
> source "package/qt6/qt6languageserver/Config.in"
> source "package/qt6/qt6mqtt/Config.in"
> source "package/qt6/qt6opcua/Config.in"
> +source "package/qt6/qt6scxml/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/qt6scxml/Config.in
b/package/qt6/qt6scxml/Config.in
> new file mode 100644
> index 0000000000..23561f61bc
> --- /dev/null
> +++ b/package/qt6/qt6scxml/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_QT6SCXML
> + bool "qt6scxml"
> + select BR2_PACKAGE_QT6DECLARATIVE
This is optional for both target and host.
> + help
> + Qt is a cross-platform application and UI framework for
> + developers using C++.
You follow the samme pattern as many of the other Qt6 packages her.
But I don't think is it usefull to repeat this text in every qt6 package.
It should be enough to say it once. We should fix this for the other
packages as well.
> +
> + The Qt SCXML module provides functionality to create state
When I grep for modules in the qtscxml repo I find the following:
$ grep -ir "qt_internal_add_.*module"
src/scxmlqml/CMakeLists.txt:qt_internal_add_qml_module(ScxmlQml
src/scxml/CMakeLists.txt:qt_internal_add_module(Scxml
src/statemachineqml/CMakeLists.txt:qt_internal_add_qml_module(StateMachineQml
src/statemachine/CMakeLists.txt:qt_internal_add_module(StateMachine
And I find the following non-test related tools:
$ grep -B 1 -ir "qt_internal_add_tool"
...
--
tools/qscxmlc/CMakeLists.txt-qt_get_tool_target_name(target_name qscxmlc)
tools/qscxmlc/CMakeLists.txt:qt_internal_add_tool(${target_name}
So rather than just saying something about one of the specific modules in
the repo I think
it is better to say something general about the qtscxml repo... and then
list or say something
more specific about the modules and tools etc.
There seems to be a confusion about qt repos vs qt modules, which I've
probably contributed to.
We should update the info for existing modules to follow the same patter.
> + machines from SCXML files.
> +
> + https://doc.qt.io/qt-6/qtscxml-index.html
> diff --git a/package/qt6/qt6scxml/qt6scxml.hash
b/package/qt6/qt6scxml/qt6scxml.hash
> new file mode 100644
> index 0000000000..6c39be214a
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.hash
> @@ -0,0 +1,11 @@
> +# Hash from:
https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
> +sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f
qtscxml-everywhere-src-6.7.2.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
LICENSES/BSD-3-Clause.txt
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
LICENSES/GFDL-1.3-no-invariants-only.txt
> +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643
LICENSES/GPL-2.0-only.txt
> +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903
LICENSES/GPL-3.0-only.txt
> +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768
LICENSES/LGPL-3.0-only.txt
> +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
LICENSES/LicenseRef-Qt-Commercial.txt
I think the file above is dropped in some of the existing packages. Can you
comment on this Thomas?
> +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/
qt6scxml.mk
> new file mode 100644
> index 0000000000..a455b01257
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.mk
> @@ -0,0 +1,40 @@
>
+################################################################################
> +#
> +# qt6scxml
> +#
>
+################################################################################
> +
> +QT6SCXML_VERSION = $(QT6_VERSION)
> +QT6SCXML_SITE = $(QT6_SITE)
> +QT6SCXML_SOURCE =
qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CONNECTIVITY_VERSION).tar.xz
> +QT6SCXML_INSTALL_STAGING = YES
> +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
> +
Maybe drop this new-line?
> +QT6SCXML_CMAKE_BACKEND = ninja
> +
> +QT6SCXML_LICENSE = \
> + GPL-2.0+ or LGPL-3.0, \
> + GPL-3.0 with exception(tools), \
Add a space after the license. Maybe we should be explicit about which
exception?
> + GFDL-1.3 (docs)
I also like to sort the licenses Alphabetically and write the licenenses as
in the SPDX-License-Identifier (with some exception to like 'with', 'or',
'and' with small letters).
I also think it is good to be more explicit about which parts of software
the licenses applies to:
QT6SCXML_LICENSE = \
BSD-3-Clause (buildsystem, examples, snippets), \
GFDL-1.3-no-invariants (docs), \
GPL-3.0 (tests), \
GPL-3.0 with Qt-GPL-exception-1.0 (tools, utils), \
LGPL-3.0 or GPL-2.0 or GPL-3.0 (modules, plugins)
By the way: In addition to grep-ing for spdx license identifiers there is
often some more interesting license information available in the
qt_attribution.json-files.
But in this case there were no such files.
> +
> +QT6SCXML_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
> +
You dropped LICENSES/BSD-3-Clause.txt, the commercial license file and the
exception.
This is not done consistently in the existing qt6 packages. Thomas should
comment on this.
Maybe order these alphabetically and only drop the commercial license file?:
QT6SCXML_LICENSE_FILES = \
LICENSES/BSD-3-Clause.txt \
LICENSES/GFDL-1.3-no-invariants-only.txt \
LICENSES/GPL-2.0-only.txt \
LICENSES/GPL-3.0-only.txt \
LICENSES/LGPL-3.0-only.txt \
LICENSES/Qt-GPL-exception-1.0.txt
I think it is safer to specify too much license information than too little.
> +QT6SCXML_CONF_OPTS = \
> + -DQT_HOST_PATH=$(HOST_DIR) \
> + -DBUILD_WITH_PCH=OFF \
> + -DQT_BUILD_EXAMPLES=OFF \
> + -DQT_BUILD_TESTS=OFF
> +
> +QT6SCXML_DEPENDENCIES = \
> + host-qt6scxml \
> + qt6base
> +
> +HOST_QT6SCXML_DEPENDENCIES = \
> + host-qt6base
Add optional dependency for both target and host on qt6declarative:
$ grep -r "find_package(Qt6 \${PROJECT_VERSION}"
CMakeLists.txt:find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED
COMPONENTS BuildInternals Core)
CMakeLists.txt:find_package(Qt6 ${PROJECT_VERSION} CONFIG
OPTIONAL_COMPONENTS Gui Qml Widgets OpenGL OpenGLWidgets Network QuickTest)
$ cat dependencies.yaml
dependencies:
../qtbase:
ref: b5fbe0923cfc566036b83c3d968f225b26117efc
required: true
../qtdeclarative:
ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc
required: false
also expressed here:
CMakeLists.txt:find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED
COMPONENTS BuildInternals Core)
CMakeLists.txt:find_package(Qt6 ${PROJECT_VERSION} CONFIG
OPTIONAL_COMPONENTS Gui *Qml* Widgets OpenGL OpenGLWidgets Network
*QuickTest*)
> +
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
> --
> 2.46.0
>
[-- Attachment #1.2: Type: text/html, Size: 10094 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] 10+ messages in thread
* [Buildroot] [PATCH v3] package/qt6/qt6scxml: new package
2024-09-11 14:02 ` [Buildroot] [PATCH v2] " Christian Hitz via buildroot
@ 2024-09-12 9:02 ` Christian Hitz via buildroot
2024-09-13 7:17 ` Roy Kollen Svendsen
2024-09-14 14:44 ` Thomas Petazzoni via buildroot
0 siblings, 2 replies; 10+ messages in thread
From: Christian Hitz via buildroot @ 2024-09-12 9:02 UTC (permalink / raw)
To: buildroot
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen, Thomas Petazzoni
From: Christian Hitz <christian.hitz@bbv.ch>
Cross-compiling requires the host variant of the same package.
Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
---
Changes v2 -> v3:
- mention StateMaching and Scxml modules in help text
- fix typo in QT6SCXML_SOURCE
- add host-qt6declarative dependency to host package
- add BSD-3-Clause for buildsystem, examples and QML files
Changes v1 -> v2:
- make dependency on qt6declarative optional
---
package/qt6/Config.in | 1 +
package/qt6/qt6scxml/Config.in | 14 +++++++++
package/qt6/qt6scxml/qt6scxml.hash | 11 +++++++
package/qt6/qt6scxml/qt6scxml.mk | 48 ++++++++++++++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 package/qt6/qt6scxml/Config.in
create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 29c1c25c7f..4cbb60322c 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6opcua/Config.in"
+source "package/qt6/qt6scxml/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/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in
new file mode 100644
index 0000000000..ff738bdc17
--- /dev/null
+++ b/package/qt6/qt6scxml/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_QT6SCXML
+ bool "qt6scxml"
+ help
+ This repository contains two relates state machine modules:
+
+ * Qt6::StateMachine: The State Machine framework provides
+ classes for creating and executing state graphs.
+
+ https://doc.qt.io/qt-6/qtstatemachine-index.html
+
+ * Qt6::Scxml: The Qt SCXML module provides functionality to
+ create state machines from SCXML files.
+
+ https://doc.qt.io/qt-6/qtscxml-index.html
diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash
new file mode 100644
index 0000000000..6c39be214a
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
+sha256 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f qtscxml-everywhere-src-6.7.2.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk
new file mode 100644
index 0000000000..85ff17e42f
--- /dev/null
+++ b/package/qt6/qt6scxml/qt6scxml.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# qt6scxml
+#
+################################################################################
+
+QT6SCXML_VERSION = $(QT6_VERSION)
+QT6SCXML_SITE = $(QT6_SITE)
+QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SCXML_VERSION).tar.xz
+QT6SCXML_INSTALL_STAGING = YES
+QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
+QT6SCXML_CMAKE_BACKEND = ninja
+
+QT6SCXML_LICENSE = \
+ BSD-3-Clause (buildsystem, examples, QML), \
+ GFDL-1.3-no-invariants (docs), \
+ GPL-2.0 or GPL-3.0 or LGPL-3.0, \
+ GPL-3.0 with exception (tools), \
+ GPL-3.0 (tests)
+
+QT6SCXML_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-2.0-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LGPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6SCXML_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SCXML_DEPENDENCIES = \
+ host-qt6scxml \
+ qt6base
+
+HOST_QT6SCXML_DEPENDENCIES = \
+ host-qt6base
+
+ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
+QT6SCXML_DEPENDENCIES += qt6declarative
+HOST_QT6SCXML_DEPENDENCIES += host-qt6declarative
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.46.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v3] package/qt6/qt6scxml: new package
2024-09-12 9:02 ` [Buildroot] [PATCH v3] " Christian Hitz via buildroot
@ 2024-09-13 7:17 ` Roy Kollen Svendsen
2024-09-13 7:41 ` Roy Kollen Svendsen
2024-09-14 15:14 ` Thomas Petazzoni via buildroot
2024-09-14 14:44 ` Thomas Petazzoni via buildroot
1 sibling, 2 replies; 10+ messages in thread
From: Roy Kollen Svendsen @ 2024-09-13 7:17 UTC (permalink / raw)
To: Christian Hitz
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin, Thomas Petazzoni,
buildroot
[-- Attachment #1.1: Type: text/plain, Size: 6932 bytes --]
tor. 12. sep. 2024 kl. 11:03 skrev Christian Hitz <christian@klarinett.li>:
> From: Christian Hitz <christian.hitz@bbv.ch>
>
> Cross-compiling requires the host variant of the same package.
>
> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> ---
> Changes v2 -> v3:
> - mention StateMaching and Scxml modules in help text
> - fix typo in QT6SCXML_SOURCE
> - add host-qt6declarative dependency to host package
> - add BSD-3-Clause for buildsystem, examples and QML files
> Changes v1 -> v2:
> - make dependency on qt6declarative optional
> ---
> package/qt6/Config.in | 1 +
> package/qt6/qt6scxml/Config.in | 14 +++++++++
> package/qt6/qt6scxml/qt6scxml.hash | 11 +++++++
> package/qt6/qt6scxml/qt6scxml.mk | 48 ++++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 package/qt6/qt6scxml/Config.in
> create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
> create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
>
> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
> index 29c1c25c7f..4cbb60322c 100644
> --- a/package/qt6/Config.in
> +++ b/package/qt6/Config.in
> @@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
> source "package/qt6/qt6languageserver/Config.in"
> source "package/qt6/qt6mqtt/Config.in"
> source "package/qt6/qt6opcua/Config.in"
> +source "package/qt6/qt6scxml/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/qt6scxml/Config.in
> b/package/qt6/qt6scxml/Config.in
> new file mode 100644
> index 0000000000..ff738bdc17
> --- /dev/null
> +++ b/package/qt6/qt6scxml/Config.in
> @@ -0,0 +1,14 @@
> +config BR2_PACKAGE_QT6SCXML
> + bool "qt6scxml"
> + help
> + This repository contains two relates state machine modules:
>
I think this is more correct:
This package contains the following Qt modules:
> +
> + * Qt6::StateMachine: The State Machine framework provides
>
Maybe indent with two spaces the bullet points and associated text. I've
seen this in other packages.
Example from bind:
help
BIND (Berkeley Internet Name Domain) is an
implementation of the Domain Name System (DNS) protocols
and provides an openly redistributable reference
implementation of the major components of the Domain
Name System, including:
* a Domain Name System server (named)
* a Domain Name System resolver library
* tools for verifying the proper operation of the DNS
server
Maybe drop the '::' so the name correspond to what is found in the
documentation:
* Qt StateMachine: The State Machine framework provides
> + classes for creating and executing state graphs.
> +
> + https://doc.qt.io/qt-6/qtstatemachine-index.html
>
+
> + * Qt6::Scxml: The Qt SCXML module provides functionality to
>
Maybe drop the '::' and use uppercase letters for SCXML so the name
correspond to what is found in the documentation. And also use this instead
of repeating the name of the module in the info text:
* Qt SCXML: This module provides functionality to
+ create state machines from SCXML files.
> +
> + https://doc.qt.io/qt-6/qtscxml-index.html
Maybe we should also say something about the statemachine compiler tool?
>
> diff --git a/package/qt6/qt6scxml/qt6scxml.hash
> b/package/qt6/qt6scxml/qt6scxml.hash
> new file mode 100644
> index 0000000000..6c39be214a
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.hash
> @@ -0,0 +1,11 @@
> +# Hash from:
> https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
> +sha256
> <https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256+sha256>
> 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f
> qtscxml-everywhere-src-6.7.2.tar.xz
> +
> +# Hashes for license files:
> +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
> LICENSES/BSD-3-Clause.txt
> +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
> LICENSES/GFDL-1.3-no-invariants-only.txt
> +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643
> LICENSES/GPL-2.0-only.txt
> +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903
> LICENSES/GPL-3.0-only.txt
> +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768
> LICENSES/LGPL-3.0-only.txt
> +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
> LICENSES/LicenseRef-Qt-Commercial.txt
> +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
> LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/
> qt6scxml.mk
> new file mode 100644
> index 0000000000..85ff17e42f
> --- /dev/null
> +++ b/package/qt6/qt6scxml/qt6scxml.mk
> @@ -0,0 +1,48 @@
>
> +################################################################################
> +#
> +# qt6scxml
> +#
>
> +################################################################################
> +
> +QT6SCXML_VERSION = $(QT6_VERSION)
> +QT6SCXML_SITE = $(QT6_SITE)
> +QT6SCXML_SOURCE =
> qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SCXML_VERSION).tar.xz
> +QT6SCXML_INSTALL_STAGING = YES
> +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
> +QT6SCXML_CMAKE_BACKEND = ninja
> +
> +QT6SCXML_LICENSE = \
> + BSD-3-Clause (buildsystem, examples, QML), \
>
Some test qml files are under GPL-3.0-only. So I think it would be best to
summarize as (buildsystem, examples, snippets)
These are also the categories used in licenseRule.json:
...
"(.*)(examples/|snippets/)" : {
"comment" : "Default",
"file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}
...
+ GFDL-1.3-no-invariants (docs), \
> + GPL-2.0 or GPL-3.0 or LGPL-3.0, \
> + GPL-3.0 with exception (tools), \
> + GPL-3.0 (tests)
> +
> +QT6SCXML_LICENSE_FILES = \
> + LICENSES/BSD-3-Clause.txt \
> + LICENSES/GFDL-1.3-no-invariants-only.txt \
> + LICENSES/GPL-2.0-only.txt \
> + LICENSES/GPL-3.0-only.txt \
> + LICENSES/LGPL-3.0-only.txt \
> + LICENSES/Qt-GPL-exception-1.0.txt
> +
> +QT6SCXML_CONF_OPTS = \
> + -DQT_HOST_PATH=$(HOST_DIR) \
> + -DBUILD_WITH_PCH=OFF \
> + -DQT_BUILD_EXAMPLES=OFF \
> + -DQT_BUILD_TESTS=OFF
> +
> +QT6SCXML_DEPENDENCIES = \
> + host-qt6scxml \
> + qt6base
> +
> +HOST_QT6SCXML_DEPENDENCIES = \
> + host-qt6base
> +
> +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
> +QT6SCXML_DEPENDENCIES += qt6declarative
> +HOST_QT6SCXML_DEPENDENCIES += host-qt6declarative
>
What if we only build host-qt6scxml?
> +endif
> +
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
> --
> 2.46.0
>
>
[-- Attachment #1.2: Type: text/html, Size: 10237 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] 10+ messages in thread
* Re: [Buildroot] [PATCH v3] package/qt6/qt6scxml: new package
2024-09-13 7:17 ` Roy Kollen Svendsen
@ 2024-09-13 7:41 ` Roy Kollen Svendsen
2024-09-14 15:14 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 10+ messages in thread
From: Roy Kollen Svendsen @ 2024-09-13 7:41 UTC (permalink / raw)
To: Christian Hitz
Cc: Christian Hitz, Jesse Van Gavere, Samuel Martin, Thomas Petazzoni,
buildroot
[-- Attachment #1.1: Type: text/plain, Size: 7406 bytes --]
fre. 13. sep. 2024 kl. 09:17 skrev Roy Kollen Svendsen <
roykollensvendsen@gmail.com>:
>
>
> tor. 12. sep. 2024 kl. 11:03 skrev Christian Hitz <christian@klarinett.li
> >:
>
>> From: Christian Hitz <christian.hitz@bbv.ch>
>>
>> Cross-compiling requires the host variant of the same package.
>>
>> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
>> ---
>> Changes v2 -> v3:
>> - mention StateMaching and Scxml modules in help text
>> - fix typo in QT6SCXML_SOURCE
>> - add host-qt6declarative dependency to host package
>> - add BSD-3-Clause for buildsystem, examples and QML files
>> Changes v1 -> v2:
>> - make dependency on qt6declarative optional
>> ---
>> package/qt6/Config.in | 1 +
>> package/qt6/qt6scxml/Config.in | 14 +++++++++
>> package/qt6/qt6scxml/qt6scxml.hash | 11 +++++++
>> package/qt6/qt6scxml/qt6scxml.mk | 48 ++++++++++++++++++++++++++++++
>> 4 files changed, 74 insertions(+)
>> create mode 100644 package/qt6/qt6scxml/Config.in
>> create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
>> create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
>>
>> diff --git a/package/qt6/Config.in b/package/qt6/Config.in
>> index 29c1c25c7f..4cbb60322c 100644
>> --- a/package/qt6/Config.in
>> +++ b/package/qt6/Config.in
>> @@ -49,6 +49,7 @@ source "package/qt6/qt6declarative/Config.in"
>> source "package/qt6/qt6languageserver/Config.in"
>> source "package/qt6/qt6mqtt/Config.in"
>> source "package/qt6/qt6opcua/Config.in"
>> +source "package/qt6/qt6scxml/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/qt6scxml/Config.in
>> b/package/qt6/qt6scxml/Config.in
>> new file mode 100644
>> index 0000000000..ff738bdc17
>> --- /dev/null
>> +++ b/package/qt6/qt6scxml/Config.in
>> @@ -0,0 +1,14 @@
>> +config BR2_PACKAGE_QT6SCXML
>> + bool "qt6scxml"
>> + help
>> + This repository contains two relates state machine modules:
>>
>
> I think this is more correct:
>
> This package contains the following Qt modules:
>
>
>> +
>> + * Qt6::StateMachine: The State Machine framework provides
>>
>
> Maybe indent with two spaces the bullet points and associated text. I've
> seen this in other packages.
>
>
I've checked and there is no common pattern here regards to indentation or
symbol for bullet points (*/-)
> Example from bind:
>
> help
> BIND (Berkeley Internet Name Domain) is an
> implementation of the Domain Name System (DNS) protocols
> and provides an openly redistributable reference
> implementation of the major components of the Domain
> Name System, including:
>
> * a Domain Name System server (named)
> * a Domain Name System resolver library
> * tools for verifying the proper operation of the DNS
> server
>
> Maybe drop the '::' so the name correspond to what is found in the
> documentation:
>
> * Qt StateMachine: The State Machine framework provides
>
>
>> + classes for creating and executing state graphs.
>> +
>> + https://doc.qt.io/qt-6/qtstatemachine-index.html
>>
>
>
> +
>> + * Qt6::Scxml: The Qt SCXML module provides functionality to
>>
>
> Maybe drop the '::' and use uppercase letters for SCXML so the name
> correspond to what is found in the documentation. And also use this instead
> of repeating the name of the module in the info text:
>
> * Qt SCXML: This module provides functionality to
>
>
> + create state machines from SCXML files.
>> +
>> + https://doc.qt.io/qt-6/qtscxml-index.html
>
>
> Maybe we should also say something about the statemachine compiler tool?
>
>>
>> diff --git a/package/qt6/qt6scxml/qt6scxml.hash
>> b/package/qt6/qt6scxml/qt6scxml.hash
>> new file mode 100644
>> index 0000000000..6c39be214a
>> --- /dev/null
>> +++ b/package/qt6/qt6scxml/qt6scxml.hash
>> @@ -0,0 +1,11 @@
>> +# Hash from:
>> https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256
>> +sha256
>> <https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz.sha256+sha256>
>> 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f
>> qtscxml-everywhere-src-6.7.2.tar.xz
>> +
>> +# Hashes for license files:
>> +sha256
>> 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce
>> LICENSES/BSD-3-Clause.txt
>> +sha256
>> 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4
>> LICENSES/GFDL-1.3-no-invariants-only.txt
>> +sha256
>> 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643
>> LICENSES/GPL-2.0-only.txt
>> +sha256
>> 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903
>> LICENSES/GPL-3.0-only.txt
>> +sha256
>> da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768
>> LICENSES/LGPL-3.0-only.txt
>> +sha256
>> 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700
>> LICENSES/LicenseRef-Qt-Commercial.txt
>> +sha256
>> 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2
>> LICENSES/Qt-GPL-exception-1.0.txt
>> diff --git a/package/qt6/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/
>> qt6scxml.mk
>> new file mode 100644
>> index 0000000000..85ff17e42f
>> --- /dev/null
>> +++ b/package/qt6/qt6scxml/qt6scxml.mk
>> @@ -0,0 +1,48 @@
>>
>> +################################################################################
>> +#
>> +# qt6scxml
>> +#
>>
>> +################################################################################
>> +
>> +QT6SCXML_VERSION = $(QT6_VERSION)
>> +QT6SCXML_SITE = $(QT6_SITE)
>> +QT6SCXML_SOURCE =
>> qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SCXML_VERSION).tar.xz
>> +QT6SCXML_INSTALL_STAGING = YES
>> +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO
>> +QT6SCXML_CMAKE_BACKEND = ninja
>> +
>> +QT6SCXML_LICENSE = \
>> + BSD-3-Clause (buildsystem, examples, QML), \
>>
>
> Some test qml files are under GPL-3.0-only. So I think it would be best to
> summarize as (buildsystem, examples, snippets)
>
> These are also the categories used in licenseRule.json:
> ...
> "(.*)(examples/|snippets/)" : {
> "comment" : "Default",
> "file type" : "examples and snippets",
> "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
> }
> ...
>
> + GFDL-1.3-no-invariants (docs), \
>> + GPL-2.0 or GPL-3.0 or LGPL-3.0, \
>> + GPL-3.0 with exception (tools), \
>> + GPL-3.0 (tests)
>> +
>> +QT6SCXML_LICENSE_FILES = \
>> + LICENSES/BSD-3-Clause.txt \
>> + LICENSES/GFDL-1.3-no-invariants-only.txt \
>> + LICENSES/GPL-2.0-only.txt \
>> + LICENSES/GPL-3.0-only.txt \
>> + LICENSES/LGPL-3.0-only.txt \
>> + LICENSES/Qt-GPL-exception-1.0.txt
>> +
>> +QT6SCXML_CONF_OPTS = \
>> + -DQT_HOST_PATH=$(HOST_DIR) \
>> + -DBUILD_WITH_PCH=OFF \
>> + -DQT_BUILD_EXAMPLES=OFF \
>> + -DQT_BUILD_TESTS=OFF
>> +
>> +QT6SCXML_DEPENDENCIES = \
>> + host-qt6scxml \
>> + qt6base
>> +
>> +HOST_QT6SCXML_DEPENDENCIES = \
>> + host-qt6base
>> +
>> +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
>> +QT6SCXML_DEPENDENCIES += qt6declarative
>> +HOST_QT6SCXML_DEPENDENCIES += host-qt6declarative
>>
>
> What if we only build host-qt6scxml?
>
>
>> +endif
>> +
>> +$(eval $(cmake-package))
>> +$(eval $(host-cmake-package))
>> --
>> 2.46.0
>>
>>
[-- Attachment #1.2: Type: text/html, Size: 11003 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] 10+ messages in thread
* Re: [Buildroot] [PATCH v3] package/qt6/qt6scxml: new package
2024-09-12 9:02 ` [Buildroot] [PATCH v3] " Christian Hitz via buildroot
2024-09-13 7:17 ` Roy Kollen Svendsen
@ 2024-09-14 14:44 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-09-14 14:44 UTC (permalink / raw)
To: Christian Hitz via buildroot
Cc: Christian Hitz, Christian Hitz, Jesse Van Gavere, Samuel Martin,
Roy Kollen Svendsen
Hello Christian,
On Thu, 12 Sep 2024 11:02:46 +0200
Christian Hitz via buildroot <buildroot@buildroot.org> wrote:
> From: Christian Hitz <christian.hitz@bbv.ch>
>
> Cross-compiling requires the host variant of the same package.
>
> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> ---
> Changes v2 -> v3:
> - mention StateMaching and Scxml modules in help text
> - fix typo in QT6SCXML_SOURCE
> - add host-qt6declarative dependency to host package
> - add BSD-3-Clause for buildsystem, examples and QML files
> Changes v1 -> v2:
> - make dependency on qt6declarative optional
> ---
> package/qt6/Config.in | 1 +
> package/qt6/qt6scxml/Config.in | 14 +++++++++
> package/qt6/qt6scxml/qt6scxml.hash | 11 +++++++
> package/qt6/qt6scxml/qt6scxml.mk | 48 ++++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 package/qt6/qt6scxml/Config.in
> create mode 100644 package/qt6/qt6scxml/qt6scxml.hash
> create mode 100644 package/qt6/qt6scxml/qt6scxml.mk
I've applied, after:
- Adding an entry in the DEVELOPERS file
- Taking into account the comments from Roy
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v3] package/qt6/qt6scxml: new package
2024-09-13 7:17 ` Roy Kollen Svendsen
2024-09-13 7:41 ` Roy Kollen Svendsen
@ 2024-09-14 15:14 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-09-14 15:14 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Christian Hitz, Christian Hitz, Jesse Van Gavere, Samuel Martin,
buildroot
Hello Roy,
Thanks for the review! I've taken it into account when merging. See below.
On Fri, 13 Sep 2024 09:17:35 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> > diff --git a/package/qt6/qt6scxml/Config.in
> > b/package/qt6/qt6scxml/Config.in
> > new file mode 100644
> > index 0000000000..ff738bdc17
> > --- /dev/null
> > +++ b/package/qt6/qt6scxml/Config.in
> > @@ -0,0 +1,14 @@
> > +config BR2_PACKAGE_QT6SCXML
> > + bool "qt6scxml"
> > + help
> > + This repository contains two relates state machine modules:
> >
>
> I think this is more correct:
>
> This package contains the following Qt modules:
>
>
> > +
> > + * Qt6::StateMachine: The State Machine framework provides
> >
>
> Maybe indent with two spaces the bullet points and associated text. I've
> seen this in other packages.
>
> Example from bind:
>
> help
> BIND (Berkeley Internet Name Domain) is an
> implementation of the Domain Name System (DNS) protocols
> and provides an openly redistributable reference
> implementation of the major components of the Domain
> Name System, including:
>
> * a Domain Name System server (named)
> * a Domain Name System resolver library
> * tools for verifying the proper operation of the DNS
> server
>
> Maybe drop the '::' so the name correspond to what is found in the
> documentation:
>
> * Qt StateMachine: The State Machine framework provides
I indeed rephrased a bit the help text. Not exactly as you suggested,
because I also made it consistent with other Qt6 packages, but
definitely took into account your suggestions.
> + create state machines from SCXML files.
> > +
> > + https://doc.qt.io/qt-6/qtscxml-index.html
>
>
> Maybe we should also say something about the statemachine compiler tool?
I wasn't sure what to add, and it can be added as a follow-up patch if
needed.
> Some test qml files are under GPL-3.0-only. So I think it would be best to
> summarize as (buildsystem, examples, snippets)
ACK, taken into account.
> > +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
> > +QT6SCXML_DEPENDENCIES += qt6declarative
> > +HOST_QT6SCXML_DEPENDENCIES += host-qt6declarative
>
> What if we only build host-qt6scxml?
It is not possible to build just host-qt6scxml. For now, it's a
"hidden" host package, in the sense that it can only be built as a
dependency of target qt6scxml. So I think that solution was good
enough: when target qt6scxml is built with declarative support, it
needs host-qt6scxml to have been built with declarative support.
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] 10+ messages in thread
end of thread, other threads:[~2024-09-14 15:14 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-11 13:15 [Buildroot] [PATCH] package/qt6/qt6scxml: new package Christian Hitz via buildroot
2024-09-11 13:48 ` Roy Kollen Svendsen
2024-09-11 14:05 ` Roy Kollen Svendsen
2024-09-11 14:02 ` [Buildroot] [PATCH v2] " Christian Hitz via buildroot
2024-09-12 9:02 ` [Buildroot] [PATCH v3] " Christian Hitz via buildroot
2024-09-13 7:17 ` Roy Kollen Svendsen
2024-09-13 7:41 ` Roy Kollen Svendsen
2024-09-14 15:14 ` Thomas Petazzoni via buildroot
2024-09-14 14:44 ` Thomas Petazzoni via buildroot
2024-09-11 21:07 ` [Buildroot] [PATCH] " Roy Kollen Svendsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox