Skip to contentSkip to conversation

qt53d: enable assimpsceneparser plugin

PATCH New Peter Seiderer 3 participants 3 messages Feb 21, 2016 – Feb 23, 2016

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH v5 1/1 qt53d: enable assimpsceneparser plugin

- add hint to help text
- add assimp dependency

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

---
Changes v4 -> v5:
- change assimp dependency declaration location (suggested by Arnout Vandecappelle)

Changes v3 -> v4:
- change to optional dependency on assimp (suggested by Thomas Petazzoni)
- always copy plugins/sceneparsers directory (because of new gltfsceneparser plugin)

Changes v2 -> v3:
- no changes

Changes v1 -> v2:
- no changes

---
 package/qt5/qt53d/Config.in | 2 ++
 package/qt5/qt53d/qt53d.mk  | 5 +++++
 2 files changed, 7 insertions(+)
package/qt5/qt53d/Config.in +2 -0
index b2d2912..ff50204 100644
@@ -12,6 +12,8 @@ config BR2_PACKAGE_QT53D
 
 	  This package corresponds to the qt53d module.
 
+	  Enable the assimp package to gain the assimp sceneparser plugin.
+
 	  http://doc.qt.io/qt-5/qt3d-index.html
 
 comment "qt53d module needs an OpenGL-capable backend"
package/qt5/qt53d/qt53d.mk +5 -0
index 810242b..24c42e6 100644
@@ -10,6 +10,10 @@ QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz
 QT53D_DEPENDENCIES = qt5base qt5declarative
 QT53D_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_ASSIMP),y)
+QT53D_DEPENDENCIES += assimp
+endif
+
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT53D_LICENSE = GPLv2+ or LGPLv3
 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3

@@ -34,6 +38,7 @@ endef
 ifeq ($(BR2_STATIC_LIBS),)
 define QT53D_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
 endef
 endif
Signature · 1 line
2.1.4
#1 lore raw

PATCH v5 1/1 qt53d: enable assimpsceneparser plugin

Quoted 2 lines · Peter Seiderer

- add hint to help text
- add assimp dependency

One thing more could have been noted in the commit message:

- always install the gltf (and any future) sceneparser to target.

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

(Build-test, compared with/without assimp).

Regards,
Arnout

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

---
Changes v4 -> v5:
- change assimp dependency declaration location (suggested by Arnout Vandecappelle)

Changes v3 -> v4:
- change to optional dependency on assimp (suggested by Thomas Petazzoni)
- always copy plugins/sceneparsers directory (because of new gltfsceneparser plugin)

Changes v2 -> v3:
- no changes

Changes v1 -> v2:
- no changes

---
 package/qt5/qt53d/Config.in | 2 ++
 package/qt5/qt53d/qt53d.mk  | 5 +++++
 2 files changed, 7 insertions(+)
package/qt5/qt53d/Config.in +2 -0
index b2d2912..ff50204 100644
@@ -12,6 +12,8 @@ config BR2_PACKAGE_QT53D
 
 	  This package corresponds to the qt53d module.
 
+	  Enable the assimp package to gain the assimp sceneparser plugin.
+
 	  http://doc.qt.io/qt-5/qt3d-index.html
 
 comment "qt53d module needs an OpenGL-capable backend"
package/qt5/qt53d/qt53d.mk +5 -0
index 810242b..24c42e6 100644
@@ -10,6 +10,10 @@ QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz
 QT53D_DEPENDENCIES = qt5base qt5declarative
 QT53D_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_ASSIMP),y)
+QT53D_DEPENDENCIES += assimp
+endif
+
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT53D_LICENSE = GPLv2+ or LGPLv3
 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3

@@ -34,6 +38,7 @@ endef
 ifeq ($(BR2_STATIC_LIBS),)
 define QT53D_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
 endef
 endif
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
Applied
#2 lore raw

PATCH v5 1/1 qt53d: enable assimpsceneparser plugin

In reply to Peter Seiderer

Dear Peter Seiderer,

Quoted 7 lines · Peter Seiderer

- add hint to help text
- add assimp dependency

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

---
Changes v4 -> v5:
- change assimp dependency declaration location (suggested by Arnout Vandecappelle)

Applied to next after updating the commit message as suggested by Arnout. Thanks!

Thomas

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