diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
| commit | 28755f91b7986fbd36ec21705a5f941479b6d8f4 (patch) | |
| tree | 760750f64418a6907afcccd916de4a769ed2bc3f /extra/opencv | |
| parent | 7298ba8d13324c20278060c1ff5f63467cef9684 (diff) | |
| parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lazarus/PKGBUILD
extra/msmtp/PKGBUILD
multilib/jack2-multilib/PKGBUILD
testing/glib2/PKGBUILD
testing/lvm2/PKGBUILD
testing/mdadm/PKGBUILD
testing/mdadm/mdadm
testing/mdadm/mdadm_hook
testing/mdadm/mdadm_udev_install
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'extra/opencv')
| -rw-r--r-- | extra/opencv/PKGBUILD | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 1e1f4d581..ac3920d41 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 148866 2012-02-05 11:53:22Z ibiru $ +# $Id: PKGBUILD 158091 2012-05-02 18:12:22Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.3.1_a -_realver=2.3.1 -pkgrel=4 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -20,8 +19,8 @@ optdepends=('opencv-docs' 'eigen2' 'python2-numpy: Python 2.x interface') options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2") -md5sums=('82e4b6bfa349777233eea09b075e931e') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") +md5sums=('1fcda4ed3d0655f033ac30be8bad4882') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -48,7 +47,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D USE_FAST_MATH=ON') build() { - cd "$srcdir/$_realname-$_realver" + cd "$srcdir/$_realname-$pkgver" # x64, i.e "Athlon64" and upwards, can use SSE3 [ $CARCH = x86_64 ] && \ @@ -60,12 +59,12 @@ build() { } package_opencv() { - cd "$srcdir/$_realname-$_realver" + cd "$srcdir/$_realname-$pkgver" make DESTDIR="$pkgdir" install # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$pkgdir/usr/share" @@ -96,7 +95,7 @@ package_opencv-docs() { cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -112,7 +111,7 @@ package_opencv-samples() { cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } |