Refactor and update.

* Allow _BUILD_CUDA to be passed with env.
* Fix missing glibc stdio.h header in PoissonRecon.
* Fix shellcheck warnings.
* Port colmap-git refactoring.

1 files changed, 35 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bfbed11a433a..9dbfa44c8cf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,15 @@
+#!/bin/hint/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
+# shellcheck disable=SC2034,SC2154 # unused/uninitialized variables.
+# shellcheck disable=SC2164 # unsafe cd.
+# shellcheck disable=SC2191 # unsafe array asignment.
+
 ####to disable cuda kernel comment out this line
-_BUILD_CUDA="on"
+_BUILD_CUDA="${_BUILD_CUDA:-ON}"
 
 name=colmap
 #fragment="#commit=5bea89263bf5f3ed623b8e6e6a5f022a0ed9c1de"
-fragment="#tag=3.6-dev.2"
+fragment="#tag=3.6-dev.3"
 pkgname=${name}
 pkgver=3.6dev3
 pkgrel=1
@@ -13,66 +18,68 @@ arch=('i686' 'x86_64')
 url="https://colmap.github.io/"
 license=('GPL')
 groups=()
-depends=('gflags' 'ceres-solver' 'cgal' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'libjpeg' 'boost-libs' 'qt5-base')
-makedepends=('boost' 'git' 'cmake' 'eigen' )
-if [ "$_BUILD_CUDA" == "on" ] ; then 
+depends=('cgal' 'ceres-solver' 'gflags' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'libjpeg' 'boost-libs' 'qt5-base')
+makedepends=('boost' 'cmake' 'eigen' 'git' 'ninja' 'python-sphinx' )
+if [ "$_BUILD_CUDA" == "ON" ] ; then 
   makedepends+=('cuda-sdk')
   optdepends=('cuda-toolkit: for cuda sfm/mvs acceleration')
 fi
 source=("${pkgname}::git+https://github.com/colmap/colmap.git${fragment}"
         "nvm-export.patch"
         "gcc9.patch"
+        "glibc_stdio.patch"
         "vocabulary-tree-32K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words32K.bin"
         "vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words256K.bin"
         "vocabulary-tree-1M.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words1M.bin"
         )
 sha256sums=('SKIP'
             'd8985b9af868edfc50f69257faf132f959398437758ccb6baa266a1bbddb3b36'
-            'ff3e0c03ee756c68ca8d120f46be0722cf15a41c64329062c5f87dddbf7b4392'
+            '531181351f30cfcb531fc961439152840048ff4fa71a27b1efae46421f1ab686'
+            '62e2a63b29a014279c72564fb7b08995a85869605d21c2b0a08e85eedd1adf12'
             'd37d8f19ee0a49705c4c0b06967a08cedfed5cf86519eada3271497256732bc2'
             'd2055600452a531b5b0a62aa5943e1a07195273dc4eeebcf23d3a924d881d53a'
             'fb60f7ba8081ee5c278f03c62329a374d1b24136b374a49393b453db1529a8c6')
 
-pkgver() {
-  cd "$pkgname"
-  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 prepare() {
-  cd ${srcdir}/${pkgname}
-  git apply -v ${srcdir}/*.patch
+  git -C "$pkgname" apply -v "$srcdir"/*.patch
+  mkdir -p build
 }
 
 
 build() {
-  cd ${srcdir}
-
   export CFLAGS=${CFLAGS/-fno-plt/}
   export CXXFLAGS=${CFLAGS/-fno-plt/}
 
   # determine whether we can precompile CUDA kernels
-    _CUDA_PKG=`pacman -Qsq cuda 2>/dev/null` || true
-    if [ -n "$_CUDA_PKG" -a "$_BUILD_CUDA"=="on" ]; then
-      _EXTRAOPTS="-DCUDA_ENABLED=ON -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda"
+    _CUDA_PKG=$(pacman -Qsq cuda 2>/dev/null) || true
+    if [[ -n "$_CUDA_PKG" && "$_BUILD_CUDA" == "ON" ]]; then
+      _CMAKE_FLAGS+=( -DCUDA_ENABLED=ON
+                      -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc
+                      -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda )
     else
-      _EXTRAOPTS="-DCUDA_ENABLED=OFF"
+      _CMAKE_FLAGS+=( -DCUDA_ENABLED=OFF )
     fi
 
-  mkdir -p build
-  cd build
-  cmake -DTESTS_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ${_EXTRAOPTS} ../${pkgname}
-  make
+  _CMAKE_FLAGS+=( -DTESTS_ENABLED=OFF
+                  -DCMAKE_BUILD_TYPE=Release
+                  -DCMAKE_INSTALL_PREFIX=/usr )
+  cmake "${_CMAKE_FLAGS[@]}" -G Ninja -S "$pkgname" -B build
+# shellcheck disable=SC2086 # allow MAKEFLAGS to carry multiple flags.
+  ninja -C build ${MAKEFLAGS:--j1}
 }
 
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  DESTDIR="${pkgdir}" ninja -C build install
+
+# build manpage
+  make -C "${pkgname}/doc" man BUILDDIR="$PWD" && \
+  install -Dm644 man/colmap.1 -t "${pkgdir}/usr/share/man/man1"
 
   # install vocabulary trees for sequential,vocabulary matching
-  install -d -m755 ${pkgdir}/usr/share/${name}
-  for vocab_tree in ${srcdir}/vocabulary-tree-*.bin ; do
-    install -m644 ${vocab_tree} ${pkgdir}/usr/share/${name}/${vocab_tree##*/}
+  install -d -m755 "${pkgdir}/usr/share/${name}"
+  for vocab_tree in "${srcdir}"/vocabulary-tree-*.bin ; do
+    install -m644 "${vocab_tree}" "${pkgdir}/usr/share/${name}/${vocab_tree##*/}"
   done
 }
 # vim:set ts=2 sw=2 et: