| Message ID | 20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/1] package/qt53d: bump to latest kde submodule version | expand |
On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://gitlab.com/buildroot.org/buildroot/-/blame/master/package/qt5/qt53d/qt53d.mk?ref_type=heads#L14 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com> > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES
Hi Peter, What do you recommand doing? These are the options avilable for assimp in qt53d: Qt3D options: -assimp .............. Select used assimp library [system/qt/no] ... Last time i tried 'system' and 'no' failed. If this is the case I should either make assimp configurable or hardcode it to qt. Regards, Roy
Hi, I will change the state of this patch to 'Not Applicable' since the version that was recently pushed to master builds successfully. This patch was actually meant as part of a bump to 5.15.12. Regards, Roy
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 0f63aab72a..81de91558e 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 4b748a4972..8fcfb72fec 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,9 +4,10 @@ # ################################################################################ -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 +QT53D_SITE = $(QT5_SITE)/qt3d +QT53D_SITE_METHOD = git +QT53D_GIT_SUBMODULES = YES QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES QT53D_SYNC_QT_HEADERS = YES
The build failed because assimp was missing. Use git instead of downloading the tar-ball so that we also fetch the associated assimp src submodule. Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com> --- package/qt5/qt53d/qt53d.hash | 2 +- package/qt5/qt53d/qt53d.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)