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

[Antonio Rojas]

    Date: Saturday, November 20, 2021 @ 18:45:37
  Author: arojas
Revision: 428699

archrelease: copy trunk to extra-x86_64

Added:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD
    (from rev 428698, qt5-quick3d/trunk/PKGBUILD)
  qt5-quick3d/repos/extra-x86_64/qt5-quick3d-assimp-5.1.patch
    (from rev 428698, qt5-quick3d/trunk/qt5-quick3d-assimp-5.1.patch)
Deleted:
  qt5-quick3d/repos/extra-x86_64/PKGBUILD

------------------------------+
 PKGBUILD                     |  109 ++++++++++++++++++++---------------------
 qt5-quick3d-assimp-5.1.patch |   15 +++++
 2 files changed, 69 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 18:45:25 UTC (rev 428698)
+++ PKGBUILD	2021-11-20 18:45:37 UTC (rev 428699)
@@ -1,55 +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=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}
-}

Copied: qt5-quick3d/repos/extra-x86_64/PKGBUILD (from rev 428698, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-20 18:45:37 UTC (rev 428699)
@@ -0,0 +1,54 @@
+# 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=3
+_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' 'assimp')
+optdepends=('assimp: assimp import plugin')
+groups=('qt' 'qt5')
+_pkgfqn=qtquick3d
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        qt5-quick3d-assimp-5.1.patch)
+sha256sums=('SKIP'
+            '57a3ac54c46f86d1f99ce20653bb34215cbd65fbd36f7ee802360336e88f268e')
+
+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
+
+  patch -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/extra-x86_64/qt5-quick3d-assimp-5.1.patch (from rev 428698, qt5-quick3d/trunk/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:37 UTC (rev 428699)
@@ -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
+ //            {