[arch-commits] Commit in qt5-quick3d/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Saturday, November 20, 2021 @ 12:53:09
  Author: arojas
Revision: 428684

archrelease: copy trunk to extra-x86_64

Added:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD
    (from rev 428683, qt5-quick3d/trunk/PKGBUILD)
Deleted:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  105 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 55 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 12:53:00 UTC (rev 428683)
+++ PKGBUILD	2021-11-20 12:53:09 UTC (rev 428684)
@@ -1,50 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-quick3d
-_qtver=5.15.2
-pkgver=5.15.2+kde+r19
-pkgrel=1
-_commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Qt module and API for defining 3D content in Qt Quick'
-depends=('qt5-declarative')
-makedepends=('assimp' 'git')
-optdepends=('assimp: Import from assimp')
-groups=('qt' 'qt5')
-_pkgfqn=qtquick3d
-source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $_pkgfqn
-  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
-}
-
-prepare() {
-  mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 80196af36528e66826549a8b54d6cc5988db1622 # Revert version bump
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-quick3d/repos/extra-x86_64/PKGBUILD (from rev 428683, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-20 12:53:09 UTC (rev 428684)
@@ -0,0 +1,55 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quick3d
+_qtver=5.15.2
+pkgver=5.15.2+kde+r19
+pkgrel=2
+_commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3')
+pkgdesc='Qt module and API for defining 3D content in Qt Quick'
+depends=('qt5-declarative')
+makedepends=('git')
+groups=('qt' 'qt5')
+_pkgfqn=qtquick3d
+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
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
+
+prepare() {
+  mkdir -p build
+
+  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() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}