diff options
Diffstat (limited to 'extra/opencv/PKGBUILD')
| -rw-r--r-- | extra/opencv/PKGBUILD | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 229c21a0d..cdeadc91c 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170195 2012-11-04 17:25:47Z schiv $ +# $Id: PKGBUILD 170692 2012-11-09 19:50:58Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,22 +6,24 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'gtk2' - 'xine-lib' 'libdc1394' 'openexr') +depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' + 'xine-lib' 'libdc1394' 'openexr' 'gtk2') makedepends=('cmake' 'python2-numpy' 'eigen2') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" - 'pkgconfig.patch') + 'pkgconfig.patch' + 'fsh.patch') md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe' - 'cb916260b5ec594fe7a0cc2e54fc569f') + 'cb916260b5ec594fe7a0cc2e54fc569f' + '35256e3ccace373feba8131d1540a0de') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -36,7 +38,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D WITH_UNICAP=OFF' '-D WITH_PVAPI=OFF' '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' + '-D WITH_TBB=ON' '-D WITH_IPP=OFF' '-D WITH_CUDA=OFF' '-D USE_FAST_MATH=ON') @@ -48,6 +50,10 @@ build() { # see https://bugs.archlinux.org/task/32430 patch -Np1 -i "$srcdir/pkgconfig.patch" + # fix another upstream mess + # see http://code.opencv.org/issues/2512 + patch -Np1 -i "$srcdir/fsh.patch" + cmake ${_cmakeopts[@]} . make @@ -65,10 +71,11 @@ package_opencv() { cd "$pkgdir/usr/share" # separate docs package; also be -R friendly - [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" + [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \ + && rm -r doc # separate samples package - [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples" + [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples" } package_opencv-docs() { @@ -80,7 +87,7 @@ package_opencv-docs() { cd "$srcdir" mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname" + cp -r opencv-doc "$pkgdir/usr/share/doc/$pkgname" # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ @@ -95,8 +102,8 @@ package_opencv-samples() { cd "$srcdir" - mkdir -p "$pkgdir/usr/share/$_realname" - cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples" + mkdir -p "$pkgdir/usr/share/$pkgname" + cp -r opencv-samples "$pkgdir/usr/share/$pkgname/samples" # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ |