Update gtest.patch, drop merged eigen.patch

Fix #1

3 files changed, 5 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 755c9cbc0a1a..42ca05fe114f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mve-git
 	pkgdesc = Image-based geometry reconstruction pipeline, structure-from-motion, (shading-aware) multi-view-stereo, surface-reconstruction, texturing,
-	pkgver = r1297.b9117b3
+	pkgver = r1316.65f677e
 	pkgrel = 1
 	url = http://www.gcc.tu-darmstadt.de/home/proj/mve/
 	arch = i686
@@ -23,13 +23,11 @@ pkgbase = mve-git
 	source = git+https://github.com/nmoehrle/mvs-texturing.git
 	source = git+https://github.com/flanggut/smvs.git
 	source = gtest.patch
-	source = eigen.patch::https://github.com/nmoehrle/mvs-texturing/pull/153.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 06b18787da3a61874fbe9bffd9b90090abe8339e6e91221c7b009c3fb90c655e
-	sha256sums = ef9700addddd58d5abea5f07d7e56ce073fc7cce0c0a33affd5093dd1d12875f
+	sha256sums = 1077e884f2ed19efefa8b65676ee117d039c66e64b481f7fb5887042b90cb9ae
 
 pkgname = mve-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fb457c71a97b..83b8fbed242b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=mve-git
-pkgver=r1297.b9117b3
+pkgver=r1316.65f677e
 pkgrel=1
 pkgdesc="Image-based geometry reconstruction pipeline, structure-from-motion, (shading-aware) multi-view-stereo, surface-reconstruction, texturing,"
 arch=('i686' 'x86_64')
@@ -16,14 +16,12 @@ source=("${pkgname}::git+https://github.com/simonfuhrmann/mve.git"
         "git+https://github.com/nmoehrle/mvs-texturing.git"
         "git+https://github.com/flanggut/smvs.git"
         'gtest.patch'
-        "eigen.patch::https://github.com/nmoehrle/mvs-texturing/pull/153.diff"
        )
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '06b18787da3a61874fbe9bffd9b90090abe8339e6e91221c7b009c3fb90c655e'
-            'ef9700addddd58d5abea5f07d7e56ce073fc7cce0c0a33affd5093dd1d12875f')
+            '1077e884f2ed19efefa8b65676ee117d039c66e64b481f7fb5887042b90cb9ae')
 _binar="apps/sfmrecon/sfmrecon
 apps/meshconvert/meshconvert
 apps/meshalign/meshalign
@@ -41,8 +39,6 @@ prepare() {
   cd ${srcdir}/${pkgname}
   git apply -v ${srcdir}/gtest.patch
   sed -i '/CXXFLAGS*/s/$/ -msse4.2/' libs/sfm/Makefile
-  cd ${srcdir}/mvs-texturing
-  git apply -v ${srcdir}/eigen.patch
 }
 
 pkgver() {
diff --git a/gtest.patch b/gtest.patch
index 9494c2e48f42..3c70c1d600ef 100644
--- a/gtest.patch
+++ b/gtest.patch
@@ -3,7 +3,7 @@ index d6d913f..9cb0080 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -8,9 +8,9 @@ SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/
- INCLUDES = -I${MVE_ROOT}/libs -I${GTEST_PATH}/include
+ INCLUDES = -I${MVE_ROOT}/libs -I${GTEST_PATH}/googletest/include
  CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare
  CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES}
 -LDLIBS += -lpng -ltiff -ljpeg