diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /extra/opencv/PKGBUILD | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'extra/opencv/PKGBUILD')
| -rw-r--r-- | extra/opencv/PKGBUILD | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index faafa575d..b90751d34 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109758 2011-02-12 15:04:53Z schiv $ +# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=opencv _realname=OpenCV pkgver=2.2.0 -pkgrel=3 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -18,18 +18,19 @@ optdepends=('eigen' 'python2-numpy') options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 - ptrcvcapture.patch) + ptrcvcapture.patch + gcc46.patch + v4l_2.6.38.patch) md5sums=('122c9ac793a46854ef2819fedbbd6b1b' - '461a8b1b0f2264521e13d9ae051d13be') + '461a8b1b0f2264521e13d9ae051d13be' + 'b5fb8d6786578ae7bf272615279e8865' + '82c8a8a76275acd4a73a4f8e948c3f78') build() { cd "$srcdir/$_realname-$pkgver" # Please do not remove any patches from trunk # - # libpng 1.4 compatibility - #patch -Np1 -i "$srcdir/libpng-1.4.patch" - # fix v4l issue #patch -Np0 -i "$srcdir/v4l-mmap.patch" @@ -41,6 +42,14 @@ build() { # see https://bugs.archlinux.org/task/22841 patch -Np0 -i "$srcdir/ptrcvcapture.patch" + # gcc 4.6 compatibility + # see https://bugs.archlinux.org/task/23741 + patch -Np3 -i "$srcdir/gcc46.patch" + + # distro kernel no longer has v4l1 + # see https://bugs.archlinux.org/task/23826 + patch -Np1 -i "$srcdir/v4l_2.6.38.patch" + cmake . -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ |