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

[Antonio Rojas]

    Date: Friday, March 4, 2022 @ 11:24:08
  Author: arojas
Revision: 438865

archrelease: copy trunk to staging-x86_64

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

------------------------------+
 PKGBUILD                     |   51 +++++++++++++++++++++++++++++++++++++++++
 qt5-quick3d-assimp-5.1.patch |   15 ++++++++++++
 2 files changed, 66 insertions(+)

Copied: qt5-quick3d/repos/staging-x86_64/PKGBUILD (from rev 438864, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2022-03-04 11:24:08 UTC (rev 438865)
@@ -0,0 +1,51 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quick3d
+_basever=5.15.3
+pkgver=5.15.3+kde+r2
+pkgrel=1
+_commit=1ede2ac20170357b3e8d7d9810e5474e08170827
+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' 'assimp')
+optdepends=('assimp: assimp import plugin')
+groups=('qt' 'qt5')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        qt5-quick3d-assimp-5.1.patch)
+sha256sums=('SKIP'
+            '57a3ac54c46f86d1f99ce20653bb34215cbd65fbd36f7ee802360336e88f268e')
+options=(debug)
+
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
+prepare() {
+  mkdir -p build
+  patch -d $_pkgfqn -p1 < qt5-quick3d-assimp-5.1.patch # Fix build with assimp 5.1
+}
+
+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/qt5-quick3d-assimp-5.1.patch (from rev 438864, qt5-quick3d/trunk/qt5-quick3d-assimp-5.1.patch)
===================================================================
--- staging-x86_64/qt5-quick3d-assimp-5.1.patch	                        (rev 0)
+++ staging-x86_64/qt5-quick3d-assimp-5.1.patch	2022-03-04 11:24:08 UTC (rev 438865)
@@ -0,0 +1,15 @@
+diff --git a/src/plugins/assetimporters/assimp/assimpimporter.cpp b/src/plugins/assetimporters/assimp/assimpimporter.cpp
+index f3660fdd..0f5fc901 100644
+--- a/src/plugins/assetimporters/assimp/assimpimporter.cpp
++++ b/src/plugins/assetimporters/assimp/assimpimporter.cpp
+@@ -1082,9 +1082,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
+         }
+ 
+         // SpecularGlossiness Properties
+-        bool hasSpecularGlossiness;
+-        result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS, hasSpecularGlossiness);
+-        if (result == aiReturn_SUCCESS && hasSpecularGlossiness) {
++        {
+ 
+             // diffuseFactor (color) // not used (yet), but ends up being diffuseColor
+ //            {