drop opencv-3.1-support.patch

2 files changed, 9 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12a975b82e17..cddb8661b431 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libkface-git
 	pkgdesc = A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures
-	pkgver = r779.bc1cebf
+	pkgver = r780.ec6e823
 	pkgrel = 1
 	url = http://www.kde.org
 	arch = i686
@@ -17,9 +17,7 @@ pkgbase = libkface-git
 	provides = libkface
 	conflicts = libkface
 	source = libkface::git+git://anongit.kde.org/libkface
-	source = opencv-3.1-support.patch
 	md5sums = SKIP
-	md5sums = 7bf2ad08a02167a149201ec39f25e7b8
 
 pkgname = libkface-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e5e0efda3d74..eb429d9fdbcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Dany Martineau <dany.luc.martineau at gmail.com>
 
 pkgname=libkface-git
-pkgver=r779.bc1cebf
+pkgver=r780.ec6e823
 pkgrel=1
 pkgdesc='A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures'
 arch=('i686' 'x86_64')
@@ -15,10 +15,8 @@ makedepends=('git' 'extra-cmake-modules-git' 'kdoctools')
 conflicts=('libkface')
 provides=('libkface')
 groups=('digikamsc-git')
-source=('libkface::git+git://anongit.kde.org/libkface'
-	'opencv-3.1-support.patch')
-md5sums=('SKIP'
-	 '7bf2ad08a02167a149201ec39f25e7b8')
+source=('libkface::git+git://anongit.kde.org/libkface')
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/libkface"
@@ -30,16 +28,15 @@ if [[ -d "${srcdir}/build" ]]; then
       msg "Cleaning the previous build directory..."
       rm -rf "${srcdir}/build"
   fi
-  cp -r  "${srcdir}/libkface" "${srcdir}/build"
+  mkdir "${srcdir}/build"
 }
 
 build() {
   cd "${srcdir}/build"
-  patch -p1 -i "$srcdir/opencv-3.1-support.patch"
-  cmake . -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DLIB_INSTALL_DIR=lib \
-                -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+  cmake "${srcdir}/libkface" -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DLIB_INSTALL_DIR=lib \
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
                 -DBUILD_TESTING=OFF -DENABLE_OPENCV3=ON
   make
 }