summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Anderson2018-10-17 02:40:05 +0100
committerAndrew Anderson2018-10-17 02:40:05 +0100
commitd0e1e8a34b7ea83931d3a7556eb5d25e3d55134a (patch)
tree63b1d7661db4c752badeccb28a5961962ddf332f
parent9c1bbe9298a687e12a370c5e980ee389b4d5270e (diff)
downloadaur-d0e1e8a34b7ea83931d3a7556eb5d25e3d55134a.tar.gz
Opencv
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab8b631eed5e..f43b6950d10c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe-opencl-slim-git
pkgdesc = A slimmed-down build of Caffe based on caffe-opencl-git
pkgver = 1.0
- pkgrel = 28
+ pkgrel = 29
url = http://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
@@ -32,6 +32,7 @@ pkgbase = caffe-opencl-slim-git
depends = opencl-headers
depends = openblas-lapack
depends = viennacl
+ depends = opencv
provides = caffe
conflicts = caffe
conflicts = caffe-git
diff --git a/PKGBUILD b/PKGBUILD
index 6094e8a1b6ed..e8a10b3af534 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=caffe-opencl-slim-git
_srcname=caffe
pkgver=1.0
-pkgrel=28
+pkgrel=29
pkgdesc="A slimmed-down build of Caffe based on caffe-opencl-git"
arch=('x86_64')
url="http://caffe.berkeleyvision.org/"
@@ -13,7 +13,7 @@ depends=(
'python-matplotlib' 'ipython' 'python-networkx' 'python-nose'
'python-pandas' 'python-dateutil' 'python-protobuf' 'python-gflags'
'python-yaml' 'python-pillow' 'python-six' 'opencl-driver' 'ocl-icd' 'opencl-headers'
- 'openblas-lapack' 'viennacl'
+ 'openblas-lapack' 'viennacl' 'opencv'
)
makedepends=('cmake')
provides=('caffe')
@@ -64,7 +64,7 @@ prepare() {
-DBUILD_matlab=OFF \
-DBUILD_docs=OFF \
-DBUILD_python_layer=OFF \
- -DUSE_OPENCV=OFF \
+ -DUSE_OPENCV=ON \
-DUSE_LEVELDB=OFF \
-DUSE_LMDB=OFF \
-DUSE_HDF5=ON \