Made patch for opencv headers out of the sed commands

3 files changed, 96 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e524034a2e91..56f477adfa6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = diffimg
 	pkgdesc = Simple image comparison tool
 	pkgver = 2.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://sourceforge.net/projects/diffimg/
 	install = diffimg.install
 	arch = i686
@@ -14,8 +14,10 @@ pkgbase = diffimg
 	optdepends = freeimage
 	source = http://sourceforge.net/projects/diffimg/files/2.2.0/Diffimg-2.2.0-src.zip
 	source = diffimg.desktop
+	source = fix-opencv-headers.patch
 	md5sums = e97610c4a265524297bc20268870556a
 	md5sums = 98d6aae50942ef908313515bdd9b02f4
+	md5sums = 383406fdf35e39750a7cf14d0a275770
 
 pkgname = diffimg
 
diff --git a/PKGBUILD b/PKGBUILD
index 762b36077105..1364ab227955 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=diffimg
 _pkgname=Diffimg
 _newpkgname=Diffimg-xbee # possible future name due to conflict
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple image comparison tool"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,10 +18,12 @@ url='http://sourceforge.net/projects/diffimg/'
 source=(
 "http://sourceforge.net/projects/diffimg/files/${pkgver}/${_pkgname}-${pkgver}-src.zip"
 diffimg.desktop
+fix-opencv-headers.patch
 )
 install='diffimg.install'
 md5sums=('e97610c4a265524297bc20268870556a'
-        '98d6aae50942ef908313515bdd9b02f4')
+        '98d6aae50942ef908313515bdd9b02f4'
+        '383406fdf35e39750a7cf14d0a275770')
 
 prepare(){
   cd "${srcdir}"/${_pkgname}-${pkgver}-src
@@ -31,20 +33,8 @@ prepare(){
     tounix.sh
   chmod +x tounix.sh
   ./tounix.sh
-
-  cd ./build
-  sed -i -e 's;\"\/usr\/include\/qwt\";\"\/usr\/include\/qwt\-qt4\";g' CMakeLists.txt
-  sed -i -e '178s;qwt;qwt\-qt4;g' CMakeLists.txt
-  sed -i -e '180s;qwt;qwt\-qt4;g' CMakeLists.txt
-
-  #Hack to fix upgrade to opencv4 breaking legacy components
-  sed -i -e "/ADD_LIBRARY(PerceptualDiff/a find_package(OpenCV COMPONENTS opencv_imgproc REQUIRED CONFIG)\ninclude_directories(\${OpenCV_INCLUDE_DIRS})" ../3rdparty/perceptualdiff/CMakeLists.txt
-  sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../3rdparty/perceptualdiff/OpenCVImageLoader.cpp
-  sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../src/MiscFunctions.cpp
-  sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../src/metrics/PerLuminanceMetric.cpp
-  sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgcodecs\/legacy\/constants_c.h>\n#include <opencv2\/imgproc\/imgproc_c.h>" ../src/metrics/BaseMetric.cpp
-
-
+   # OpenCV4 split headers for modules
+   patch -p1 -i ../fix-opencv-headers.patch
 }
 
 build() {
diff --git a/fix-opencv-headers.patch b/fix-opencv-headers.patch
new file mode 100644
index 000000000000..09401bd0c1d3
--- /dev/null
+++ b/fix-opencv-headers.patch
@@ -0,0 +1,87 @@
+diff --git a/3rdparty/perceptualdiff/CMakeLists.txt b/3rdparty/perceptualdiff/CMakeLists.txt
+index 3a698e0..cb4147b 100644
+--- a/3rdparty/perceptualdiff/CMakeLists.txt
++++ b/3rdparty/perceptualdiff/CMakeLists.txt
+@@ -5,6 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+ SET(DIFF_SRC  LPyramid.cpp RGBAImage.cpp CompareArgs.cpp Metric.cpp OpenCVImageLoader.cpp)
+ 
+ ADD_LIBRARY(PerceptualDiff STATIC ${DIFF_SRC} ${})
++find_package(OpenCV COMPONENTS opencv_imgproc REQUIRED CONFIG)
++include_directories(${OpenCV_INCLUDE_DIRS})
+ 
+ IF (MSVC)
+ # Turn off deprecation warnings
+diff --git a/3rdparty/perceptualdiff/OpenCVImageLoader.cpp b/3rdparty/perceptualdiff/OpenCVImageLoader.cpp
+index 4c65a2b..dc9266c 100644
+--- a/3rdparty/perceptualdiff/OpenCVImageLoader.cpp
++++ b/3rdparty/perceptualdiff/OpenCVImageLoader.cpp
+@@ -20,6 +20,7 @@
+ #include "RGBAImage.h"
+ #include "OpenCVImageLoader.h"
+ 
++#include <opencv2/imgproc/imgproc_c.h>
+ #include <opencv2/imgproc/imgproc.hpp>
+ #include <opencv2/highgui/highgui.hpp>
+ 
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index 5736040..42b804e 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -78,7 +78,7 @@ INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} "../src/"
+ "../3rdparty/libyuv/include" 
+ "../3rdparty/qtpropertybrowser" 
+ "../3rdparty/perceptualdiff" 
+-"/usr/include/qwt" )
++"/usr/include/qwt-qt4" )
+ ENDIF(MSVC)
+ 
+ FILE(GLOB include_file_list "../src/*.h" "../src/metrics/*.h" "../src/formats/*.h")
+@@ -175,9 +175,9 @@ ENDIF( APPLE )
+ # last thing we have to do is to tell CMake what libraries our executable needs,
+ # luckily FIND_PACKAGE prepared QT_LIBRARIES variable for us:
+ IF (UNIX)
+-    TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} PerceptualDiff qtpropertybrowser qwt opencv_core opencv_highgui opencv_imgproc libyuv -lX11 -ldl )
++    TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} PerceptualDiff qtpropertybrowser qwt-qt4 opencv_core opencv_highgui opencv_imgproc libyuv -lX11 -ldl )
+ ELSE (UNIX)
+-    TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} PerceptualDiff qtpropertybrowser qwt opencv_core opencv_highgui opencv_imgproc libyuv )
++    TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} PerceptualDiff qtpropertybrowser qwt-qt4 opencv_core opencv_highgui opencv_imgproc libyuv )
+ ENDIF (UNIX)
+ 
+ IF(WIN32)
+diff --git a/src/MiscFunctions.cpp b/src/MiscFunctions.cpp
+index c3cd347..ee0fe35 100644
+--- a/src/MiscFunctions.cpp
++++ b/src/MiscFunctions.cpp
+@@ -32,6 +32,7 @@
+ #include <QtGui/QImage>
+ 
+ #include <opencv2/core/core.hpp>
++#include <opencv2/imgproc/imgproc_c.h>
+ #include <opencv2/imgproc/imgproc.hpp>
+ 
+ #include "MiscFunctions.h"
+diff --git a/src/metrics/BaseMetric.cpp b/src/metrics/BaseMetric.cpp
+index a0912c6..029461b 100644
+--- a/src/metrics/BaseMetric.cpp
++++ b/src/metrics/BaseMetric.cpp
+@@ -23,6 +23,8 @@
+ #include <QtCore/QFile>
+ #include <QtCore/QFileInfo>
+ 
++#include <opencv2/imgcodecs/legacy/constants_c.h>
++#include <opencv2/imgproc/imgproc_c.h>
+ #include <opencv2/imgproc/imgproc.hpp>
+ 
+ #include "BaseMetric.h"
+diff --git a/src/metrics/PerLuminanceMetric.cpp b/src/metrics/PerLuminanceMetric.cpp
+index 48fc4ce..5cfb2e5 100644
+--- a/src/metrics/PerLuminanceMetric.cpp
++++ b/src/metrics/PerLuminanceMetric.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QtCore/QDebug>
+ 
++#include <opencv2/imgproc/imgproc_c.h>
+ #include <opencv2/imgproc/imgproc.hpp>
+ 
+ #include "PerLuminanceMetric.h"