Skip to content
Snippets Groups Projects
Commit e099838d authored by Bart Ribbers's avatar Bart Ribbers
Browse files

community/qt5-qtquick3d: upgrade to 5.15.4_git20220511

parent 245eaf70
No related branches found
No related tags found
1 merge request!34462community/qt5: upgrade to latest KDE patches rebased on Qt 5.15.4
# Contributor: Bart Ribbers <bribbers@disroot.org> # Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qt5-qtquick3d pkgname=qt5-qtquick3d
pkgver=5.15.3_git20210104 pkgver=5.15.4_git20220511
pkgrel=0 pkgrel=0
_commit="68b30bb23e34426e7d6a4c243a42ae57dfe45c6b" _commit="d52bfdf7d967419a61c2a4492163626096838a99"
pkgdesc="Qt module and API for defining 3D content in Qt Quick"
url="https://www.qt.io/developers/"
license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
# armhf blocked by qt5-qtdeclarative # armhf blocked by qt5-qtdeclarative
# s390x blocked by assimp # s390x blocked by assimp
arch="all !armhf !s390x" arch="all !armhf !s390x"
url="https://www.qt.io/developers/"
license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
pkgdesc="Qt module and API for defining 3D content in Qt Quick"
makedepends=" makedepends="
assimp-dev assimp-dev
qt5-qtbase-dev qt5-qtbase-dev
...@@ -23,9 +23,7 @@ case $pkgver in ...@@ -23,9 +23,7 @@ case $pkgver in
*) _rel=official_releases;; *) _rel=official_releases;;
esac esac
source="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$_commit/qtquick3d-$_commit.tar.gz source="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$_commit/qtquick3d-$_commit.tar.gz"
qtquick3d-assimp.patch
"
prepare() { prepare() {
default_prepare default_prepare
...@@ -54,5 +52,6 @@ package() { ...@@ -54,5 +52,6 @@ package() {
install -d "$pkgdir"/usr/share/licenses install -d "$pkgdir"/usr/share/licenses
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
} }
sha512sums="8d32ad53dfa2799326f41419185c61b06beeafaedbfce5550c06b0f9f70d727b6c39b4a3ed908cd7a32efc86c460990db726ecb995bf58138345c3da1728dedd qtquick3d-68b30bb23e34426e7d6a4c243a42ae57dfe45c6b.tar.gz sha512sums="
ef87c9f0e41930ac7a7c4b5c7c9543426e68831cfb835362a6a198e6ba8bed455d5cc0f7070cc706722801ab4da8e479938d62367d91b75ac502c3ef57553da6 qtquick3d-assimp.patch" 0972ebdefb208dba37577546fce5911648a2aa37d97d67e5d2a782a7fc37f8ccb975c72a4557bdb8c3167f05acd3e9b56ad518c069373bc7f32284e910f8dd8d qtquick3d-d52bfdf7d967419a61c2a4492163626096838a99.tar.gz
"
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)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment