From 8d2f4684a5287b89f9a1fc49f84667181ba31ac4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 28 Apr 2015 20:09:04 +0000
Subject: [PATCH] extra/opencv to 2.4.10-2.1

---
 extra/opencv/PKGBUILD | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index a893fc11c..d6f406fb7 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - remove intel-tbb depend
+#  - remove intel-tbb depend for v5 and v6
 #  - remove libcl (opt)depend, disable in cmakeopts
 #
 # ALARM: David Beauchamp <alarm@davidbeauchamp.com>
@@ -12,12 +12,13 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.10
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
 depends=('openexr' 'xine-lib' 'libdc1394' 'gtkglext')
+depends_armv7h=('intel-tbb')
 makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
             'eigen2'
@@ -31,7 +32,6 @@ md5sums=('ec63952d3a3dff965d5fdde765926821'
 
 _cmakeopts=('-D WITH_OPENCL=OFF'
             '-D WITH_OPENGL=ON'
-            '-D WITH_TBB=OFF'
             '-D WITH_XINE=ON'
             '-D WITH_GSTREAMER=OFF'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
@@ -53,6 +53,9 @@ _cmakeopts=('-D WITH_OPENCL=OFF'
 # all x64 CPUs support SSE2 but not SSE3
 [[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
 
+# ARMv7 supports Intel TBB
+[[ "$CARCH" = 'armv7h' ]] && _cmakeopts+=('-D WITH_TBB=ON')
+
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"