summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2017-10-09 16:41:45 +0200
committerAmy Liffey <amynka@gentoo.org>2017-10-09 16:54:34 +0200
commit57e183e7915fe6ee5cefb822b6daf06baf5dc790 (patch)
tree00ee73e8b109694aed9168f31503f05fbef9e63b /media-libs/opencv
parentdev-perl/Data-FormValidator: Bump to version 4.880.0 (diff)
downloadgentoo-57e183e7915fe6ee5cefb822b6daf06baf5dc790.tar.gz
gentoo-57e183e7915fe6ee5cefb822b6daf06baf5dc790.tar.bz2
gentoo-57e183e7915fe6ee5cefb822b6daf06baf5dc790.zip
media-libs/opencv: fix protobuf dnn module bug #631418
Suggested-by: Hanno Meyer-Thurow (geki) <h.mth@web.de> Suggested-by: Dennis Schridde <devurandom@gmx.net> Suggested-by: Magnus Kessler <Magnus.Kessler@gmx.net> Suggested-by: zappel@simple-co.de Closes: https://bugs.gentoo.org/631418 Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'media-libs/opencv')
-rw-r--r--media-libs/opencv/opencv-3.3.0-r2.ebuild (renamed from media-libs/opencv/opencv-3.3.0-r1.ebuild)6
1 files changed, 6 insertions, 0 deletions
diff --git a/media-libs/opencv/opencv-3.3.0-r1.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
index eaa25d8ec26b..a6a2298e02cc 100644
--- a/media-libs/opencv/opencv-3.3.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r2.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
+ dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contrib_hdf? ( sci-libs/hdf5 )
@@ -277,6 +278,11 @@ multilib_src_configure() {
# ===================================================
-DBUILD_PACKAGE=OFF
# ===================================================
+ # Not building protobuf but update files bug #631418
+ # ===================================================
+ -DBUILD_PROTOBUF=OFF
+ -DPROTOBUF_UPDATE_FILES=ON
+ # ===================================================
# things we want to be hard enabled not worth useflag
# ===================================================
-DCMAKE_SKIP_RPATH=ON