Add DISABLE_CUDA, DISABLE_UTE to omit cuda,magma dependency.

2 files changed, 33 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfe9a373699d..d8a8e2cdad7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,10 +10,8 @@ pkgbase = alice-vision
 	makedepends = boost
 	makedepends = eigen
 	makedepends = ceres-solver
-	makedepends = cuda
 	makedepends = git
 	makedepends = cmake
-	makedepends = magma
 	depends = openblas-lapack
 	depends = gflags
 	depends = glfw-x11
@@ -28,20 +26,21 @@ pkgbase = alice-vision
 	depends = coin-or-lemon
 	depends = coin-or-osi
 	depends = google-glog
+	depends = freetype2
 	provides = alice-vision
 	conflicts = alice-vision-git
 	source = https://github.com/alicevision/AliceVision/archive/v2.2.0.tar.gz
-	source = ute_lib::git+https://github.com/alicevision/uncertaintyTE.git
 	source = geogram::git+https://github.com/alicevision/geogram.git
 	source = MeshSDFilter::git+https://github.com/alicevision/MeshSDFilter.git#branch=av_develop
 	source = nanoflann::git+https://github.com/alicevision/nanoflann.git
 	source = submodule.patch
+	source = ute_lib::git+https://github.com/alicevision/uncertaintyTE.git
 	md5sums = a9d5cd07ed33c0b73390b11170b3b11f
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = eb62c8be5a0d7ce537a928314c9d0028
+	md5sums = SKIP
 
 pkgname = alice-vision
 
diff --git a/PKGBUILD b/PKGBUILD
index 88d02976ed36..f7aab86e2d5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,10 +11,9 @@ license=('MPL2' 'MIT')
 groups=()
 conflicts=(alice-vision-git)
 provides=(alice-vision)
-depends=('openblas-lapack' 'gflags' 'glfw-x11' 'alembic' 'boost-libs' 'openexr' 'openimageio' 'opengv-git' 'flann' 'coin-or-coinutils' 'coin-or-clp' 'coin-or-lemon' 'coin-or-osi' 'google-glog')
-makedepends=('boost' 'eigen' 'ceres-solver' 'cuda' 'git' 'cmake' 'magma')
+depends=('openblas-lapack' 'gflags' 'glfw-x11' 'alembic' 'boost-libs' 'openexr' 'openimageio' 'opengv-git' 'flann' 'coin-or-coinutils' 'coin-or-clp' 'coin-or-lemon' 'coin-or-osi' 'google-glog' 'freetype2')
+makedepends=('boost' 'eigen' 'ceres-solver' 'git' 'cmake')
 source=("https://github.com/alicevision/AliceVision/archive/v${pkgver}.tar.gz"
-        "ute_lib::git+https://github.com/alicevision/uncertaintyTE.git"
         "geogram::git+https://github.com/alicevision/geogram.git"
         "MeshSDFilter::git+https://github.com/alicevision/MeshSDFilter.git#branch=av_develop"
         "nanoflann::git+https://github.com/alicevision/nanoflann.git"
@@ -24,7 +23,6 @@ md5sums=('a9d5cd07ed33c0b73390b11170b3b11f'
          'SKIP'
          'SKIP'
          'SKIP'
-         'SKIP'
          'eb62c8be5a0d7ce537a928314c9d0028')
 
 _CMAKE_FLAGS=(
@@ -37,10 +35,22 @@ _CMAKE_FLAGS=(
               -DCLP_INCLUDE_DIR_HINTS=/usr/include/coin
               -DOSI_INCLUDE_DIR_HINTS=/usr/include/coin
               -DCERES_DIR=/usr/include/ceres
-              -DMAGMA_ROOT=/opt/magma
-              -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc
+              -DALICEVISION_BUILD_DOC=OFF
              )
 
+((DISABLE_CUDA)) && { _CMAKE_FLAGS+=('-DALICEVISION_USE_CUDA=OFF')
+                       DISABLE_UTE=1 # Disable uncertaintyTE as it also depends on cuda
+               } || {  makedepends+=('cuda')
+                      _CMAKE_FLAGS+=('-DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc')
+                    } 
+
+((DISABLE_UTE)) || {  source+=("ute_lib::git+https://github.com/alicevision/uncertaintyTE.git")
+                      md5sums+=('SKIP') 
+                      makedepends+=('magma')
+                     _CMAKE_FLAGS+=( -DMAGMA_ROOT=/opt/magma
+                                     -DUNCERTAINTYTE_DIR=${srcdir}/ute_bin )
+                   }
+
 _path="AliceVision-${pkgver}"
 
 prepare() {
@@ -55,12 +65,14 @@ prepare() {
 build() {
   cd ${srcdir}
 
-  msg2 "Build uncertaintyTE library"
-  mkdir -p ute_build && cd ute_build
-  cmake -DCMAKE_INSTALL_PREFIX=/ -DMAGMA_ROOT=/opt/magma ../ute_lib 
-  make
-  make DESTDIR="../ute_bin" install
-  cd ..
+  ((DISABLE_UTE)) || {
+    msg2 "Build uncertaintyTE library"
+    mkdir -p ute_build && cd ute_build
+    cmake -DCMAKE_INSTALL_PREFIX=/ -DMAGMA_ROOT=/opt/magma ../ute_lib 
+    make
+    make DESTDIR="../ute_bin" install
+    cd ..
+  }
 
   msg2 "Build geogram library"
   mkdir -p geogram_build && cd geogram_build
@@ -71,15 +83,17 @@ build() {
 
   msg2 "Build AliceVision library"
   mkdir -p build && cd build
-  cmake ${_CMAKE_FLAGS[@]} -DUNCERTAINTYTE_DIR=${srcdir}/ute_bin -DGEOGRAM_INSTALL_PREFIX=${srcdir}/geogram_bin ../${_path}
+  cmake ${_CMAKE_FLAGS[@]} -DGEOGRAM_INSTALL_PREFIX=${srcdir}/geogram_bin ../${_path}
   make
 }
 
 
 package() {
-  msg2 "Install uncertaintyTE"
-  cd ${srcdir}/ute_build
-  make DESTDIR=${pkgdir}/usr install
+  ((DISABLE_UTE)) || {
+    msg2 "Install uncertaintyTE"
+    cd ${srcdir}/ute_build
+    make DESTDIR=${pkgdir}/usr install
+  }
 
   msg2 "Install geogram"
   cd ${srcdir}/geogram_build