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

[Ray Rashif]

    Date: Saturday, December 3, 2011 @ 04:30:49
  Author: schiv
Revision: 144086

upgpkg: opencv 2.3.1_a-1

upstream release

Modified:
  opencv/trunk/PKGBUILD
Deleted:
  opencv/trunk/opencv.install

----------------+
 PKGBUILD       |   35 ++++++++++++++++++-----------------
 opencv.install |   11 -----------
 2 files changed, 18 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-03 06:33:39 UTC (rev 144085)
+++ PKGBUILD	2011-12-03 09:30:49 UTC (rev 144086)
@@ -5,20 +5,23 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            '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=('827c9f8aa14384c531c73aa165f9b777')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -45,7 +48,7 @@
             '-D USE_FAST_MATH=ON')
 
 build() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
@@ -57,14 +60,12 @@
 }
 
 package_opencv() {
-  install=$pkgname.install
+  cd "$srcdir/$_realname-$_realver"
 
-  cd "$srcdir/$_realname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
@@ -85,8 +86,8 @@
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
+  unset depends
+  unset optdepends
   options=('docs')
 
   cd "$srcdir"
@@ -97,9 +98,9 @@
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
+  depends=('bash')
+  unset optdepends
+  unset options
 
   cd "$srcdir"
 

Deleted: opencv.install
===================================================================
--- opencv.install	2011-12-03 06:33:39 UTC (rev 144085)
+++ opencv.install	2011-12-03 09:30:49 UTC (rev 144086)
@@ -1,11 +0,0 @@
-post_install() {
-	echo "  Documentation and samples are in separate packages:"
-	echo "    * opencv-docs"
-	echo "    * opencv-samples"
-}
-
-post_upgrade() {
-	post_install
-}
-
-# vim:set ts=2 sw=2 et: