aurutils: fix opencv4 patch.

3 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e193a6e8facd..97112a907407 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = pfstools
 	pkgdesc = Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images
 	pkgver = 2.1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://pfstools.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = cmake
+	makedepends = qt5-base
 	makedepends = openexr
 	makedepends = libmagick6
 	makedepends = libtiff
@@ -39,7 +40,7 @@ pkgbase = pfstools
 	source = opencv3.patch
 	source = force_imagemagick6.patch
 	sha256sums = 3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413
-	sha256sums = 41f74339b7cc1dbfa2c7e1de62e81c7f423bc22cba9e27ee57b1d0b2ce15ce82
+	sha256sums = 2933635f5b5be07fcede7c90baaad533cbbb87aa0e8bb8add530652da595bad6
 	sha256sums = ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674
 
 pkgname = pfstools
diff --git a/PKGBUILD b/PKGBUILD
index e04ccd6a1b59..65eccfebb002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Mael Kerbiriou <mael.kerbiriouATfreeDOTfr>
 pkgname=pfstools
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images"
 arch=('i686' 'x86_64')
 url="http://pfstools.sourceforge.net/"
@@ -19,7 +19,7 @@ optdepends=('freeglut: OpenGL image viewer pfsglview' 'glu: OpenGL image viewer
             'dcraw: RAW support' \
             'gsl: mantiuk08 tone mapping operator' \
             'fftw: durand02,fattal02,ferradans11 tone mapping operators')
-makedepends=('cmake' \
+makedepends=('cmake' 'qt5-base' \
              'openexr' 'libmagick6' 'libtiff' 'netpbm' \
              'gsl' 'fftw' 'libexif' 'opencv'
              'freeglut' 'glu' 'gtkglext' 'gtk3')
@@ -27,7 +27,7 @@ options=(!libtool)
 source=("http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz"
         "opencv3.patch" "force_imagemagick6.patch")
 sha256sums=('3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413'
-            '41f74339b7cc1dbfa2c7e1de62e81c7f423bc22cba9e27ee57b1d0b2ce15ce82'
+            '2933635f5b5be07fcede7c90baaad533cbbb87aa0e8bb8add530652da595bad6'
             'ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674')
 
 prepare() {
diff --git a/opencv3.patch b/opencv3.patch
index 3447540e75bc..c64c945a9476 100644
--- a/opencv3.patch
+++ b/opencv3.patch
@@ -61,4 +61,13 @@ index 12c7642..91c97ab 100644
 +    surfDesc->compute( exp_img, keypoints2, descr_exp );
      toc.toc( );
  
-     FlannBasedMatcher matcher;
\ No newline at end of file
+     FlannBasedMatcher matcher;
+@@ -226,7 +230,7 @@
+
+     vector<uchar> inliners(matches_sym.size(), 0);
+     //        affine = findHomography( pp1, pp2, inliners, CV_RANSAC, 1. );
+-    homography = findHomography( pp2, pp1, CV_RANSAC, 1., inliners );
++    homography = findHomography( pp2, pp1, RANSAC, 1., inliners );
+
+     //    solve( pp1, pp2, affine, DECOMP_SVD );
+     //    Mat affine = (Mat_<float>(2,3) << 1, 0, 0, 0, 1, 10);