aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-04-08 13:42:57 +0200
committerBart Ribbers <bribbers@disroot.org>2021-04-09 09:31:34 +0200
commit6a218ecb0f8a3ed013e6e0e8187ff94e82974ccb (patch)
tree85e9d98bada46ddf2ce14347e739d1946aa5fa5f
parent41a947b1b0d6a9452905b006997c59a8c435afc6 (diff)
downloadaports-6a218ecb0f8a3ed013e6e0e8187ff94e82974ccb.tar.gz
aports-6a218ecb0f8a3ed013e6e0e8187ff94e82974ccb.tar.bz2
aports-6a218ecb0f8a3ed013e6e0e8187ff94e82974ccb.tar.xz
community/qt5-qtquick3d: apply latest KDE patches
-rw-r--r--community/qt5-qtquick3d/APKBUILD32
-rw-r--r--community/qt5-qtquick3d/qtquick3d-assimp.patch13
2 files changed, 38 insertions, 7 deletions
diff --git a/community/qt5-qtquick3d/APKBUILD b/community/qt5-qtquick3d/APKBUILD
index 5a1aee18ab..9a26515ba9 100644
--- a/community/qt5-qtquick3d/APKBUILD
+++ b/community/qt5-qtquick3d/APKBUILD
@@ -1,22 +1,39 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qt5-qtquick3d
-pkgver=5.15.2
-pkgrel=1
-arch="all !armhf" # armhf blocked by qt5-qtdeclarative
+pkgver=5.15.3_git20210104
+pkgrel=0
+_commit="68b30bb23e34426e7d6a4c243a42ae57dfe45c6b"
+# 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="qt5-qtbase-dev qt5-qtdeclarative-dev"
+makedepends="
+ assimp-dev
+ qt5-qtbase-dev
+ qt5-qtdeclarative-dev
+ "
subpackages="$pkgname-dev $pkgname-doc"
-builddir="$srcdir/qtquick3d-everywhere-src-$pkgver"
+builddir="$srcdir/qtquick3d-$_commit"
case $pkgver in
*_beta*|*_rc*) _rel=development_releases;;
*) _rel=official_releases;;
esac
-source="http://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtquick3d-everywhere-src-$pkgver.tar.xz"
+source="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$_commit/qtquick3d-$_commit.tar.gz
+ qtquick3d-assimp.patch
+ "
+
+prepare() {
+ default_prepare
+
+ # We need to make the build system think we're running in a git repository
+ # so it correctly symlinks during the build
+ mkdir .git
+}
build() {
qmake-qt5
@@ -37,4 +54,5 @@ package() {
install -d "$pkgdir"/usr/share/licenses
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
}
-sha512sums="2a1f10430a3e4cd91270f79ab79e3bc6fee856659902f6489f5945a167201133a9a71dcc82c97aa699f97441b377c2981b4d1a65703e469936553f5265fe55ee qtquick3d-everywhere-src-5.15.2.tar.xz"
+sha512sums="8d32ad53dfa2799326f41419185c61b06beeafaedbfce5550c06b0f9f70d727b6c39b4a3ed908cd7a32efc86c460990db726ecb995bf58138345c3da1728dedd qtquick3d-68b30bb23e34426e7d6a4c243a42ae57dfe45c6b.tar.gz
+ef87c9f0e41930ac7a7c4b5c7c9543426e68831cfb835362a6a198e6ba8bed455d5cc0f7070cc706722801ab4da8e479938d62367d91b75ac502c3ef57553da6 qtquick3d-assimp.patch"
diff --git a/community/qt5-qtquick3d/qtquick3d-assimp.patch b/community/qt5-qtquick3d/qtquick3d-assimp.patch
new file mode 100644
index 0000000000..d70f5015c6
--- /dev/null
+++ b/community/qt5-qtquick3d/qtquick3d-assimp.patch
@@ -0,0 +1,13 @@
+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)
+ }