diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 34 |
2 files changed, 36 insertions, 10 deletions
@@ -1,18 +1,18 @@ pkgbase = colmap-git pkgdesc = COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. - pkgver = 2.1.r71.g0a93918 + pkgver = 2.1.r95.g1c031a6 pkgrel = 1 url = https://colmap.github.io/ install = colmap-git.install arch = i686 arch = x86_64 license = GPL - makedepends = cuda + makedepends = ceres-solver makedepends = boost makedepends = git makedepends = cmake makedepends = eigen - depends = ceres-solver + depends = lapack depends = suitesparse depends = freeglut depends = glew @@ -24,9 +24,15 @@ pkgbase = colmap-git source = colmap-git::git+https://github.com/colmap/colmap.git source = colmap-git.install source = colmap.desktop + source = vocabulary-tree-64K.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-65536.bin + source = vocabulary-tree-256K.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-262144.bin + source = vocabulary-tree-1M.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-1048576.bin md5sums = SKIP md5sums = ebb1dc43e014a1e720a06422c6248a40 md5sums = 55d81534d969cf706719007462f20443 + md5sums = 3521ff3c601596473c6ce5256772f606 + md5sums = e423daecc45d56b749d25eeace9de1c8 + md5sums = 7ec70d4137d9b7ca9f076df34808ccc7 pkgname = colmap-git @@ -1,25 +1,32 @@ # Maintainer: bartus szczepaniak <aur@bartus.33mail.com> name=colmap pkgname=${name}-git -pkgver=2.1.r71.g0a93918 +pkgver=2.1.r95.g1c031a6 pkgrel=1 pkgdesc="COLMAP is a 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=() -depends=('ceres-solver' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'boost-libs' 'qt5-base') -makedepends=('cuda' 'boost' 'git' 'cmake' 'eigen') +depends=('lapack' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'boost-libs' 'qt5-base') +makedepends=('ceres-solver' 'boost' 'git' 'cmake' 'eigen') optdepends=('cuda: for cuda sfm/mvs acceleration') provides=() options=() install=${pkgname}.install source=("${pkgname}::git+https://github.com/colmap/colmap.git" "${pkgname}.install" - "${name}.desktop") + "${name}.desktop" + "vocabulary-tree-64K.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-65536.bin" + "vocabulary-tree-256K.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-262144.bin" + "vocabulary-tree-1M.bin::http://people.inf.ethz.ch/jschoenb/colmap/2.1/vocab_tree-1048576.bin" + ) md5sums=('SKIP' 'ebb1dc43e014a1e720a06422c6248a40' - '55d81534d969cf706719007462f20443') + '55d81534d969cf706719007462f20443' + '3521ff3c601596473c6ce5256772f606' + 'e423daecc45d56b749d25eeace9de1c8' + '7ec70d4137d9b7ca9f076df34808ccc7') pkgver() { cd "$pkgname" @@ -29,10 +36,18 @@ pkgver() { build() { cd ${srcdir}/${pkgname} + + # determine whether we can precompile CUDA kernels + _CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true + if [ "$_CUDA_PKG" != "" ]; then + _EXTRAOPTS="-DCUDA_ENABLED=ON -DCUDA_BUILD_CUBIN=ON -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda" + fi mkdir -p build cd build - cmake -DTESTS_ENABLED=OFF -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../ + #export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" + #export CXXFLAGS="${CFLAGS}" + cmake -DTESTS_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ${_EXTRAOPTS} ../ make } @@ -45,6 +60,11 @@ package() { install -d -m755 "${pkgdir}/usr/share/applications" install -m644 "${srcdir}/${name}.desktop" "${pkgdir}/usr/share/applications" sed -i "s#Version=.*#Version=$pkgver#" "${pkgdir}/usr/share/applications/${name}.desktop" + + # 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##*/} + done } - # vim:set ts=2 sw=2 et: |