diff options
Diffstat (limited to 'extra/opencv/PKGBUILD')
| -rw-r--r-- | extra/opencv/PKGBUILD | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index c2c60c5a9..a80077d40 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $ +# $Id: PKGBUILD 199540 2013-11-15 08:46:07Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.6.1 -pkgrel=3 +pkgver=2.4.7 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' - 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') -makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2') +depends=('gstreamer0.10-base' 'intel-tbb' 'openexr' + 'xine-lib' 'libdc1394' 'gtkglext') +makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2') optdepends=('opencv-samples' 'eigen2' + 'libcl: For coding with OpenCL' 'python2-numpy: Python 2.x interface') source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' - 'fsh.patch' - 'cldetect.patch') -md5sums=('d756bfa460891697571d5c90050e1cfe' - 'cb916260b5ec594fe7a0cc2e54fc569f' - '35256e3ccace373feba8131d1540a0de' - '0dd6572405adc2387ded4c95be0f189c') + 'fsh.patch') +md5sums=('33a12a8bba6e6dc32c97298c99b083b2' + 'c7cea48ed7d4f729ebdb9673bac41bd3' + 'c597598d142dd34d0eb4af7d6e9779d8') _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' @@ -53,18 +51,14 @@ _cmakeopts=('-D WITH_OPENCL=ON' prepare() { cd "$srcdir/$pkgname-$pkgver" - # fix missing opencl module - # see https://bugs.archlinux.org/task/36076 - # and http://code.opencv.org/issues/3140 - patch -Np1 -i "$srcdir/cldetect.patch" - - # fix pkg-config mess + # hack-fix pkg-config mess # see https://bugs.archlinux.org/task/32430 # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess that they won't fix + # hack-fix folder naming inconsistency that they won't fix # see http://code.opencv.org/issues/2512 + # and https://bugs.archlinux.org/task/32342 patch -Np1 -i "$srcdir/fsh.patch" # no longer including docs, see https://bugs.archlinux.org/task/34185 @@ -81,6 +75,8 @@ build() { } package_opencv() { + options=('staticlibs') + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install @@ -92,14 +88,17 @@ package_opencv() { cd "$pkgdir/usr/share" # separate samples package; also be -R friendly - [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" + if [[ -d $pkgname/samples ]]; then + mv $pkgname/samples "$srcdir/opencv-samples" + elif [[ -d $_realname ]]; then + warn "Directory naming issue; samples package may not be built!" + fi } package_opencv-samples() { pkgdesc+=" (samples)" - depends=('bash') + depends=("opencv=$pkgver") # sample codes change with lib/API unset optdepends - unset options mkdir -p "$pkgdir/usr/share/opencv" cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" |