summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Anderson2018-11-27 09:58:10 +0000
committerAndrew Anderson2018-11-27 09:58:10 +0000
commit9e4634aa192092e854dba35053f4a71a38e4a1d0 (patch)
treeadfc38d01207ca241468432329ef263f358e008f
parentab31a3834350ec0ba9badf68e0540e7192116e59 (diff)
downloadaur-9e4634aa192092e854dba35053f4a71a38e4a1d0.tar.gz
Update opencv dep
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07c0d8e7a4af..7ee71c8c5b08 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 = 31
+ pkgrel = 32
url = http://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
@@ -31,7 +31,7 @@ pkgbase = caffe-opencl-slim-git
depends = ocl-icd
depends = opencl-headers
depends = openblas-lapack
- depends = opencv
+ depends = opencv<4.0.0
depends = viennacl
provides = caffe
conflicts = caffe
diff --git a/PKGBUILD b/PKGBUILD
index c7a40ec66ec8..1e864584b23c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=caffe-opencl-slim-git
_srcname=caffe
pkgver=1.0
-pkgrel=31
+pkgrel=32
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' 'opencv' 'viennacl'
+ 'openblas-lapack' 'opencv<4.0.0' 'viennacl'
)
makedepends=('cmake')
provides=('caffe')