Refactor

2 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a57a90e381fe..acf0812b3028 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,10 +28,9 @@ pkgbase = meshroom-git
 	source = voctree::git+https://gitlab.com/alicevision/trainedVocabularyTreeData.git
 	source = git+https://github.com/alicevision/QtOIIO.git
 	source = git+https://github.com/alicevision/qmlAlembic.git
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = meshroom-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6b91bc3eb007..9dde2bb6ec58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
 
 name=meshroom
@@ -13,17 +14,17 @@ license=('MPL2')
 groups=()
 _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-qfix openimageio python python-psutil ${_depends_qt[@]})
+depends=(alice-vision alembic openimageio python python-psutil "${_depends_qt[@]}")
 makedepends=(python-pip git cmake python-setuptools python-cx_freeze patchelf)
 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"
         "git+https://github.com/alicevision/qmlAlembic.git"
         )
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 
 pkgver() {
   cd "$name"
@@ -32,7 +33,7 @@ pkgver() {
 }
 
 prepare() {
-  cd ${srcdir}/${name}
+  cd "${srcdir}"/${name}
   msg2 "Hardcode camera_database and voctree default value"
   sed -i   "s:'ALICEVISION_VOCTREE', '':'ALICEVISION_VOCTREE', '/usr/share/${name}/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
@@ -41,15 +42,18 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/QtOIIO
+  msg2 'build QtOIIO'
+  cd "${srcdir}"/QtOIIO
   cmake -DCMAKE_INSTALL_PREFIX="/usr/lib/qt/" -DCMAKE_BUILD_TYPE=Release .
   make
 
-  cd ${srcdir}/qmlAlembic 
+  msg2 'build qmlAlembic'
+  cd "${srcdir}"/qmlAlembic
   cmake -DCMAKE_INSTALL_PREFIX="/usr/lib/qt/" -DCMAKE_BUILD_TYPE=Release .
   make
 
-  cd ${srcdir}/${name}
+  msg2 'build Meshroom'
+  cd "${srcdir}"/${name}
   sed -i '/^PySide2/s/5.14.1/5.15.2/' requirements.txt
   pip install --user -r requirements.txt
   python setup.py build
@@ -57,14 +61,17 @@ build() {
 
 
 package() {
-  cd ${srcdir}/QtOIIO
-  make DESTDIR=${pkgdir} install
+  msg2 'install QtOIIO'
+  cd "${srcdir}"/QtOIIO
+  make DESTDIR="${pkgdir}" install
 
-  cd ${srcdir}/qmlAlembic 
-  make DESTDIR=${pkgdir} install
+  msg2 'install qmlAlembic'
+  cd "${srcdir}"/qmlAlembic
+  make DESTDIR="${pkgdir}" install
 
-  cd ${srcdir}/${name}
-  python setup.py install --root=${pkgdir} --optimize=1 --skip-build
-  install -Dm644 -t ${pkgdir}/usr/share/${name} ${srcdir}/voctree/vlfeat_K80L3.SIFT.tree
+  msg2 'install Meshroom'
+  cd "${srcdir}"/${name}
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm644 -t "${pkgdir}"/usr/share/${name} "${srcdir}"/voctree/vlfeat_K80L3.SIFT.tree
 }
 # vim:set ts=2 sw=2 et: