| Message ID | 1456088489-10062-1-git-send-email-ps.report@gmx.net |
|---|---|
| State | Accepted |
| Headers | show |
On 02/21/16 22:01, Peter Seiderer wrote: > - 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) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (Build-test, compared with/without assimp). Regards, Arnout > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > 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(+) > > 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..24c42e6 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -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 >
Dear Peter Seiderer, On Sun, 21 Feb 2016 22:01:28 +0100, Peter Seiderer wrote: > - add hint to help text > - add assimp dependency > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > 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
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..24c42e6 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -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
- add hint to help text - add assimp dependency Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- 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(+)