summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracerix2016-10-21 18:56:42 -0400
committeracerix2016-10-21 18:56:42 -0400
commit4885c4bb35dac62c49fa6ea802ac16db666167e3 (patch)
tree3554674d77178f1366c0e8ac51cce81325cf1a78
parent2a78f583ec0c097776655abc98e8acd35ccf5360 (diff)
downloadaur-4885c4bb35dac62c49fa6ea802ac16db666167e3.tar.gz
fix from bartus
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD30
2 files changed, 25 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f76620850176..5a919a6640ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,16 @@
# Generated by mksrcinfo v8
-# Sat Oct 1 17:06:58 UTC 2016
+# Fri Oct 21 22:56:37 UTC 2016
pkgbase = visual-sfm
pkgdesc = A Visual Structure from Motion System; create 3d models from photos.
pkgver = 0.5.26
- pkgrel = 2
+ pkgrel = 3
url = http://ccwu.me/vsfm/
arch = x86_64
license = custom:visual-sfm
+ depends = lapack
+ depends = blas
+ depends = f2c
+ depends = libjpeg
depends = gtk2
depends = glu
depends = cmvs-pmvs-git
@@ -18,9 +22,9 @@ pkgbase = visual-sfm
source = http://ccwu.me/vsfm/download/VisualSFM_linux_64bit.zip
source = visual-sfm.desktop
source = http://grail.cs.washington.edu/projects/mcba/pba_v1.0.5.zip
- sha256sums = 052bfc267ae5aed8613577735247a90bc98eb3073569bf567e93e41e7862d2d9
- sha256sums = 5a60f78a9a106c95944fdd2f9cbe4fd5d66044182fc50a050c1734cffd2c6789
- sha256sums = ddce4118d2da9d962cb56825649bd8edfa97d39270e0960a405ef2b317fac4c2
+ md5sums = 25fcca5e320a9e97131e87abdf3b7f61
+ md5sums = 52e8eabb314aa7661fd6eb1bee32eaae
+ md5sums = 672f5cd6c1b4c08517409809b819c547
pkgname = visual-sfm
diff --git a/PKGBUILD b/PKGBUILD
index 37f0cfd71e03..f165909ccb2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Dylan Ferris <dylan@psilly.com>
# Submaintainer: bartus <aur@bartus.33mail.com>
-
+
pkgname=('visual-sfm')
pkgver=0.5.26
-pkgrel=2
+pkgrel=3
pkgdesc='A Visual Structure from Motion System; create 3d models from photos.'
arch=('x86_64')
url='http://ccwu.me/vsfm/'
-depends=('gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu' 'cuda')
+depends=('lapack' 'blas' 'f2c' 'libjpeg' 'gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu' 'cuda')
optdepends=(
'opencl-nvidia: nvidia gpu support'
'opencl-mesa: amd gpu support (mesa)'
@@ -19,27 +19,30 @@ source=(
'visual-sfm.desktop'
'http://grail.cs.washington.edu/projects/mcba/pba_v1.0.5.zip'
)
-sha256sums=(
- '052bfc267ae5aed8613577735247a90bc98eb3073569bf567e93e41e7862d2d9'
- '5a60f78a9a106c95944fdd2f9cbe4fd5d66044182fc50a050c1734cffd2c6789'
- 'ddce4118d2da9d962cb56825649bd8edfa97d39270e0960a405ef2b317fac4c2'
+md5sums=(
+ '25fcca5e320a9e97131e87abdf3b7f61'
+ '52e8eabb314aa7661fd6eb1bee32eaae'
+ '672f5cd6c1b4c08517409809b819c547'
)
-
-
build() {
-
+
msg "building Multicore Bundle Adjustment"
cd ${srcdir}/pba
# adjust cuda path
sed -i 's:CUDA_INSTALL_PATH = /usr/local/cuda:CUDA_INSTALL_PATH = /opt/cuda:' makefile
make pba
cp bin/libpba.so ../vsfm/bin
-
+
msg "building VisualSFM"
cd ${srcdir}/vsfm
+ # use system lapack blas f2c
+ sed -i 's:$(LIB_DIR)/lapack.a:-llapack:' makefile
+ sed -i 's:$(LIB_DIR)/blas.a:-lblas:' makefile
+ sed -i 's:$(LIB_DIR)/libf2c.a:-lf2c:' makefile
+ sed -i 's:$(LIB_DIR)/libjpeg.a:-ljpeg:' makefile
make
}
-
+
package() {
install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
cd ${srcdir}/vsfm
@@ -47,6 +50,5 @@ package() {
install -Dm755 bin/VisualSFM ${pkgdir}/usr/bin/visual-sfm
install -Dm755 bin/libpba.so ${pkgdir}/usr/lib/libpba.so
}
-
+
# vim:set ts=2 sw=2 et:
-