From e96c1ddf506a697a5b107b7d2fcac68168937e3e Mon Sep 17 00:00:00 2001 From: miqlas Date: Fri, 1 Sep 2017 14:03:02 +0200 Subject: [PATCH] Caffe: enable OpenCV (#1611) * enable OpenCV * fix REQS --- dev-libs/caffe/caffe-1.0.recipe | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-libs/caffe/caffe-1.0.recipe b/dev-libs/caffe/caffe-1.0.recipe index 2232da9dc..a5a076f14 100644 --- a/dev-libs/caffe/caffe-1.0.recipe +++ b/dev-libs/caffe/caffe-1.0.recipe @@ -5,7 +5,7 @@ Berkeley Vision and Learning Center (BVLC) and community contributors." HOMEPAGE="http://caffe.berkeleyvision.org/" COPYRIGHT="2014 Randolph Voorhies, Shane Grant" LICENSE="BSD (2-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/BVLC/caffe/archive/$portVersion.tar.gz" CHECKSUM_SHA256="71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f" PATCHES="caffe-$portVersion.patchset" @@ -52,6 +52,10 @@ REQUIRES=" lib:libhdf5$secondaryArchSuffix lib:liblmdb$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix + lib:libopencv_core$secondaryArchSuffix + lib:libopencv_highgui$secondaryArchSuffix + lib:libopencv_imgcodecs$secondaryArchSuffix + lib:libopencv_imgproc$secondaryArchSuffix lib:libprotobuf$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -78,6 +82,10 @@ BUILD_REQUIRES=" devel:libhdf5$secondaryArchSuffix devel:liblmdb$secondaryArchSuffix devel:libopenblas$secondaryArchSuffix + devel:libopencv_core$secondaryArchSuffix + devel:libopencv_highgui$secondaryArchSuffix + devel:libopencv_imgcodecs$secondaryArchSuffix + devel:libopencv_imgproc$secondaryArchSuffix devel:libprotobuf$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -108,7 +116,7 @@ EOF cmake -DCMAKE_INSTALL_PREFIX=$prefix \ -DCMAKE_BUILD_TYPE='Release' \ -DUSE_LEVELDB:BOOL=OFF \ - -DUSE_OPENCV:BOOL=OFF \ + -DUSE_OPENCV:BOOL=ON \ -DCPU_ONLY:BOOL=ON \ -DBUILD_python:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \