From 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 23 Oct 2012 01:37:15 -0700
Subject: Tue Oct 23 01:37:02 PDT 2012

---
 staging/opencv/PKGBUILD | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to 'staging/opencv')

diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
index 5d569a314..ed87a8d3d 100644
--- a/staging/opencv/PKGBUILD
+++ b/staging/opencv/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 161376 2012-06-10 12:41:40Z schiv $
+# $Id: PKGBUILD 169516 2012-10-22 21:28:51Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.4.2
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+url="http://opencv.org/"
+depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
+         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
+makedepends=('cmake' 'python2-numpy' 'eigen2')
 optdepends=('opencv-docs'
             'opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
-md5sums=('144aafa12260150490ce77d8debc1a23')
+md5sums=('059ef86fc1724d69b75832a0d2929ff5')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -69,18 +69,11 @@ package_opencv() {
 
   cd "$pkgdir/usr/share"
 
-  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
-
   # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
+  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
 
   # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
+  [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
@@ -92,7 +85,7 @@ package_opencv-docs() {
   cd "$srcdir"
 
   mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname"
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
@@ -107,8 +100,8 @@ package_opencv-samples() {
 
   cd "$srcdir"
 
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+  mkdir -p "$pkgdir/usr/share/$_realname"
+  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-- 
cgit v1.2.3-54-g00ecf