[arch-commits] Commit in qt5-quick3d/repos/extra-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Sat Jan 23 16:53:21 UTC 2021
Date: Saturday, January 23, 2021 @ 16:53:19
Author: arojas
Revision: 406650
archrelease: copy trunk to extra-x86_64
Added:
qt5-quick3d/repos/extra-x86_64/PKGBUILD
(from rev 406649, qt5-quick3d/trunk/PKGBUILD)
qt5-quick3d/repos/extra-x86_64/qtbug-90564.patch
(from rev 406649, qt5-quick3d/trunk/qtbug-90564.patch)
qt5-quick3d/repos/extra-x86_64/qtquick3d-assimp.patch
(from rev 406649, qt5-quick3d/trunk/qtquick3d-assimp.patch)
Deleted:
qt5-quick3d/repos/extra-x86_64/PKGBUILD
qt5-quick3d/repos/extra-x86_64/qtquick3d-assimp.patch
------------------------+
PKGBUILD | 95 ++++++++++++++++++++++++-----------------------
qtbug-90564.patch | 21 ++++++++++
qtquick3d-assimp.patch | 26 ++++++------
3 files changed, 83 insertions(+), 59 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-23 16:53:05 UTC (rev 406649)
+++ PKGBUILD 2021-01-23 16:53:19 UTC (rev 406650)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-quick3d
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Qt module and API for defining 3D content in Qt Quick'
-depends=('qt5-declarative')
-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"
- qtquick3d-assimp.patch)
-sha256sums=('5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb'
- '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef')
-
-prepare() {
- mkdir -p build
-
- cd $_pkgfqn
- patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
-}
-
-build() {
- cd build
-
- qmake ../${_pkgfqn}
- make
-}
-
-package() {
- cd build
- make INSTALL_ROOT="$pkgdir" install
-
- # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
- find "$pkgdir/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
- install -d "$pkgdir"/usr/share/licenses
- ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}
Copied: qt5-quick3d/repos/extra-x86_64/PKGBUILD (from rev 406649, qt5-quick3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-01-23 16:53:19 UTC (rev 406650)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quick3d
+_qtver=5.15.2
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Qt module and API for defining 3D content in Qt Quick'
+depends=('qt5-declarative')
+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"
+ qtquick3d-assimp.patch
+ qtbug-90564.patch)
+sha256sums=('5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb'
+ '531c479880b51a0e5247ccba1b5158b99d16d2a8d4d63b462572687bef1862ef'
+ '7301fbdd7d4d5fbcbb1f5e2567ae231d2fc1682a0f0620589930946c49535c10')
+
+prepare() {
+ mkdir -p build
+
+ cd $_pkgfqn
+ patch -p1 -i ../qtquick3d-assimp.patch # Fix build with system assimp
+ patch -p1 -i ../qtbug-90564.patch # Fix crash in QML designer if assimp is not installed
+}
+
+build() {
+ cd build
+
+ qmake ../${_pkgfqn}
+ make
+}
+
+package() {
+ cd build
+ make INSTALL_ROOT="$pkgdir" install
+
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+ find "$pkgdir/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}
Copied: qt5-quick3d/repos/extra-x86_64/qtbug-90564.patch (from rev 406649, qt5-quick3d/trunk/qtbug-90564.patch)
===================================================================
--- qtbug-90564.patch (rev 0)
+++ qtbug-90564.patch 2021-01-23 16:53:19 UTC (rev 406650)
@@ -0,0 +1,21 @@
+diff --git a/src/assetimport/qssgassetimportmanager.cpp b/src/assetimport/qssgassetimportmanager.cpp
+index aec55978..15529f28 100644
+--- a/src/assetimport/qssgassetimportmanager.cpp
++++ b/src/assetimport/qssgassetimportmanager.cpp
+@@ -43,10 +43,12 @@ QSSGAssetImportManager::QSSGAssetImportManager(QObject *parent) : QObject(parent
+ const QStringList keys = QSSGAssetImporterFactory::keys();
+ for (const auto &key : keys) {
+ auto importer = QSSGAssetImporterFactory::create(key, QStringList());
+- m_assetImporters.append(importer);
+- // Add to extension map
+- for (const auto &extension : importer->inputExtensions()) {
+- m_extensionsMap.insert(extension, importer);
++ if (importer) {
++ m_assetImporters.append(importer);
++ // Add to extension map
++ for (const auto &extension : importer->inputExtensions()) {
++ m_extensionsMap.insert(extension, importer);
++ }
+ }
+ }
+ }
Deleted: qtquick3d-assimp.patch
===================================================================
--- qtquick3d-assimp.patch 2021-01-23 16:53:05 UTC (rev 406649)
+++ qtquick3d-assimp.patch 2021-01-23 16:53:19 UTC (rev 406650)
@@ -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)
- }
Copied: qt5-quick3d/repos/extra-x86_64/qtquick3d-assimp.patch (from rev 406649, qt5-quick3d/trunk/qtquick3d-assimp.patch)
===================================================================
--- qtquick3d-assimp.patch (rev 0)
+++ qtquick3d-assimp.patch 2021-01-23 16:53:19 UTC (rev 406650)
@@ -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)
+ }
More information about the arch-commits
mailing list