summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-02-10 21:47:04 +0100
committerbartus2020-02-10 21:47:04 +0100
commit678a5c5f86a9729e2be4c2d2d0c85617f4d6041c (patch)
tree4ed6c99bb69d225d478dea7b426ad4e42a1d897e
parent39b730734ba457115c6bb2b80ccee97ddeb19ea2 (diff)
downloadaur-678a5c5f86a9729e2be4c2d2d0c85617f4d6041c.tar.gz
Override broken `pyside2` with the wheel version.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a1df26b2010..7346bac1bc54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = meshroom-git
pkgdesc = Meshroom is a free, open-source 3D Reconstruction Software based on the AliceVision framework.
- pkgver = 2019.1.0.r55.gcb7835e
+ pkgver = 2019.2.0.r199.g2e6990d
pkgrel = 1
url = http://alicevision.github.io/
arch = i686
arch = x86_64
license = MPL2
+ makedepends = python-pip
makedepends = git
makedepends = cmake
makedepends = python-setuptools
@@ -15,7 +16,6 @@ pkgbase = meshroom-git
depends = openimageio
depends = python
depends = python-psutil
- depends = python-pyside2
depends = qt5-quickcontrols
depends = qt5-quickcontrols2
depends = qt5-3d
diff --git a/PKGBUILD b/PKGBUILD
index d1ef102adbe9..10d9a37905af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,17 @@ name=meshroom
#fragment="#commit=9bd70ed8ace83c6dde174178e17c5147bb50248f"
fragment="#branch=develop"
pkgname=${name}-git
-pkgver=2019.1.0.r55.gcb7835e
+pkgver=2019.2.0.r199.g2e6990d
pkgrel=1
pkgdesc="Meshroom is a free, open-source 3D Reconstruction Software based on the AliceVision framework."
arch=('i686' 'x86_64')
url="http://alicevision.github.io/"
license=('MPL2')
groups=()
-_depends_qt=(python-pyside2 qt5-quickcontrols{,2} qt5-3d qt5-graphicaleffects qt5-imageformats qt5-location qt5-svg)
+_depends_qt=(qt5-quickcontrols{,2} qt5-3d qt5-graphicaleffects qt5-imageformats qt5-location qt5-svg)
#_depends_qt+=(qt5-datavis3d qt5-scxml)
depends=(alice-vision alembic openimageio python python-psutil ${_depends_qt[@]})
-makedepends=(git cmake python-setuptools python-cx_freeze)
+makedepends=(python-pip git cmake python-setuptools python-cx_freeze)
source=("${name}::git+https://github.com/alicevision/meshroom.git${fragment}"
"voctree::git+https://gitlab.com/alicevision/trainedVocabularyTreeData.git"
"git+https://github.com/alicevision/QtOIIO.git"
@@ -50,6 +50,8 @@ build() {
make
cd ${srcdir}/${name}
+ sed -i '/^PySide2/s/5.13.0/5.14.1/' requirements.txt
+ pip install --user -r requirements.txt
python setup.py build
}