extra/opencv to 2.4.7-2

extra/opencv/PKGBUILD

@@ -9,15 +9,14 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base'
-         'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa'
-             'opencl-headers' 'eigen2')
+depends=('gstreamer0.10-base' 'openexr'
+         'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
@@ -78,6 +77,8 @@ build() {
 }
 
 package_opencv() {
+  options=('staticlibs')
+
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
@@ -89,14 +90,17 @@ package_opencv() {
   cd "$pkgdir/usr/share"
 
   # separate samples package; also be -R friendly
-  [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples"
+  if [[ -d $pkgname/samples ]]; then
+    mv $pkgname/samples "$srcdir/opencv-samples"
+  elif [[ -d $_realname ]]; then
+    warn "Directory naming issue; samples package may not be built!"
+  fi
 }
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=('bash')
+  depends=("opencv=$pkgver") # sample codes change with lib/API
   unset optdepends
-  unset options
 
   mkdir -p "$pkgdir/usr/share/opencv"
   cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"