rollback gtest patch, already in mainline

3 files changed, 4 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 674ea012ec64..c8c248b1c84b 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 = r1210.7ce368d
+	pkgver = r1217.91c0f3f
 	pkgrel = 1
 	url = http://www.gcc.tu-darmstadt.de/home/proj/mve/
 	arch = i686
@@ -25,7 +25,7 @@ pkgbase = mve-git
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 7e7d7c62d2a191fd4d27dde052035fcf
+	md5sums = 523a518b5d99bd6aea4620a0482409fc
 
 pkgname = mve-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a26007760442..1c51136f8be4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: bartus szczepaniak <aur@bartus.33mail.com>
 pkgname=mve-git
-pkgver=r1210.7ce368d
+pkgver=r1217.91c0f3f
 pkgrel=1
 pkgdesc="Image-based geometry reconstruction pipeline, structure-from-motion, (shading-aware) multi-view-stereo, surface-reconstruction, texturing,"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
-         '7e7d7c62d2a191fd4d27dde052035fcf')
+         '523a518b5d99bd6aea4620a0482409fc')
 _binar="apps/sfmrecon/sfmrecon
 apps/meshconvert/meshconvert
 apps/meshalign/meshalign
diff --git a/gtest.patch b/gtest.patch
index 3d1ecd463e0d..daff5d78655e 100644
--- a/gtest.patch
+++ b/gtest.patch
@@ -14,46 +14,4 @@ index f179d48..8927a5c 100644
  	${LINK.cc} -o $@ $^ ${LDLIBS}
  
  clean:
-diff --git a/tests/Makefile b/tests/Makefile
-index 69269b6..e043727 100644
---- a/smvs/tests/Makefile
-+++ b/smvs/tests/Makefile
-@@ -6,9 +6,9 @@ SOURCES = $(wildcard gtest_*.cc)
- INCLUDES = -I../lib -I${MVE_ROOT}/libs -I${GTEST_PATH}/include
- CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare
- CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES}
--LDLIBS += -lpng -ltiff -ljpeg
-+LDLIBS += -lpng -ltiff -ljpeg -lgtest -lgtest_main
- 
--test: ${SOURCES:.cc=.o} libsmvs.a libmve.a libmve_util.a gtest_main.a
-+test: ${SOURCES:.cc=.o} libsmvs.a libmve.a libmve_util.a
- 	${LINK.cc} -o $@ $^ ${LDLIBS}
- 
- clean:
-diff --git a/smvs/tests/gtest_correspondence.cc b/tests/gtest_correspondence.cc
-index fcb6a50..a8e2da4 100644
---- a/smvs/tests/gtest_correspondence.cc
-+++ b/smvs/tests/gtest_correspondence.cc
-@@ -365,8 +365,8 @@ TEST(CorrespondenceJacobianTest, ValuesAndDerivatives)
-     corr_new[0] -= 0.5;
-     corr_new[1] -= 0.5;
-     diff = (corr_new - corr_base) / delta;
--    EXPECT_NEAR(corr_jac[0], diff[0], 1e-4);
--    EXPECT_NEAR(corr_jac[1], diff[1], 1e-4);
-+    EXPECT_NEAR(corr_jac[0], diff[0], 2e-4);
-+    EXPECT_NEAR(corr_jac[1], diff[1], 2e-4);
-     x = backup;
- 
-     backup = y;
-@@ -377,8 +377,8 @@ TEST(CorrespondenceJacobianTest, ValuesAndDerivatives)
-     corr_new[0] -= 0.5;
-     corr_new[1] -= 0.5;
-     diff = (corr_new - corr_base) / delta;
--    EXPECT_NEAR(corr_jac[2], diff[0], 1e-4);
--    EXPECT_NEAR(corr_jac[3], diff[1], 1e-4);
-+    EXPECT_NEAR(corr_jac[2], diff[0], 2e-4);
-+    EXPECT_NEAR(corr_jac[3], diff[1], 2e-4);
-     y = backup;
-
- #if 1