[arch-commits] Commit in qt5-quick3d/repos (3 files)

[Antonio Rojas]

    Date: Thursday, November 19, 2020 @ 19:12:27
  Author: arojas
Revision: 401426

archrelease: copy trunk to staging-x86_64

Added:
  qt5-quick3d/repos/staging-x86_64/
  qt5-quick3d/repos/staging-x86_64/PKGBUILD
    (from rev 401425, qt5-quick3d/trunk/PKGBUILD)
  qt5-quick3d/repos/staging-x86_64/qtquick3d-assimp.patch
    (from rev 401425, qt5-quick3d/trunk/qtquick3d-assimp.patch)

------------------------+
 PKGBUILD               |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 qtquick3d-assimp.patch |   13 +++++++++++++
 2 files changed, 59 insertions(+)

Copied: qt5-quick3d/repos/staging-x86_64/PKGBUILD (from rev 401425, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-11-19 19:12:27 UTC (rev 401426)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quick3d
+_qtver=5.15.2
+pkgver=${_qtver/-/}
+pkgrel=1
+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')
+optdepends=('assimp: Import from assimp')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+         qtquick3d-assimp.patch)
+sha256sums=('5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb'
+            '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
+}
+
+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/staging-x86_64/qtquick3d-assimp.patch (from rev 401425, qt5-quick3d/trunk/qtquick3d-assimp.patch)
===================================================================
--- staging-x86_64/qtquick3d-assimp.patch	                        (rev 0)
+++ staging-x86_64/qtquick3d-assimp.patch	2020-11-19 19:12:27 UTC (rev 401426)
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/assetimporters/assimp/assimp.pro b/src/plugins/assetimporters/assimp/assimp.pro
+index ca5c499..174a075 100644
+--- a/src/plugins/assetimporters/assimp/assimp.pro
++++ b/src/plugins/assetimporters/assimp/assimp.pro
+@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
+ include($$OUT_PWD/../qtassetimporters-config.pri)
+ 
+ qtConfig(system-assimp):!if(cross_compile:host_build) {
+-    QMAKE_USE_PRIVATE += assimp
++    QMAKE_USE_PRIVATE += quick3d-assimp
+ } else {
+     include(../../../3rdparty/assimp/assimp.pri)
+ }