summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2018-05-11 15:29:07 +0200
committerbartus2018-05-11 15:29:07 +0200
commit8958ccc9183504f7b667c3a641752a71f464c8ac (patch)
treeb52ac3fad03693158b2034f867df6748fe655e33
parent012be2881cb2ce043ed9f81e1a89b308ccaa7d88 (diff)
downloadaur-8958ccc9183504f7b667c3a641752a71f464c8ac.tar.gz
drop gcc to v6 as v8 cause an issue
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fe380826beb4..2937a7348b23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = openmvg-git
pkgdesc = open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
- pkgver = 1.3.r76.gd9563130
- pkgrel = 7
+ pkgver = 1.3.r78.g4f94981a
+ pkgrel = 8
url = http://imagine.enpc.fr/~moulonp/openMVG/
arch = i686
arch = x86_64
license = MPL
makedepends = git
+ makedepends = gcc6
makedepends = cmake
makedepends = doxygen
makedepends = eigen
diff --git a/PKGBUILD b/PKGBUILD
index 2ea15d2c73d1..d104dc8e1303 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=openmvg-git
_gitname='openMVG'
_fragment="#branch=develop"
-pkgver=1.3.r76.gd9563130
-pkgrel=7
+pkgver=1.3.r78.g4f94981a
+pkgrel=8
pkgdesc='open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.'
arch=('i686' 'x86_64')
url='http://imagine.enpc.fr/~moulonp/openMVG/'
license=('MPL')
depends=('lz4' 'libpng' 'libjpeg' 'libtiff' 'libxrandr' 'libxxf86vm' 'libxi' 'graphviz' 'libgl' 'ceres-solver' 'gflags' 'flann' 'coin-or-coinutils' 'coin-or-clp' 'coin-or-osi' 'coin-or-lemon')
-makedepends=('git' 'cmake' 'doxygen' 'eigen')
+makedepends=('git' 'gcc6' 'cmake' 'doxygen' 'eigen')
source=("git+https://github.com/${_gitname}/${_gitname}.git${_fragment}"
'git+https://github.com/elmindreda/glfw.git'
'git+https://github.com/openMVG-thirdparty/osi_clp.git'
@@ -45,7 +45,7 @@ build() {
cd "${srcdir}"
mkdir -p openmvg_build
cd openmvg_build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DOpenMVG_BUILD_SHARED=ON -DOpenMVG_BUILD_EXAMPLES=ON -DOpenMVG_BUILD_OPENGL_EXAMPLES=ON -DOpenMVG_USE_OPENMP=ON -DCOINUTILS_INCLUDE_DIR_HINTS=/usr/include/coin -DCLP_INCLUDE_DIR_HINTS=/usr/include/coin -DOSI_INCLUDE_DIR_HINTS=/usr/include/coin -DLEMON_INCLUDE_DIR_HINTS=/usr/include/lemon -DCERES_DIR_HINTS=/usr/include/ceres -DEIGEN_INCLUDE_DIR_HINTS=/usr/include/eigen3 ../openMVG/src/
+ cmake -DCMAKE_CXX_COMPILER=/usr/bin/g++-6 -DCMAKE_C_COMPILER=/usr/bin/gcc-6 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DOpenMVG_BUILD_SHARED=ON -DOpenMVG_BUILD_EXAMPLES=ON -DOpenMVG_BUILD_OPENGL_EXAMPLES=ON -DOpenMVG_USE_OPENMP=ON -DCOINUTILS_INCLUDE_DIR_HINTS=/usr/include/coin -DCLP_INCLUDE_DIR_HINTS=/usr/include/coin -DOSI_INCLUDE_DIR_HINTS=/usr/include/coin -DLEMON_INCLUDE_DIR_HINTS=/usr/include/lemon -DCERES_DIR_HINTS=/usr/include/ceres -DEIGEN_INCLUDE_DIR_HINTS=/usr/include/eigen3 ../openMVG/src/
make
}