diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
commit | b1bde86b7410654132cd3365cc82e2ab7306b5f7 (patch) | |
tree | cdd900b7b62d0bf35c9b980ab71e0474d604bd72 /extra/opencv | |
parent | 6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (diff) | |
parent | 24d0263a0ac516ccc86df09146449fb040fb3689 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gmic/PKGBUILD
community/projectm/PKGBUILD
extra/dvdauthor/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/phonon/PKGBUILD
extra/psiconv/PKGBUILD
extra/pstoedit/PKGBUILD
Diffstat (limited to 'extra/opencv')
-rw-r--r-- | extra/opencv/PKGBUILD | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index b10a02daa..7fbf1ca7d 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168644 2012-10-13 18:33:04Z schiv $ +# $Id: PKGBUILD 169755 2012-10-27 23:42:14Z eric $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,14 +6,14 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3') +makedepends=('cmake' 'python2-numpy' 'eigen2') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' @@ -69,13 +69,6 @@ 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 $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" |