diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-28 23:14:35 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-28 23:14:35 +0000 |
| commit | 57fc7b041fcd8bc73a40cd31d3b80bed779e79fe (patch) | |
| tree | 63093bd8fb4def305b25e47e4b42dcf50e1c8b45 /extra/opencv | |
| parent | a4c358009dd89183b4124505c694ea7f5fcdbeec (diff) | |
Sun Aug 28 23:14:35 UTC 2011
Diffstat (limited to 'extra/opencv')
| -rw-r--r-- | extra/opencv/PKGBUILD | 30 | ||||
| -rw-r--r-- | extra/opencv/opencv.install | 7 |
2 files changed, 18 insertions, 19 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 893bb15dc..f2bf421bf 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $ +# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z 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.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') @@ -17,10 +17,8 @@ makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') optdepends=('python2-numpy: Python 2.x interface' 'eigen2') options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2" - 'pypkgpath_nondebian.patch') -md5sums=('dea5e9df241ac37f4439da16559e420d' - 'eb884bad665047276e80556e44043a43') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -49,9 +47,6 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' build() { cd "$srcdir/$_realname-$pkgver" - # fix upstream's assumption of "debian-based" - patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch" - # x64, i.e "Athlon64" and upwards, can use SSE3 [ $CARCH = x86_64 ] && \ _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} @@ -72,18 +67,24 @@ package_opencv() { install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + 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 "$pkgdir/usr/share/opencv/doc" ] && \ - mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" # separate samples package - [ -d "$pkgdir/usr/share/opencv/samples" ] && \ - mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" } package_opencv-docs() { pkgdesc+=" (documentation)" - #arch=('any') depends=() optdepends=() options=('docs') @@ -96,7 +97,6 @@ package_opencv-docs() { package_opencv-samples() { pkgdesc+=" (samples)" - #arch=('any') depends=() optdepends=() options=() diff --git a/extra/opencv/opencv.install b/extra/opencv/opencv.install index 7709a9cc3..ae3f50d5c 100644 --- a/extra/opencv/opencv.install +++ b/extra/opencv/opencv.install @@ -1,8 +1,7 @@ post_install() { - echo "==> Documentation and samples are in separate packages:" - echo - echo "* opencv-docs" - echo "* opencv-samples" + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" } post_upgrade() { |