Refactor

1 files changed, 26 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 316e104313db..40bf3a8d0649 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,31 @@
 #!/hint/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
-# shellcheck disable=SC2034,SC2164 # mask unused variable warning, mask cd without fallback warning.
 
 # Configuration.
+_CMAKE_FLAGS+=(
+              -DCMAKE_INSTALL_PREFIX=/usr
+              -DCMAKE_INSTALL_LIBDIR=lib
+              -DEIGEN_INCLUDE_DIR_HINTS=/usr/include/eigen3
+              -DFLANN_INCLUDE_DIR_HINTS=/usr/include/flann
+              -D{COINUTILS,CLP,OSI}_INCLUDE_DIR_HINTS=/usr/include/coin
+              -DLEMON_INCLUDE_DIR_HINTS=/usr/include/lemon
+              -DCERES_DIR=/usr/include/ceres
+              -DALICEVISION_BUILD_DOC=OFF
+             )
 # shellcheck disable=SC2206
 [[ -v CUDA_ARCH ]] && _cc_list=(${CUDA_ARCH})
+# Alow user to build without cuda
+if ((DISABLE_CUDA)); then
+  _CMAKE_FLAGS+=('-DALICEVISION_USE_CUDA=OFF')
+  # Disable component that could yield cuda.
+else
+  makedepends+=('cuda')
+  _CMAKE_FLAGS+=( -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc )
+  if [[ -v _cc_list ]]; then
+    _CMAKE_FLAGS+=( -DALICEVISION_CUDA_CC_LIST="$(IFS=';'; echo "${_cc_list[*]}";)" )
+  fi
+fi
+
 
 _name=alice-vision
 _fragment="#branch=develop"
@@ -19,12 +40,10 @@ license=('MPL2' 'MIT')
 groups=()
 conflicts=("${_name}" geogram uncertainty-framework)
 provides=("${_name}" geogram uncertainty-framework)
-
-
-depends=( 'alembic' 'boost-libs' 'coin-or-clp' 'flann' 'google-glog' 'opencv' 'openimageio' 'opengv' )
+depends+=('alembic' 'boost-libs' 'coin-or-clp' 'flann' 'google-glog' 'opencv' 'openimageio' 'opengv' )
 depends+=('glu' 'glfw-x11') # geogram deps.
 depends+=('magma' 'ceres-solver') # uncertaintyTE deps.
-makedepends=('ninja' 'boost' 'eigen' 'freetype2' 'gflags' 'doxygen' 'python-sphinx' 'coin-or-coinutils' 'coin-or-lemon' 'git' 'cmake')
+makedepends+=('ninja' 'boost' 'eigen' 'freetype2' 'gflags' 'doxygen' 'python-sphinx' 'coin-or-coinutils' 'coin-or-lemon' 'git' 'cmake')
 source=("${pkgname}::git+https://github.com/alicevision/AliceVision.git${_fragment}"
         "ute_lib::git+https://github.com/alicevision/uncertaintyTE.git"
         "geogram::git+https://github.com/alicevision/geogram.git"
@@ -43,13 +62,11 @@ pkgver() {
 
 
 prepare() {
-# shellcheck disable=SC2154 # mask $srcdir missing assignment.
   cd "${srcdir}/${pkgname}"
-  git submodule init
+  git submodule update --init
 #  git config submodule.src/dependencies/MeshSDFilter.url ${srcdir}/MeshSDFilter
 #  git config submodule.src/dependencies/nanoflann.url
 #  git config submodule.src/dependencies/osi_clp.url
-  git submodule update
 # fix doc build
   sed -i '/^ *install.*doc/s/doc/htmlDoc/' src/CMakeLists.txt
   #patch FindOpenGV.cmake to use Eigen3 instear of Eigen
@@ -58,26 +75,6 @@ prepare() {
 
 
 build() {
-
-# shellcheck disable=SC2191 # mask \= warning.
-  _CMAKE_FLAGS=(
-                -DCMAKE_INSTALL_PREFIX=/usr
-                -DCMAKE_INSTALL_LIBDIR=lib
-                -DEIGEN_INCLUDE_DIR_HINTS=/usr/include/eigen3
-                -DFLANN_INCLUDE_DIR_HINTS=/usr/include/flann
-                -DCOINUTILS_INCLUDE_DIR_HINTS=/usr/include/coin
-                -DLEMON_INCLUDE_DIR_HINTS=/usr/include/lemon
-                -DCLP_INCLUDE_DIR_HINTS=/usr/include/coin
-                -DOSI_INCLUDE_DIR_HINTS=/usr/include/coin
-                -DCERES_DIR=/usr/include/ceres
-                -DMAGMA_ROOT=/usr
-                -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc
-               )
-  if [[ -v _cc_list ]]; then
-    _CMAKE_FLAGS+=( -DALICEVISION_CUDA_CC_LIST="$(IFS=';'; echo "${_cc_list[*]}";)" )
-  fi
-
-
   msg2 "Build uncertaintyTE library"
   cmake -DCMAKE_INSTALL_PREFIX=/ -DMAGMA_ROOT=/usr -G Ninja -S ute_lib -B ute_build
 # shellcheck disable=SC2030,SC2031,SC2046 # ninja call won't work with shell substitution in quotes.
@@ -99,7 +96,6 @@ build() {
 
 package() {
   msg2 "Install uncertaintyTE"
-# shellcheck disable=SC2154 # mask $pkgdir missing assignment.
   DESTDIR="${pkgdir}/usr" ninja -C ute_build install
 
   msg2 "Install geogram"
@@ -107,9 +103,6 @@ package() {
 
   msg2 "Install Alice-Vision"
   DESTDIR="${pkgdir}" ninja -C build install
-  
-  #fix conflict with openmvg
-  rm "${pkgdir}"/usr/lib/libvlsift.a
 
 # install custom licenses.
   cd "${pkgdir}"/usr/share
@@ -117,7 +110,6 @@ package() {
   mv aliceVision/LICENSE-{MPL2,MIT-libmv}.md licenses/${pkgname}
 
 # prune empty dirs
-  cd "${pkgdir}"/usr
-  find . -type d | tac | xargs rmdir 2>/dev/null || true
+  find "${pkgdir}/usr" . -type d -print0 | xargs --null rmdir 2>/dev/null || true
 }
 # vim:set ts=2 sw=2 et: