summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-04-24 15:44:11 +0200
committerbartus2019-04-24 15:44:11 +0200
commit1c9f11e45a505206c98c941795310e599a0323f1 (patch)
tree89bd344e333bc2a9b9348de560cd01de2a7c6d1f
parent9b731b95aafbb9f24f72b5d3e33e021d91862be6 (diff)
downloadaur-visual-sfm.tar.gz
use static libcudart
use makedepends for cuda and gcc5
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 207474604cee..2ab8f35ac271 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
pkgbase = visual-sfm
pkgdesc = A Visual Structure from Motion System; create 3d models from photos.
pkgver = 0.5.26
- pkgrel = 4
+ pkgrel = 5
url = http://ccwu.me/vsfm/
arch = x86_64
license = custom:visual-sfm
- depends = gcc5
+ makedepends = gcc5
+ makedepends = cuda
depends = lapack
depends = blas
depends = f2c
- depends = libjpeg
depends = gtk2
depends = glu
depends = cmvs-pmvs-git
depends = siftgpu
- depends = cuda
optdepends = opencl-nvidia: nvidia gpu support
optdepends = opencl-mesa: amd gpu support (mesa)
optdepends = opencl-catalyst: amd gpu support (catalyst)
diff --git a/PKGBUILD b/PKGBUILD
index 78011c62e713..9cec03fc30c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
pkgname=('visual-sfm')
pkgver=0.5.26
-pkgrel=4
+pkgrel=5
#options=(debug !strip !makeflags)
pkgdesc='A Visual Structure from Motion System; create 3d models from photos.'
arch=('x86_64')
url='http://ccwu.me/vsfm/'
-depends=('gcc5' 'lapack' 'blas' 'f2c' 'libjpeg' 'gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu' 'cuda')
+depends=('lapack' 'blas' 'f2c' 'gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu')
+makedepends=('gcc5' 'cuda')
optdepends=(
'opencl-nvidia: nvidia gpu support'
'opencl-mesa: amd gpu support (mesa)'
@@ -32,6 +33,8 @@ build() {
cd ${srcdir}/pba
# adjust cuda path
sed -i 's:CUDA_INSTALL_PATH = /usr/local/cuda:CUDA_INSTALL_PATH = /opt/cuda:' makefile
+ # use static libcudart those pruning cuda from dependencies
+ sed -i 's:-lcudart:/opt/cuda/targets/x86_64-linux/lib/libcudart_static.a:g' makefile
make pba
cp bin/libpba.so ../vsfm/bin