summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2017-08-06 11:07:43 +0200
committerbartus2017-08-06 11:07:43 +0200
commit2685285036f163e1ae15b5bc1ec44ce8a86d6cb9 (patch)
tree7eb59ec2cc04ba130e155b78b204fa8d8a860949
parentad371876f8d376f69f0df1e8516deaa6adf6d72b (diff)
downloadaur-2685285036f163e1ae15b5bc1ec44ce8a86d6cb9.tar.gz
fix libjpeg.a missing -fPIC by downgrading gcc to gcc5
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea2eef46d20a..207474604cee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
-# Generated by mksrcinfo v8
-# Fri Oct 21 23:06:07 UTC 2016
pkgbase = visual-sfm
pkgdesc = A Visual Structure from Motion System; create 3d models from photos.
pkgver = 0.5.26
- pkgrel = 3
+ pkgrel = 4
url = http://ccwu.me/vsfm/
arch = x86_64
license = custom:visual-sfm
+ depends = gcc5
depends = lapack
depends = blas
depends = f2c
diff --git a/PKGBUILD b/PKGBUILD
index 1c3dcadfb8e8..6a9379cbf571 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
pkgname=('visual-sfm')
pkgver=0.5.26
-pkgrel=3
+pkgrel=4
pkgdesc='A Visual Structure from Motion System; create 3d models from photos.'
arch=('x86_64')
url='http://ccwu.me/vsfm/'
-depends=('lapack' 'blas' 'f2c' 'libjpeg' 'gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu' 'cuda')
+depends=('gcc5' 'lapack' 'blas' 'f2c' 'libjpeg' 'gtk2' 'glu' 'cmvs-pmvs-git' 'siftgpu' 'cuda')
optdepends=(
'opencl-nvidia: nvidia gpu support'
'opencl-mesa: amd gpu support (mesa)'
@@ -39,7 +39,7 @@ build() {
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
+ sed -i 's:g++:g++-5:' makefile
make
}