This appears not to be needed at all anymore

3 files changed, 3 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e004ca477fcf..48e12f46c168 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pfstools
 	pkgdesc = Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images
 	pkgver = 2.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://pfstools.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -38,10 +38,8 @@ pkgbase = pfstools
 	conflicts = pfstmo
 	options = !libtool
 	source = http://downloads.sourceforge.net/pfstools/pfstools-2.2.0.tgz
-	source = opencv3.patch
 	source = force_imagemagick6.patch
 	b2sums = dbb5e0ab8613014b3698591acef95f5b846473997b158701ee1dbeb28f43d5af098f4267bac6c5194bf61da619bb5d38c5cd86f9e970483fb550b866b3d43a47
-	b2sums = 62dd4ff4c1fa50e409c1fde9f54996ca007aae98a8b45437f52f77faee8aac2bf9b1b50e41ed5374d958b9f3b5ea97f1fb2b7fa67e38cc79fc05cd40c14903d7
 	b2sums = f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23
 
 pkgname = pfstools
diff --git a/PKGBUILD b/PKGBUILD
index 674c611fc430..4a315509b2c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Mael Kerbiriou <mael.kerbiriouATfreeDOTfr>
 pkgname=pfstools
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 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/"
@@ -30,15 +30,13 @@ makedepends=('cmake' 'qt5-base' 'octave'
              'freeglut' 'glu')
 options=(!libtool)
 source=("http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz"
-        "opencv3.patch" "force_imagemagick6.patch")
+        "force_imagemagick6.patch")
 b2sums=('dbb5e0ab8613014b3698591acef95f5b846473997b158701ee1dbeb28f43d5af098f4267bac6c5194bf61da619bb5d38c5cd86f9e970483fb550b866b3d43a47'
-        '62dd4ff4c1fa50e409c1fde9f54996ca007aae98a8b45437f52f77faee8aac2bf9b1b50e41ed5374d958b9f3b5ea97f1fb2b7fa67e38cc79fc05cd40c14903d7'
         'f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 < "$srcdir/opencv3.patch"
   patch -Np1 < "$srcdir/force_imagemagick6.patch"
 }
 
diff --git a/opencv3.patch b/opencv3.patch
deleted file mode 100644
index f58506f974a0..000000000000
--- a/opencv3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/src/camera/pfsalign.cpp b/src/camera/pfsalign.cpp
-index 4ea59c7..fcd94b2 100644
---- a/src/camera/pfsalign.cpp
-+++ b/src/camera/pfsalign.cpp
-@@ -48,6 +48,8 @@
- #include <opencv2/core/core.hpp>
- #include <opencv2/highgui/highgui.hpp>
- #include <opencv2/features2d/features2d.hpp>
-+#include <opencv2/features2d.hpp>
-+#include <opencv2/xfeatures2d/nonfree.hpp>
- #include <opencv2/calib3d/calib3d.hpp>
- #include <opencv2/imgproc/imgproc.hpp>
- #include <libexif/exif-data.h>
-@@ -69,6 +71,7 @@ class QuietException
- 
- using namespace cv;
- using namespace std;
-+using namespace cv::xfeatures2d;
- 
- void printHelp()
- {
-@@ -168,11 +171,10 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
-     Mat descr_ref, descr_exp;
- 
-     #ifdef USE_SURF
--        Ptr<FeatureDetector> detector(new DynamicAdaptedFeatureDetector( new SurfAdjuster( (11-sensitivity) * 100.f, 2, 1000 ),
--                                                                     100, 1000, sensitivity/2+2 ));
-+        Ptr<SURF> surfDesc = SURF::create();
-         toc.tic( "feature detection" );
--        detector->detect( ref_img, keypoints1 );
--        detector->detect( exp_img, keypoints2 );
-+        surfDesc->detect( ref_img, keypoints1 );
-+        surfDesc->detect( exp_img, keypoints2 );
-         toc.toc( );
-     #else
-         Ptr<AKAZE> akaze = AKAZE::create();
-@@ -202,13 +204,11 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
-         return false;
-     }
- 
--    //        SiftDescriptorExtractor surfDesc;
-     #ifdef USE_SURF
--        SurfDescriptorExtractor surfDesc;
- 
-         toc.tic( "descriptor extraction" );
--        surfDesc.compute( ref_img, keypoints1, descr_ref );
--        surfDesc.compute( exp_img, keypoints2, descr_exp );
-+        surfDesc->compute( ref_img, keypoints1, descr_ref );
-+        surfDesc->compute( exp_img, keypoints2, descr_exp );
-         toc.toc( );
-     #endif
-