qt5quickcontrols2: new package

PATCH New Peter Seiderer 4 participants 6 messages Apr 8, 2016 – Apr 18, 2016

lore

Share & tools

lore

Peter Seiderer

author

2016-04-08 21:33 UTC #0 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

Signed-off-by Peter Seiderer <[email protected]>

---
Changes v1 -> v2:
- move menu entry to 'technology preview' section
- add QT5_GL_AVAILABLE/QT5_JSCORE_AVAILABLE dependency comment
- install the right qt5quickcontrols2 files to target (all suggested by Julien Corjon)

---
 package/qt5/Config.in                              |  2 ++
 package/qt5/qt5quickcontrols2/Config.in            | 17 +++++++++
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 ++
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 40 ++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 package/qt5/qt5quickcontrols2/Config.in
 create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
 create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk

package/qt5/Config.in +2 -0

index f673daa..c011aa9 100644
@@ -47,6 +47,8 @@ source "package/qt5/qt5webchannel/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
+comment "technology preview"
+source "package/qt5/qt5quickcontrols2/Config.in"
 comment "legacy compatibility"
 source "package/qt5/qt5script/Config.in"
 endif

package/qt5/qt5quickcontrols2/Config.in new file +17 -0

new file mode 100644
index 0000000..1e57674
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_QT5QUICKCONTROLS2
+	bool "qt5quickcontrols2"
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5quickcontrols2 module.
+
+	  http://qt.io
+
+comment "qt5quickcontrols2 needs an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash new file +2 -0

new file mode 100644
index 0000000..aaf8fcf
@@ -0,0 +1,2 @@
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 qtquickcontrols2-opensource-src-5.6.0.tar.xz

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +40 -0

new file mode 100644
index 0000000..a5ad3f6
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5quickcontrols2
+#
+################################################################################
+
+QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION)
+QT5QUICKCONTROLS2_SITE = $(QT5_SITE)
+QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz
+QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
+QT5QUICKCONTROLS2_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+else
+QT5QUICKCONTROLS2_LICENSE = Commercial license
+QT5QUICKCONTROLS2_REDISTRIBUTE = NO
+endif
+
+define QT5QUICKCONTROLS2_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICKCONTROLS2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
+endef
+
+$(eval $(generic-package))

Signature · 1 line

2.1.4

Arnout Vandecappelle

2016-04-10 20:35 UTC #1 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

Quoted 1 line · Peter Seiderer

Signed-off-by Peter Seiderer <[email protected]>

Tested-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

However...

Quoted 70 lines

---
  package/qt5/Config.in                              |  2 ++
  package/qt5/qt5quickcontrols2/Config.in            | 17 +++++++++
  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 ++
  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 40 ++++++++++++++++++++++
  4 files changed, 61 insertions(+)

create mode 100644 package/qt5/qt5quickcontrols2/Config.in create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk

package/qt5/Config.in +2 -0

index f673daa..c011aa9 100644
@@ -47,6 +47,8 @@ source "package/qt5/qt5webchannel/Config.in"
  source "package/qt5/qt5websockets/Config.in"
  source "package/qt5/qt5x11extras/Config.in"
  source "package/qt5/qt5xmlpatterns/Config.in"
+comment "technology preview"
+source "package/qt5/qt5quickcontrols2/Config.in"
  comment "legacy compatibility"
  source "package/qt5/qt5script/Config.in"
  endif

package/qt5/qt5quickcontrols2/Config.in new file +17 -0

new file mode 100644
index 0000000..1e57674
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_QT5QUICKCONTROLS2
+	bool "qt5quickcontrols2"
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5quickcontrols2 module.
+
+	  http://qt.io
+
+comment "qt5quickcontrols2 needs an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash new file +2 -0

new file mode 100644
index 0000000..aaf8fcf
@@ -0,0 +1,2 @@
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 qtquickcontrols2-opensource-src-5.6.0.tar.xz

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +4 -0

new file mode 100644
index 0000000..a5ad3f6
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5quickcontrols2
+#

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk line 14

Quoted 10 lines

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +10 -0

+################################################################################
+
+QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION)
+QT5QUICKCONTROLS2_SITE = $(QT5_SITE)
+QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz
+QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
+QT5QUICKCONTROLS2_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)

The source files specify GPLv2+ or LGPLv3

Regards,
Arnout

Quoted 27 lines

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +26 -0

+QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+else
+QT5QUICKCONTROLS2_LICENSE = Commercial license
+QT5QUICKCONTROLS2_REDISTRIBUTE = NO
+endif
+
+define QT5QUICKCONTROLS2_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICKCONTROLS2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
+endef
+
+$(eval $(generic-package))

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Julien CORJON

2016-04-18 11:21 UTC #2 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

Arnout, all,

Le 10/04/2016 22:35, Arnout Vandecappelle a ?crit :

Quoted 13 lines · Peter Seiderer

Quoted 1 line
Signed-off-by Peter Seiderer <[email protected]>
Tested-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
However...
Quoted 6 lines
---
Changes v1 -> v2:
- move menu entry to 'technology preview' section
- add QT5_GL_AVAILABLE/QT5_JSCORE_AVAILABLE dependency comment
- install the right qt5quickcontrols2 files to target (all suggested by Julien Corjon)

... snip ...

Quoted 4 lines

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk line 14
Quoted 2 lines
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +2 -0
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
The source files specify GPLv2+ or LGPLv3

QtQuickControls2 is a tech-preview package and follow the upcoming Qt license convention[1]. That's why this module only have GPLv3 or LGPLv3 license possibility (but i did not go with fossology to check).

Regards,

Julien

[1] http://blog.qt.io/blog/2016/03/16/qt-5-6-released/

Quoted 40 lines

Regards,
Arnout
Quoted 32 lines
+QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +19 -0
+else
+QT5QUICKCONTROLS2_LICENSE = Commercial license
+QT5QUICKCONTROLS2_REDISTRIBUTE = NO
+endif
+
+define QT5QUICKCONTROLS2_CONFIGURE_CMDS
+    (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICKCONTROLS2_BUILD_CMDS
+    $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+    $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
+    cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.*
$(TARGET_DIR)/usr/lib
+ cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls
$(TARGET_DIR)/usr/qml/Qt/labs
+ cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar
$(TARGET_DIR)/usr/qml/Qt/labs
+ cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates
$(TARGET_DIR)/usr/qml/Qt/labs
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +3 -0
+endef
+
+$(eval $(generic-package))

Thomas Petazzoni

2016-04-18 20:34 UTC #3 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

In reply to Arnout Vandecappelle

Hello,

Quoted 4 lines · Arnout Vandecappelle

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk line 14
Quoted 2 lines
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +2 -0
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
The source files specify GPLv2+ or LGPLv3

Right, but as Julien said, the new modules are supposedly licensed under GPLv3 or LGPLv3, which is more or less confirmed by the presence of those two license files in the root directory of the source tree. Seems like the comment headers were not updated accordingly.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Julien CORJON

2016-04-18 12:03 UTC #4 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

In reply to Peter Seiderer

Le 08/04/2016 23:33, Peter Seiderer a ?crit :

Quoted 1 line

Signed-off-by Peter Seiderer <[email protected]>

Reviewed-by Julien Corjon <[email protected]>

Quoted 107 lines

---
  package/qt5/Config.in                              |  2 ++
  package/qt5/qt5quickcontrols2/Config.in            | 17 +++++++++
  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 ++
  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 40 ++++++++++++++++++++++
  4 files changed, 61 insertions(+)

package/qt5/Config.in +2 -0

index f673daa..c011aa9 100644
@@ -47,6 +47,8 @@ source "package/qt5/qt5webchannel/Config.in"
  source "package/qt5/qt5websockets/Config.in"
  source "package/qt5/qt5x11extras/Config.in"
  source "package/qt5/qt5xmlpatterns/Config.in"
+comment "technology preview"
+source "package/qt5/qt5quickcontrols2/Config.in"
  comment "legacy compatibility"
  source "package/qt5/qt5script/Config.in"
  endif

package/qt5/qt5quickcontrols2/Config.in new file +17 -0

new file mode 100644
index 0000000..1e57674
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_QT5QUICKCONTROLS2
+	bool "qt5quickcontrols2"
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5quickcontrols2 module.
+
+	  http://qt.io
+
+comment "qt5quickcontrols2 needs an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash new file +2 -0

new file mode 100644
index 0000000..aaf8fcf
@@ -0,0 +1,2 @@
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 qtquickcontrols2-opensource-src-5.6.0.tar.xz

package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk new file +40 -0

new file mode 100644
index 0000000..a5ad3f6
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5quickcontrols2
+#
+################################################################################
+
+QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION)
+QT5QUICKCONTROLS2_SITE = $(QT5_SITE)
+QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz
+QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
+QT5QUICKCONTROLS2_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+else
+QT5QUICKCONTROLS2_LICENSE = Commercial license
+QT5QUICKCONTROLS2_REDISTRIBUTE = NO
+endif
+
+define QT5QUICKCONTROLS2_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICKCONTROLS2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
+endef
+
+$(eval $(generic-package))

Thomas Petazzoni

Applied

2016-04-18 20:33 UTC #5 lore raw

PATCH v2 1/1 qt5quickcontrols2: new package

In reply to Peter Seiderer

Hello,

Quoted 7 lines · Peter Seiderer

Signed-off-by Peter Seiderer <[email protected]>
---
Changes v1 -> v2:
- move menu entry to 'technology preview' section
- add QT5_GL_AVAILABLE/QT5_JSCORE_AVAILABLE dependency comment
- install the right qt5quickcontrols2 files to target (all suggested by Julien Corjon)

Quoted 9 lines

---
 package/qt5/Config.in                              |  2 ++
 package/qt5/qt5quickcontrols2/Config.in            | 17 +++++++++
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 ++
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 40 ++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 package/qt5/qt5quickcontrols2/Config.in
 create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
 create mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com