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

[Ray Rashif]

    Date: Thursday, November 14, 2013 @ 22:29:37
  Author: schiv
Revision: 199536

upgpkg: opencv 2.4.7-2

reintroduce static libs; closes FS#37754
needed for new opencv_ts requirement
opencl headers are now in-tree
libcl is now truly optional (dynamically supported)
fix dir detection as previous conditional could return 1

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-14 19:03:14 UTC (rev 199535)
+++ PKGBUILD	2013-11-14 21:29:37 UTC (rev 199536)
@@ -4,18 +4,19 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
+_realname=OpenCV
 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' 'intel-tbb' 'libcl'
-         'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa'
-             'opencl-headers' 'eigen2')
+depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
+         'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
             'eigen2'
+            'libcl: For coding with OpenCL'
             'python2-numpy: Python 2.x interface')
 source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
         'pkgconfig.patch'
@@ -74,6 +75,8 @@
 }
 
 package_opencv() {
+  options=('staticlibs')
+
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
@@ -85,14 +88,17 @@
   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"