summaryrefslogtreecommitdiff
path: root/libre/opencv
diff options
context:
space:
mode:
Diffstat (limited to 'libre/opencv')
-rw-r--r--libre/opencv/PKGBUILD12
1 files changed, 8 insertions, 4 deletions
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 6d77971e4..f1a4fb1af 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 261317 2016-03-11 06:55:20Z bpiotrowski $
+# $Id: PKGBUILD 282836 2016-12-05 09:59:13Z lcarlier $
# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
@@ -8,7 +8,7 @@
pkgbase=opencv
pkgname=opencv
pkgver=3.1.0
-pkgrel=3.parabola1
+pkgrel=6.parabola1
pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
arch=('i686' 'x86_64' 'armv7h')
license=('BSD')
@@ -17,16 +17,17 @@ depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
optdepends=('opencv-samples'
'eigen'
- 'libcl: For coding with OpenCL'
+ 'opencl-icd-loader: For coding with OpenCL'
'python-numpy: Python 3 interface'
'python2-numpy: Python 2 interface')
mksource=("$pkgbase-$pkgver.zip::https://github.com/Itseez/opencv/archive/$pkgver.zip"
"opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip"
- '5852.patch')
+ "opencv-gcc6.patch::https://github.com/mshabunin/opencv/commit/a0fdc91a.patch" '5852.patch')
mkmd5sums=('6082ee2124d4066581a7386972bfd52a'
'a822839ad3ab79ff837c16785ea9dd10')
md5sums=('5e3c409fa9f1beeda5ba5edfcf02a921'
+ '4dacea7866d28014939a652f268cc7c1'
'5bd9cd736b171c15cedee3a32a0c47ff')
_cmakeopts=('-D WITH_OPENCL=ON'
@@ -78,6 +79,9 @@ prepare() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 -i "$srcdir/5852.patch"
+
+ # fix build with GCC 6
+ patch -p1 -i "$srcdir/opencv-gcc6.patch"
}
build() {