Skip to contentSkip to conversation

qt53d: enable assimpsceneparser plugin

PATCH Superseded Peter Seiderer 2 participants 3 messages Feb 21, 2016

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH v4 1/1 qt53d: enable assimpsceneparser plugin

- add hint to help text
- add assimp dependency

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

---
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  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
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 +2 -1
index 810242b..540df73 100644
@@ -7,7 +7,7 @@
 QT53D_VERSION = $(QT5_VERSION)
 QT53D_SITE = $(QT5_SITE)
 QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz
-QT53D_DEPENDENCIES = qt5base qt5declarative
+QT53D_DEPENDENCIES = $(if $(BR2_PACKAGE_ASSIMP),assimp) qt5base qt5declarative
 QT53D_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

@@ -34,6 +34,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 v4 1/1 qt53d: enable assimpsceneparser plugin

Quoted 38 lines · Peter Seiderer

- add hint to help text
- add assimp dependency

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

---
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  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
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 +0 -0
index 810242b..540df73 100644

package/qt5/qt53d/qt53d.mk line 10

Quoted 5 lines
package/qt5/qt53d/qt53d.mk +1 -1
@@ -7,7 +7,7 @@
 QT53D_VERSION = $(QT5_VERSION)
 QT53D_SITE = $(QT5_SITE)
 QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz
-QT53D_DEPENDENCIES = qt5base qt5declarative
+QT53D_DEPENDENCIES = $(if $(BR2_PACKAGE_ASSIMP),assimp) qt5base qt5declarative

This is becoming a bit long, and also we prefer to have the mandatory
dependencies first and the automatic dependencies after it. So you could either do:

QT53D_DEPENDENCIES = \
	qt5base \
	qt5declarative \
	$(if $(BR2_PACKAGE_ASSIMP),assimp)

or add the optional dependencies below...

package/qt5/qt53d/qt53d.mk line 12

Quoted 2 lines
package/qt5/qt53d/qt53d.mk +0 -0
 QT53D_INSTALL_STAGING = YES

... here, like this:

ifeq ($(BR2_PACKAGE_ASSIMP),y)
QT53D_DEPENDENCIES += assimp
endif

Regards,
Arnout

Quoted 10 lines
package/qt5/qt53d/qt53d.mk +1 -0
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

@@ -34,6 +34,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
author
#2 lore raw

PATCH v4 1/1 qt53d: enable assimpsceneparser plugin

Hello Arnout,

Quoted 55 lines · Arnout Vandecappelle
Quoted 38 lines · Peter Seiderer

- add hint to help text
- add assimp dependency

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

---
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  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
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 +0 -0
index 810242b..540df73 100644

package/qt5/qt53d/qt53d.mk line 10

Quoted 5 lines
package/qt5/qt53d/qt53d.mk +1 -1
@@ -7,7 +7,7 @@
 QT53D_VERSION = $(QT5_VERSION)
 QT53D_SITE = $(QT5_SITE)
 QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz
-QT53D_DEPENDENCIES = qt5base qt5declarative
+QT53D_DEPENDENCIES = $(if $(BR2_PACKAGE_ASSIMP),assimp) qt5base qt5declarative

This is becoming a bit long, and also we prefer to have the mandatory
dependencies first and the automatic dependencies after it. So you could either do:

QT53D_DEPENDENCIES = \
	qt5base \
	qt5declarative \
	$(if $(BR2_PACKAGE_ASSIMP),assimp)

or add the optional dependencies below...

Quoted 9 lines

package/qt5/qt53d/qt53d.mk line 12

Quoted 2 lines
package/qt5/qt53d/qt53d.mk +0 -0
 QT53D_INSTALL_STAGING = YES

... here, like this:

ifeq ($(BR2_PACKAGE_ASSIMP),y)
QT53D_DEPENDENCIES += assimp
endif

Will take this suggestion...thanks for review...

Regards,
Peter

Quoted 16 lines

Regards,
Arnout

Quoted 10 lines
package/qt5/qt53d/qt53d.mk +1 -0
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

@@ -34,6 +34,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