[arch-commits] Commit in qt5-quick3d/trunk (PKGBUILD qt5-quick3d-assimp-5.1.patch)

[Antonio Rojas]

    Date: Saturday, November 20, 2021 @ 18:45:25
  Author: arojas
Revision: 428698

Use system assimp again

Added:
  qt5-quick3d/trunk/qt5-quick3d-assimp-5.1.patch
Modified:
  qt5-quick3d/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   13 ++++++-------
 qt5-quick3d-assimp-5.1.patch |   15 +++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 18:38:21 UTC (rev 428697)
+++ PKGBUILD	2021-11-20 18:45:25 UTC (rev 428698)
@@ -4,7 +4,7 @@
 pkgname=qt5-quick3d
 _qtver=5.15.2
 pkgver=5.15.2+kde+r19
-pkgrel=2
+pkgrel=3
 _commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
 arch=('x86_64')
 url='https://www.qt.io'
@@ -11,13 +11,14 @@
 license=('GPL3')
 pkgdesc='Qt module and API for defining 3D content in Qt Quick'
 depends=('qt5-declarative')
-makedepends=('git')
+makedepends=('git' 'assimp')
+optdepends=('assimp: assimp import plugin')
 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)
+        qt5-quick3d-assimp-5.1.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            '57a3ac54c46f86d1f99ce20653bb34215cbd65fbd36f7ee802360336e88f268e')
 
 pkgver() {
   cd $_pkgfqn
@@ -30,9 +31,7 @@
   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
+  patch -p1 < ../qt5-quick3d-assimp-5.1.patch # Fix build with assimp 5.1
 }
 
 build() {

Added: qt5-quick3d-assimp-5.1.patch
===================================================================
--- qt5-quick3d-assimp-5.1.patch	                        (rev 0)
+++ qt5-quick3d-assimp-5.1.patch	2021-11-20 18:45:25 UTC (rev 428698)
@@ -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
+ //            {