[arch-commits] Commit in qt5-quick3d/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, November 20, 2021 @ 12:53:00
  Author: arojas
Revision: 428683

Switch to bundled assimp, not compatible with 5.1

Modified:
  qt5-quick3d/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 11:53:58 UTC (rev 428682)
+++ PKGBUILD	2021-11-20 12:53:00 UTC (rev 428683)
@@ -4,7 +4,7 @@
 pkgname=qt5-quick3d
 _qtver=5.15.2
 pkgver=5.15.2+kde+r19
-pkgrel=1
+pkgrel=2
 _commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
 arch=('x86_64')
 url='https://www.qt.io'
@@ -11,12 +11,13 @@
 license=('GPL3')
 pkgdesc='Qt module and API for defining 3D content in Qt Quick'
 depends=('qt5-declarative')
-makedepends=('assimp' 'git')
-optdepends=('assimp: Import from assimp')
+makedepends=('git')
 groups=('qt' 'qt5')
 _pkgfqn=qtquick3d
-source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('SKIP')
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        git+https://code.qt.io/qt/qtquick3d-assimp.git)
+sha256sums=('SKIP'
+            'SKIP')
 
 pkgver() {
   cd $_pkgfqn
@@ -28,6 +29,10 @@
 
   cd $_pkgfqn
   git revert -n 80196af36528e66826549a8b54d6cc5988db1622 # Revert version bump
+
+  git submodule init
+  git submodule set-url src/3rdparty/assimp/src "$srcdir"/qtquick3d-assimp
+  git submodule update
 }
 
 build() {