[arch-commits] Commit in opencv/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Wednesday, March 9, 2016 @ 08:42:55
  Author: bpiotrowski
Revision: 261236

upgpkg: opencv 3.1.0-2

bring back contrib modules

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-08 23:05:16 UTC (rev 261235)
+++ PKGBUILD	2016-03-09 07:42:55 UTC (rev 261236)
@@ -5,7 +5,7 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -17,9 +17,10 @@
             'libcl: For coding with OpenCL'
             'python-numpy: Python 3 interface'
             'python2-numpy: Python 2 interface')
-#source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip")
-source=("$pkgbase-$pkgver::https://github.com/Itseez/opencv/archive/$pkgver.zip")
-md5sums=('6082ee2124d4066581a7386972bfd52a')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"
+        "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
+md5sums=('6082ee2124d4066581a7386972bfd52a'
+         'a822839ad3ab79ff837c16785ea9dd10')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -46,7 +47,9 @@
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  cmake ${_cmakeopts[@]} .
+  cmake ${_cmakeopts[@]} \
+    -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+    .
 
   make
 }