| Message ID | 1456013184-16932-1-git-send-email-ps.report@gmx.net |
|---|---|
| State | Superseded |
| Headers | show |
On 02/21/16 01:06, Peter Seiderer wrote: > - add hint to help text > - add assimp dependency > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > 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(-) > > diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in > index b2d2912..ff50204 100644 > --- a/package/qt5/qt53d/Config.in > +++ b/package/qt5/qt53d/Config.in > @@ -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" > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 810242b..540df73 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -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... > QT53D_INSTALL_STAGING = YES > ... here, like this: ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp endif Regards, Arnout > 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 >
Hello Arnout, On Sun, 21 Feb 2016 13:57:26 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > On 02/21/16 01:06, Peter Seiderer wrote: > > - add hint to help text > > - add assimp dependency > > > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > > --- > > 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(-) > > > > diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in > > index b2d2912..ff50204 100644 > > --- a/package/qt5/qt53d/Config.in > > +++ b/package/qt5/qt53d/Config.in > > @@ -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" > > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > > index 810242b..540df73 100644 > > --- a/package/qt5/qt53d/qt53d.mk > > +++ b/package/qt5/qt53d/qt53d.mk > > @@ -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... > > > 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 > > Regards, > Arnout > > > 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 > > > >
diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index b2d2912..ff50204 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -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" diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 810242b..540df73 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -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
- add hint to help text - add assimp dependency Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- 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(-)