diff options
| author | Romain Reignier | 2015-12-02 22:41:07 +0100 |
|---|---|---|
| committer | Romain Reignier | 2015-12-02 22:41:07 +0100 |
| commit | a7856cd1e2e614d2f6c3863491843db663bf357b (patch) | |
| tree | b6d944a8d5bfec4dc77a7003d76e6c3756facce8 | |
| parent | 950088547e7e85778a3c1f82a5962371627e19e1 (diff) | |
| download | aur-a7856cd1e2e614d2f6c3863491843db663bf357b.tar.gz | |
Add armv6h architecture and NEON support for armv7h
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 25 insertions, 7 deletions
@@ -1,12 +1,13 @@ pkgbase = opencv-git pkgdesc = Open Source Computer Vision Library - pkgver = 3.0.0.r1.g424c2bd - pkgrel = 2 + pkgver = 3.0.0.r789.ga0f8645 + pkgrel = 1 url = http://opencv.org/ changelog = ChangeLog arch = i686 arch = x86_64 arch = armv7h + arch = armv6h license = BSD makedepends = git makedepends = cmake @@ -15,7 +16,6 @@ pkgbase = opencv-git makedepends = mesa makedepends = eigen depends = gstreamer0.10-base - depends = intel-tbb depends = openexr depends = xine-lib depends = libdc1394 @@ -31,6 +31,9 @@ pkgbase = opencv-git source = fsh.patch md5sums = SKIP md5sums = 752652494b42fd1532f52b789a85947f + depends_i686 = intel-tbb + depends_x86_64 = intel-tbb + depends_armv7h = intel-tbb pkgname = opencv-git diff --git a/ChangeLog b/ChangeLog index 31f0670fd3e2..523e9886da76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-12-02 Romain Reignier <rom.reignier@gmail.com> + + * 3.0.0.r789.ga0f8645 : + Add armv6h architecture and NEON support for armv7h + 2015-06-10 Valentin Churavy <v.churavy@gmail.com> * 3.0.0.r1.g424c2bd-2 : @@ -1,4 +1,5 @@ # Maintainer: Valentin Churavy <v.churavy@gmail.com> +# Contributor: Romain Reignier <rom.reignier@gmail.com> (ARM support) # Contributor: Fabien Dubosson <fabien.dubosson@gmail.com> # Contributor: David Manouchehri <david@davidmanouchehri.com> # Contributor: CHEN Xing <cxcxcxcx@gmail.com> @@ -9,14 +10,17 @@ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname="opencv-git" -pkgver=3.0.0.r1.g424c2bd -pkgrel=2 +pkgver=3.0.0.r789.ga0f8645 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" url="http://opencv.org/" license=('BSD') -arch=('i686' 'x86_64' 'armv7h') -depends=('gstreamer0.10-base' 'intel-tbb' 'openexr' +arch=('i686' 'x86_64' 'armv7h' 'armv6h') +depends=('gstreamer0.10-base' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext') +depends_x86_64=('intel-tbb') +depends_i686=('intel-tbb') +depends_armv7h=('intel-tbb') makedepends=('git' 'cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen') optdepends=('eigen' 'libcl: For coding with OpenCL' @@ -55,6 +59,12 @@ _cmakeopts=('-D WITH_OPENCL=ON' # all x64 CPUs support SSE2 but not SSE3 [[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF') +# NEON support only for armv7h +[[ "$CARCH" = 'armv7h' ]] && _cmakeopts+=('-D ENABLE_NEON=ON') + +# intel-tbb not available for armv6h +[[ "$CARCH" = 'armv6h' ]] && _cmakeopts+=('-D WITH_TBB=OFF') + pkgver() { cd "${srcdir}/${pkgname%-git}" git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' |