Refactor, pop version

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25046a7fc8f5..7f939dc3a29f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = colmap-git
 	pkgdesc = General-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface.
-	pkgver = 3.8.r118.ga97b8461
+	pkgver = 3.8.r184.g5d4535a2
 	pkgrel = 1
 	url = https://colmap.github.io/
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = colmap-git
 	makedepends = git
 	makedepends = ninja
 	makedepends = python-sphinx
-	makedepends = cuda-sdk
+	makedepends = cuda<12
 	depends = cgal
 	depends = ceres-solver
 	depends = gflags
@@ -26,7 +26,9 @@ pkgbase = colmap-git
 	depends = boost-libs
 	depends = qt5-base
 	depends = flann
-	optdepends = libcudart.so: for cuda sfm/mvs acceleration
+	optdepends = libcudart.so: required for dense reconstruction
+	provides = colmap
+	conflicts = colmap
 	source = colmap-git::git+https://github.com/colmap/colmap.git#branch=main
 	source = vocabulary-tree-32K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words32K.bin
 	source = vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words256K.bin
diff --git a/PKGBUILD b/PKGBUILD
index 6a15f0a2044a..e0093931f2dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,27 @@
 ## Configuration env vars:
 _BUILD_CUDA="${BUILD_CUDA:-ON}"
 _CUDA_ARCHITECTURES="${CUDA_ARCH:-native}"
-_fragment=#${FRAGMENT:-branch=main}
+_fragment=${FRAGMENT:-#branch=main}
 # Use CMAKE_FLAGS=xxx:yyy:zzz to define extra CMake flags
 [[ -v CMAKE_FLAGS ]] && mapfile -t -d: _CMAKE_FLAGS < <(echo -n "$CMAKE_FLAGS")
 
 _name=colmap
 #fragment="#commit=5bea89263bf5f3ed623b8e6e6a5f022a0ed9c1de"
 pkgname=${_name}-git
-pkgver=3.8.r118.ga97b8461
+pkgver=3.8.r184.g5d4535a2
 pkgrel=1
 pkgdesc="General-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface."
 arch=('i686' 'x86_64')
 url="https://colmap.github.io/"
 license=('GPL')
 groups=()
+provides=("$_name")
+conflicts=("$_name")
 depends=('cgal' 'ceres-solver' 'gflags' 'metis' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'libjpeg' 'boost-libs' 'qt5-base' 'flann')
 makedepends=('boost' 'cmake' 'eigen' 'git' 'ninja' 'python-sphinx' )
 if [ "$_BUILD_CUDA" == "ON" ] ; then 
-  makedepends+=('cuda-sdk')
-  optdepends+=('libcudart.so: for cuda sfm/mvs acceleration')
+  makedepends+=('cuda<12')
+  optdepends+=('libcudart.so: required for dense reconstruction')
 fi
 source=("${pkgname}::git+https://github.com/colmap/colmap.git${_fragment}"
         "vocabulary-tree-32K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words32K.bin"