Date: Thursday, April 11, 2013 @ 20:36:08 Author: schiv Revision: 182636
upgpkg: opencv 2.4.5-1 upstream release not including doc split anymore please remove -docs manually since it was an optdep Modified: opencv/trunk/PKGBUILD ----------+ PKGBUILD | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-11 17:24:54 UTC (rev 182635) +++ PKGBUILD 2013-04-11 18:36:08 UTC (rev 182636) @@ -5,8 +5,8 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.4 -pkgrel=2 +pkgver=2.4.5 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -18,10 +18,10 @@ optdepends=('opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}a.tar.bz2" +source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' 'fsh.patch') -md5sums=('876dce80ea2648b7e4d4c5a567b4d37b' +md5sums=('8eac87462c7bec8b89021b723207c623' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -29,9 +29,6 @@ '-D WITH_OPENGL=ON' '-D WITH_TBB=ON' '-D WITH_XINE=ON' - '-D ENABLE_SSE=OFF' - '-D ENABLE_SSE2=OFF' - '-D ENABLE_SSE3=OFF' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -43,9 +40,18 @@ '-D CMAKE_INSTALL_PREFIX=/usr' '-D CMAKE_SKIP_RPATH=ON') -build() { - cd "$srcdir/$_realname-$pkgver" +# SSE only available from Pentium 3 onwards (i686 is way older) +[[ "$CARCH" = 'i686' ]] && \ + _cmakeopts+=('-D ENABLE_SSE=OFF' + '-D ENABLE_SSE2=OFF' + '-D ENABLE_SSE3=OFF') +# all x64 CPUs support SSE2 but not SSE3 +[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 # and http://code.opencv.org/issues/1925 @@ -58,19 +64,23 @@ # 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[@]} . make } 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" @@ -85,10 +95,8 @@ unset optdepends unset options - cd "$srcdir" - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" } # vim:set ts=2 sw=2 et: