summaryrefslogtreecommitdiff
path: root/extra/opencv/PKGBUILD
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-05-05 19:02:44 +0000
committerroot <root@rshg047.dnsready.net>2011-05-05 19:02:44 +0000
commitef61aa5a9cead170fa18dba44609c32bbf18306a (patch)
tree82af53ec1018f58868b80cdf680a9c4ec5df1538 /extra/opencv/PKGBUILD
parentab1410d33401cf1fc4a384bb0b2d9901c8fe8d14 (diff)
Thu May 5 19:02:44 UTC 2011
Diffstat (limited to 'extra/opencv/PKGBUILD')
-rw-r--r--extra/opencv/PKGBUILD23
1 files changed, 16 insertions, 7 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 80b192193..b909207c7 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')
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 \