updated to 2.4.13.3

3 files changed, 15 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ec4eb626da3..5143f046cf9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencv2
 	pkgdesc = Open Source Computer Vision Library (Legacy Version)
-	pkgver = 2.4.13
+	pkgver = 2.4.13.3
 	pkgrel = 1
 	url = http://opencv.org/
 	arch = i686
@@ -9,7 +9,6 @@ pkgbase = opencv2
 	makedepends = cmake
 	makedepends = python2-numpy
 	makedepends = mesa
-	makedepends = eigen2
 	depends = intel-tbb
 	depends = openexr
 	depends = xine-lib
@@ -19,10 +18,8 @@ pkgbase = opencv2
 	optdepends = eigen2
 	optdepends = libcl: For coding with OpenCL
 	optdepends = python2-numpy: Python 2.x interface
-	source = opencv-2.4.13.zip::https://github.com/Itseez/opencv/archive/2.4.13.zip
-	source = opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
-	md5sums = 886b0c511209b2f3129649928135967c
-	md5sums = aebe7878a572a2dc26a434bf08b8d851
+	source = 2.4.13.3.zip::https://codeload.github.com/opencv/opencv/zip/2.4.13.3
+	sha256sums = 838a2ef5821db868f71c26e248427d7be9f35f2fb996acd1b973150c8dd11656
 
 pkgname = opencv2
 	conflicts = opencv
@@ -30,6 +27,6 @@ pkgname = opencv2
 
 pkgname = opencv2-samples
 	pkgdesc = Open Source Computer Vision Library (Legacy Version) (samples)
-	depends = opencv2=2.4.13
+	depends = opencv2=2.4.13.3
 	conflicts = opencv-samples
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fda6a1c1c18..388ea1f52ab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Joshua Schüler <joshua.schueler at gmail dotcom>
+# Maintainer: Johannes Janosovits <johannes@walnutempire.de>
+# Contributor: Joshua Schüler <joshua.schueler at gmail dotcom>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -40,23 +41,21 @@ _FORCE_AVX2=OFF
 _pkgbase=opencv
 pkgbase=opencv2
 pkgname=('opencv2' 'opencv2-samples')
-pkgver=2.4.13
+pkgver=2.4.13.3
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library (Legacy Version)"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
 depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+makedepends=('cmake' 'python2-numpy' 'mesa')
 optdepends=('opencv-samples'
             'eigen2'
             'libcl: For coding with OpenCL'
             'python2-numpy: Python 2.x interface')
 
-source=("$_pkgbase-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
-        "opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch")
-md5sums=('886b0c511209b2f3129649928135967c'
-         'aebe7878a572a2dc26a434bf08b8d851')
+source=("$pkgver.zip::https://codeload.github.com/opencv/opencv/zip/$pkgver")
+sha256sums=('838a2ef5821db868f71c26e248427d7be9f35f2fb996acd1b973150c8dd11656')
 
 _cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc don't play along yet
             '-D WITH_OPENCL=ON'
@@ -89,18 +88,14 @@ _cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc
                "-D ENABLE_AVX=$_FORCE_AVX"
                "-D ENABLE_AVX2=$_FORCE_AVX2")
 
-prepare() {
-  cd $_pkgbase-$pkgver
-# Patch for gcc 6
-# See https://github.com/Itseez/opencv/issues/6517
-  patch -p1 -i ../opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
-}
-
 build() {
   cd "$srcdir/$_pkgbase-$pkgver"
+  mkdir -p build
+  cd build
 
-  cmake ${_cmakeopts[@]} .
+  cmake ${_cmakeopts[@]} ..
 
+  # change this to i. e. make -j16 if your CPUs have 16 threads to speed up build process
   make
 }
 
@@ -108,7 +103,7 @@ package_opencv2() {
   options=('staticlibs')
   conflicts=('opencv')
 
-  cd "$srcdir/$_pkgbase-$pkgver"
+  cd "$srcdir/$_pkgbase-$pkgver/build"
 
   make DESTDIR="$pkgdir" install
 
diff --git a/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch b/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
deleted file mode 100644
index e2a999ea1e11..000000000000
--- a/opencv_a0fdc91a14f07de25d858037940fcd3ba859b4e2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 243fb4c..a2df014 100644
---- a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
-         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-         OUTPUT_VARIABLE gcc_compiler_version)
-     #MESSAGE("GCC Version: ${gcc_compiler_version}")
--    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
-         SET(PCHSupport_FOUND TRUE)
-     ENDIF()
-