summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorbartus2018-06-12 18:12:54 +0200
committerbartus2018-06-12 18:12:54 +0200
commitc7b62a59c62465239ca01d716397a30f3411c5c1 (patch)
tree3d696ae80c1c3e415919f91368a8d77df03acde0 /PKGBUILD
parent2859fcde493eb616ebce060d8aff9139622dc925 (diff)
downloadaur-c7b62a59c62465239ca01d716397a30f3411c5c1.tar.gz
fix freeimage omiting dependencies
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 596710c46550..c1e10f0b2890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,15 @@ name=colmap
#fragment="#commit=5bea89263bf5f3ed623b8e6e6a5f022a0ed9c1de"
fragment="#branch=dev"
pkgname=${name}-git
-pkgver=3.4.r80.g36db96a
+pkgver=3.5.dev.1.r12.g6a04a6a
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=('gflags' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'boost-libs' 'qt5-base')
+_freeimage_deps=('openexr' 'openjpeg2' 'libtiff' 'libpng' 'libwebp' 'libraw' 'jxrlib')
+depends=('gflags' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' ${_freeimage_deps[@]} 'libjpeg' 'boost-libs' 'qt5-base')
makedepends=('ceres-solver' 'boost' 'git' 'cmake' 'eigen' )
if [ "$_BUILD_CUDA" == "on" ] ; then
makedepends+=('cuda-sdk')
@@ -22,6 +23,7 @@ fi
install=${pkgname}.install
source=("${pkgname}::git+https://github.com/colmap/colmap.git${fragment}"
"nvm-export.patch"
+ "freeimage.patch"
"${pkgname}.install"
"vocabulary-tree-64K.bin::https://demuc.de/colmap/vocab_tree-65536.bin"
"vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree-262144.bin"
@@ -29,6 +31,7 @@ source=("${pkgname}::git+https://github.com/colmap/colmap.git${fragment}"
)
md5sums=('SKIP'
'3c0027625739e972f8af8bea6f557b35'
+ 'b57f6eecef6589688665b9c01e68cae9'
'ebb1dc43e014a1e720a06422c6248a40'
'3521ff3c601596473c6ce5256772f606'
'e423daecc45d56b749d25eeace9de1c8'
@@ -42,6 +45,7 @@ pkgver() {
prepare() {
cd ${srcdir}/${pkgname}
git apply ${srcdir}/nvm-export.patch
+ git apply ${srcdir}/freeimage.patch
}