Update version 2.2.7 and fix path OpenCV2

3 files changed, 83 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5eb684581ef..9f49d168c03a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,29 @@
 # Generated by mksrcinfo v8
-# Sat Mar  5 00:09:22 UTC 2016
+# Wed May 11 21:51:05 UTC 2016
 pkgbase = saga-gis
 	pkgdesc = A Geographic Information System (GIS) software with immense capabilities for geodata processing and analysis.
-	pkgver = 2.2.5
+	pkgver = 2.2.7
 	pkgrel = 1
 	url = http://www.saga-gis.org
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = wxgtk>=3.0.0
+	depends = webkitgtk2
 	depends = proj
 	depends = gdal
 	depends = libtiff
 	depends = unixodbc
 	depends = jasper
 	depends = swig
-	optdepends = opencv
+	optdepends = opencv2
 	optdepends = vigra
 	optdepends = liblas
 	optdepends = libharu
-	source = http://iweb.dl.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.5/saga_2.2.5.tar.gz
-	md5sums = 1553a967e8859d13bb8878f06a4ea549
+	source = http://iweb.dl.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.7/saga_2.2.7.tar.gz
+	source = fix-opencv-module.patch
+	md5sums = 1b3aee20799b70c584d161dfae0ef354
+	md5sums = b0ddf6378f393cf644ce5d26648ddd17
 
 pkgname = saga-gis
 
diff --git a/PKGBUILD b/PKGBUILD
index 1eb8df21e73f..843730f3d2e1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,25 +6,36 @@
 
 pkgname=saga-gis
 _pkgname=saga
-pkgver=2.2.5
+pkgver=2.2.7
 pkgrel=1
 pkgdesc="A Geographic Information System (GIS) software with immense capabilities for geodata processing and analysis."
 url="http://www.saga-gis.org"
 license=("GPL3")
 arch=('i686' 'x86_64')
 depends=('wxgtk>=3.0.0'
+         'webkitgtk2'
          'proj'
          'gdal'
          'libtiff'
          'unixodbc'
          'jasper'
          'swig')
-optdepends=('opencv'
+optdepends=('opencv2'
             'vigra'
             'liblas'
             'libharu')
-source=("http://iweb.dl.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%20${pkgver}/saga_${pkgver}.tar.gz")
-md5sums=('1553a967e8859d13bb8878f06a4ea549')
+source=("http://iweb.dl.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%20${pkgver}/saga_${pkgver}.tar.gz"
+        "fix-opencv-module.patch")
+md5sums=('1b3aee20799b70c584d161dfae0ef354'
+         'b0ddf6378f393cf644ce5d26648ddd17')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  dos2unix src/modules/imagery/imagery_opencv/opencv_nnet.h
+  dos2unix src/modules/imagery/imagery_opencv/opencv_nnet.cpp
+  # Fix build with opencv (Debian)
+  patch -Np0 -i "${srcdir}/fix-opencv-module.patch"
+}
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -46,7 +57,7 @@ build() {
               LIBS="`wx-config --version=3.0 --libs`"
 
   msg "Start compiling ..."
-  make -j5
+  make -j4
 }
 
 package () {
diff --git a/fix-opencv-module.patch b/fix-opencv-module.patch
new file mode 100644
index 000000000000..b16630b3c2b9
--- /dev/null
+++ b/fix-opencv-module.patch
@@ -0,0 +1,59 @@
+From: Johan Van de Wauw <johan.vandewauw@gmail.com>
+Date: Thu, 9 Jul 2015 17:56:07 +0200
+Subject: Fix opencv module
+
+--- src/modules/imagery/imagery_opencv/Makefile.am	2016-03-23 04:20:48.000000000 -0500
++++ src/modules/imagery/imagery_opencv/Makefile.am.new	2016-05-09 18:21:33.588087593 -0500
+@@ -9,7 +9,7 @@
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS         = -fPIC -shared -avoid-version `pkg-config opencv --libs`
++AM_LDFLAGS         = -fPIC -shared -avoid-version -lopencv_legacy -lopencv_imgproc -lopencv_flann
+ pkglib_LTLIBRARIES = libimagery_opencv.la
+ libimagery_opencv_la_SOURCES =\
+ MLB_Interface.cpp\
+
+
+--- src/modules/imagery/imagery_opencv/opencv.h	2016-03-23 04:20:48.000000000 -0500
++++ src/modules/imagery/imagery_opencv/opencv.h.new	2016-05-09 18:22:31.168375139 -0500
+@@ -74,6 +74,8 @@
+ 
+ //---------------------------------------------------------
+ #include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
++#include <opencv2/imgproc/imgproc_c.h>
+ 
+ 
+ ///////////////////////////////////////////////////////////
+
+
+--- src/modules/imagery/imagery_opencv/opencv_nnet.cpp	2016-04-11 07:29:54.000000000 -0500
++++ src/modules/imagery/imagery_opencv/opencv_nnet.cpp.new	2016-05-09 18:23:19.978619523 -0500
+@@ -60,8 +60,8 @@
+ 
+ //---------------------------------------------------------
+ #include "opencv_nnet.h"
+-#include <opencv/cxcore.h>
+-#include <opencv/ml.h>
++#include "opencv/cxcore.h"
++#include "opencv/ml.h"
+ 
+ ///////////////////////////////////////////////////////////
+ //														 //
+
+
+--- src/modules/imagery/imagery_opencv/opencv_nnet.h	2016-03-23 04:20:48.000000000 -0500
++++ src/modules/imagery/imagery_opencv/opencv_nnet.h.new	2016-05-09 18:24:09.478867946 -0500
+@@ -64,8 +64,8 @@
+ 
+ //---------------------------------------------------------
+ #include "MLB_Interface.h"
+-#include <opencv/cxcore.h>
+-#include <opencv/ml.h>
++#include "opencv/cxcore.h"
++#include "opencv/ml.h"
+ 
+ ///////////////////////////////////////////////////////////
+ //														 //
+