summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-11-26 13:17:26 +0100
committerMichael Palimaka <kensington@gentoo.org>2016-11-27 05:04:32 +1100
commit477212f2d5063ef80d401d94ea2f68bb402a7e3d (patch)
tree673c96ef67ce134846345211bf0923415a6e3718 /kde-apps/libkface/libkface-16.08.3.ebuild
parentmedia-video/vlc: Drop USE=media-library, fix some ALSA issues (diff)
downloadgentoo-477212f2d5063ef80d401d94ea2f68bb402a7e3d.tar.gz
gentoo-477212f2d5063ef80d401d94ea2f68bb402a7e3d.tar.bz2
gentoo-477212f2d5063ef80d401d94ea2f68bb402a7e3d.zip
kde-apps/libkface: Fix build with >=media-libs/opencv-3.1.0-r6
media-libs/opencv-3.1.0-r6 is using a contrib snapshot from git master breaking API. Gentoo-bug: 600238 Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-apps/libkface/libkface-16.08.3.ebuild')
-rw-r--r--kde-apps/libkface/libkface-16.08.3.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/kde-apps/libkface/libkface-16.08.3.ebuild b/kde-apps/libkface/libkface-16.08.3.ebuild
index ea2fa9551b2c..5ae95e4dc7ed 100644
--- a/kde-apps/libkface/libkface-16.08.3.ebuild
+++ b/kde-apps/libkface/libkface-16.08.3.ebuild
@@ -19,11 +19,12 @@ DEPEND="
$(add_qt_dep qtsql)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
- media-libs/opencv:=[contrib(+)]
+ media-libs/opencv:=
+ || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] )
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.08.3-opencv3.2-gentoo-3.1.patch" ) # not upstreamable like that
src_configure() {
local mycmakeargs=(