author | Antonio Rojas
<arojas@archlinux.org> 2020-05-26 08:39:20 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2020-05-26 08:39:20 UTC |
parent | 562b9e75714f710bb08dd5b7e11631e8e1f93a5b |
PKGBUILD | +8 | -3 |
qtquick3d-assimp.patch | +13 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index a4f7620..4664993 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=qt5-quick3d -_qtver=5.14.2 +_qtver=5.15.0 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,11 +14,16 @@ makedepends=('assimp') optdepends=('assimp: Import from assimp') groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + qtquick3d-assimp.patch) +sha256sums=('6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb' + '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef') prepare() { mkdir -p build + + cd $_pkgfqn + patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp } build() { diff --git a/qtquick3d-assimp.patch b/qtquick3d-assimp.patch new file mode 100644 index 0000000..d70f501 --- /dev/null +++ b/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) + }