diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-14 15:27:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-14 15:27:23 -0300 |
| commit | a594ebe149ad81798984a410c036a0965df1581a (patch) | |
| tree | 9f92df878175fe438860b196b7394ec8f0bac4cd /extra/opencv/PKGBUILD | |
| parent | 03d128385c4ca773e67c93729a45899590d0d99e (diff) | |
| parent | d525d9a731f5d79c1128a192b9d2977a2967570f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/codeblocks/PKGBUILD
community/gnash/PKGBUILD
community/i3lock/PKGBUILD
community/instead/PKGBUILD
extra/asio/PKGBUILD
extra/cups/PKGBUILD
extra/libdrm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/ocrad/PKGBUILD
extra/qtiplot/PKGBUILD
extra/scribus/PKGBUILD
extra/xdg-user-dirs/PKGBUILD
Diffstat (limited to 'extra/opencv/PKGBUILD')
| -rw-r--r-- | extra/opencv/PKGBUILD | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index a677f6969..068e5c9b0 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189712 2013-07-05 15:55:50Z schiv $ +# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.6 +pkgver=2.4.6.1 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') @@ -24,10 +24,12 @@ if [ "$CARCH" != "mips64el" ]; then fi source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' - 'fsh.patch') -md5sums=('c5e8758a419b4f258611b17fc83aafaf' + 'fsh.patch' + 'cldetect.patch') +md5sums=('d756bfa460891697571d5c90050e1cfe' 'cb916260b5ec594fe7a0cc2e54fc569f' - '35256e3ccace373feba8131d1540a0de') + '35256e3ccace373feba8131d1540a0de' + '0dd6572405adc2387ded4c95be0f189c') if [ "$CARCH" != "mips64el" ]; then _cmakeopts=('-D WITH_OPENCL=ON' @@ -38,7 +40,6 @@ fi _cmakeopts+=( '-D WITH_OPENGL=ON' '-D WITH_XINE=ON' - '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' '-D BUILD_PERF_TESTS=OFF' @@ -61,6 +62,11 @@ _cmakeopts+=( prepare() { cd "$srcdir/$pkgname-$pkgver" + # fix missing opencl module + # see https://bugs.archlinux.org/task/36076 + # and http://code.opencv.org/issues/3140 + patch -Np1 -i "$srcdir/cldetect.patch" + # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 # and http://code.opencv.org/issues/1925 |