summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD16
-rw-r--r--freezer.patch14
3 files changed, 34 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 58fab9dd9701..78aa5b6d86fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = meshroom
pkgdesc = Meshroom is a free, open-source 3D Reconstruction Software based on the AliceVision framework.
- pkgver = r762.9bd70ed
- pkgrel = 3
+ pkgver = r781.ef591dd
+ pkgrel = 1
url = http://alicevision.github.io/
arch = i686
arch = x86_64
@@ -15,10 +15,17 @@ pkgbase = meshroom
depends = python-pyside2
depends = qt5-quickcontrols
depends = qt5-quickcontrols2
- source = meshroom::git+https://github.com/alicevision/meshroom.git#commit=9bd70ed8ace83c6dde174178e17c5147bb50248f
+ depends = qt5-3d
+ depends = qt5-graphicaleffects
+ depends = qt5-imageformats
+ depends = qt5-location
+ depends = qt5-svg
+ source = meshroom::git+https://github.com/alicevision/meshroom.git#branch=develop
source = voctree::git+https://gitlab.com/alicevision/trainedVocabularyTreeData.git
+ source = freezer.patch
md5sums = SKIP
md5sums = SKIP
+ md5sums = b11eb0ff4db95d1130e324f408b6702e
pkgname = meshroom
diff --git a/PKGBUILD b/PKGBUILD
index 4d3ea042df2c..dfd9db2b1c97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
# Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
name=meshroom
-fragment="#commit=9bd70ed8ace83c6dde174178e17c5147bb50248f"
-#fragment="#branch=develop"
+#fragment="#commit=9bd70ed8ace83c6dde174178e17c5147bb50248f"
+fragment="#branch=develop"
pkgname=${name}
-pkgver=r762.9bd70ed
-pkgrel=3
+pkgver=r781.ef591dd
+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=(alice-vision python python-psutil python-pyside2 qt5-quickcontrols{,2})
+_depends_qt=(python-pyside2 qt5-quickcontrols{,2} qt5-3d qt5-graphicaleffects qt5-imageformats qt5-location qt5-svg)
+depends=(alice-vision python python-psutil ${_depends_qt[@]})
makedepends=(git python-setuptools python-cx_freeze)
source=("${pkgname}::git+https://github.com/alicevision/meshroom.git${fragment}"
"voctree::git+https://gitlab.com/alicevision/trainedVocabularyTreeData.git"
+ "freezer.patch"
)
md5sums=('SKIP'
- 'SKIP')
+ 'SKIP'
+ 'b11eb0ff4db95d1130e324f408b6702e')
pkgver() {
cd "$pkgname"
@@ -29,6 +32,7 @@ prepare() {
msg2 "Hardcode camera_database and voctree default value"
sed -i "s:'ALICEVISION_VOCTREE', '':'ALICEVISION_VOCTREE', '/usr/share/${pkgname}/vlfeat_K80L3.SIFT.tree':g" meshroom/nodes/aliceVision/*.py
sed -i "s:'ALICEVISION_SENSOR_DB', '':'ALICEVISION_SENSOR_DB', '/usr/share/aliceVision/sensor_width_camera_database.txt':g" meshroom/nodes/aliceVision/*.py
+ git apply ${srcdir}/freezer.patch
}
build() {
diff --git a/freezer.patch b/freezer.patch
new file mode 100644
index 000000000000..0763e8959b22
--- /dev/null
+++ b/freezer.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index 77afbe2..17d9363 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,8 @@ meshroomExe = Executable(
+ )
+
+ meshroomPhotog = Executable(
+- "bin/meshroom_photogrammetry"
++ "bin/meshroom_photogrammetry",
++ targetName="meshroomPhotog",
+ )
+
+ # Customize executable for each target platform