From 5358d027ffe4743c7d24237e625ebf75ffb74070 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Apr 2013 19:27:35 +0000 Subject: [PATCH] extra/opencv to 2.4.5-1 --- extra/opencv/PKGBUILD | 66 +++++++++++++------------------------------ 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 3a26e85ff..e56be88d4 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -7,9 +7,9 @@ # - remove libcl (opt)depend, disable in cmakeopts pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') +pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') @@ -17,17 +17,15 @@ license=('BSD') url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') -makedepends=('cmake' 'python2-numpy' 'eigen2' - 'opencl-headers' 'mesa' - 'texlive-bin' 'python2-sphinx') # for docs -optdepends=('opencv-docs' - 'opencv-samples' +makedepends=('cmake' 'python2-numpy' 'mesa' + 'opencl-headers' 'eigen2') +optdepends=('opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' 'fsh.patch') -md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' +md5sums=('8eac87462c7bec8b89021b723207c623' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -49,8 +47,8 @@ _cmakeopts=('-D WITH_OPENCL=OFF' '-D CMAKE_INSTALL_PREFIX=/usr' '-D CMAKE_SKIP_RPATH=ON') -build() { - cd "$srcdir/$_realname-$pkgver" +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 @@ -61,9 +59,13 @@ build() { # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" - # python2 compatibility for generating docs - sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + # no longer including docs, see https://bugs.archlinux.org/task/34185 + # python2 compatibility for generating (html) docs + #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake +} +build() { + cd "$srcdir/$pkgname-$pkgver" cmake ${_cmakeopts[@]} . @@ -71,58 +73,28 @@ build() { } package_opencv() { - cd "$srcdir/$_realname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$pkgdir/usr/share" - # separate docs package; also be -R friendly - [[ -d doc ]] && mv doc "$srcdir/opencv-doc" - - # separate samples package + # separate samples package; also be -R friendly [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - # PDFs are not being generated for some reason as of 2.4.4 - # even after adding latex and sphinx deps - # when previously without them there were a couple of good docs installed - - cd "$srcdir" - - # doc dir now includes opencv subdir (looks like they finally listened) - cp -r opencv-doc "$pkgdir/usr/share/doc" - - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - package_opencv-samples() { pkgdesc+=" (samples)" depends=('bash') unset optdepends unset options - cd "$srcdir" - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" - - # Do we really need licenses for these minor splits? - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" } # vim:set ts=2 sw=2 et: