modules

1 files changed, 9 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e4c1894e0056..ce7cca19fb1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,10 @@ url="http://opencv.org/"
 options=('!buildflags' 'staticlibs' '!strip')
 depends=('mingw-w64-crt' 'mingw-w64-jasper' 'mingw-w64-libpng' 'mingw-w64-libjpeg-turbo' 'mingw-w64-libtiff' 'mingw-w64-zlib' 'mingw-w64-openexr' 'mingw-w64-libwebp')
 makedepends=('mingw-w64-cmake' 'mingw-w64-eigen')
-source=("https://github.com/Itseez/opencv/archive/${pkgver}.tar.gz")
-md5sums=('a43b65488124ba33dde195fea9041b70')
+source=("https://github.com/Itseez/opencv/archive/${pkgver}.tar.gz"
+        "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
+md5sums=('a43b65488124ba33dde195fea9041b70'
+         'd7d50c70c31df3b31310f548f31fd2a2')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -20,6 +22,7 @@ _cmakeopts=('-DCMAKE_SKIP_RPATH=ON'
             '-DBUILD_DOCS=OFF'
             '-DBUILD_opencv_apps=OFF'
             '-DWITH_FFMPEG=OFF'
+            '-DWITH_GSTREAMER=OFF'
             '-DWITH_OPENCL=OFF'
             '-DINSTALL_C_EXAMPLES=OFF'
             '-DINSTALL_PYTHON_EXAMPLES=OFF'
@@ -47,7 +50,9 @@ build() {
   cd "$srcdir/opencv-$pkgver"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake ${_cmakeopts[@]} ..
+    ${_arch}-cmake ${_cmakeopts[@]} \
+      -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+      ..
     make
     popd
 #     mkdir -p build-${_arch}-static && pushd build-${_arch}-static
@@ -65,7 +70,7 @@ package() {
 #     make DESTDIR="$pkgdir" install
     cd "$srcdir/opencv-$pkgver/build-${_arch}"
     make DESTDIR="$pkgdir" install
-    rm -r  "$pkgdir"/usr/${_arch}/share/
+    rm -r "$pkgdir"/usr/${_arch}/share/
     install -d "$pkgdir"/usr/${_arch}/lib/pkgconfig
     install -m644 "$srcdir"/opencv-$pkgver/build-${_arch}/unix-install/opencv.pc \
       "$pkgdir"/usr/${_arch}/lib/pkgconfig/