author | Antonio Rojas
<arojas@archlinux.org> 2021-11-20 18:45:25 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2021-11-20 18:45:25 UTC |
parent | b664cacbf034a97da8f81223772331b50e684941 |
PKGBUILD | +6 | -7 |
qt5-quick3d-assimp-5.1.patch | +15 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 4175216..ff1a78c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,20 +4,21 @@ 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' 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 @@ prepare() { 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() { diff --git a/qt5-quick3d-assimp-5.1.patch b/qt5-quick3d-assimp-5.1.patch new file mode 100644 index 0000000..3bbae9c --- /dev/null +++ b/qt5-quick3d-assimp-5.1.patch @@ -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 + // {