diff --git a/community/qt5-qtquick3d/APKBUILD b/community/qt5-qtquick3d/APKBUILD index 9a26515ba9f054076ac8229dc7d47f417009f319..a0be7b5906d5a1eeea283c1b3554589416b6bace 100644 --- a/community/qt5-qtquick3d/APKBUILD +++ b/community/qt5-qtquick3d/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt5-qtquick3d -pkgver=5.15.3_git20210104 +pkgver=5.15.4_git20220511 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 # s390x blocked by assimp 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=" assimp-dev qt5-qtbase-dev @@ -23,9 +23,7 @@ case $pkgver in *) _rel=official_releases;; esac -source="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$_commit/qtquick3d-$_commit.tar.gz - qtquick3d-assimp.patch - " +source="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$_commit/qtquick3d-$_commit.tar.gz" prepare() { default_prepare @@ -54,5 +52,6 @@ package() { install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="8d32ad53dfa2799326f41419185c61b06beeafaedbfce5550c06b0f9f70d727b6c39b4a3ed908cd7a32efc86c460990db726ecb995bf58138345c3da1728dedd qtquick3d-68b30bb23e34426e7d6a4c243a42ae57dfe45c6b.tar.gz -ef87c9f0e41930ac7a7c4b5c7c9543426e68831cfb835362a6a198e6ba8bed455d5cc0f7070cc706722801ab4da8e479938d62367d91b75ac502c3ef57553da6 qtquick3d-assimp.patch" +sha512sums=" +0972ebdefb208dba37577546fce5911648a2aa37d97d67e5d2a782a7fc37f8ccb975c72a4557bdb8c3167f05acd3e9b56ad518c069373bc7f32284e910f8dd8d qtquick3d-d52bfdf7d967419a61c2a4492163626096838a99.tar.gz +" diff --git a/community/qt5-qtquick3d/qtquick3d-assimp.patch b/community/qt5-qtquick3d/qtquick3d-assimp.patch deleted file mode 100644 index d70f5015c6f851f14697c74a0cbbb85459e04919..0000000000000000000000000000000000000000 --- a/community/qt5-qtquick3d/qtquick3d-assimp.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) - }