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

[Ray Rashif]

    Date: Friday, July 6, 2012 @ 23:02:09
  Author: schiv
Revision: 163097

upgpkg: opencv 2.4.2-1

upstream release

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-07 02:43:05 UTC (rev 163096)
+++ PKGBUILD	2012-07-07 03:02:09 UTC (rev 163097)
@@ -5,12 +5,12 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
-url="http://opencv.willowgarage.com/"
+url="http://opencv.org/"
 depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
@@ -20,7 +20,7 @@
             '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'
@@ -70,17 +70,17 @@
   cd "$pkgdir/usr/share"
 
   # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
+  #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,11 +92,11 @@
   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" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "$pkgdir/usr/share/licenses/$_realname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -107,12 +107,12 @@
 
   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" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "$pkgdir/usr/share/licenses/$_realname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: