diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-08-03 15:20:02 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-08-05 00:31:49 +1000 |
| commit | 72cce789f9aec775c89788f1f4210e8b287ec334 (patch) | |
| tree | 5fe1db00318ff1808358ce44f4f973237dbc803f /kde-apps | |
| parent | media-gfx/digikam: Lower opencv dependency (diff) | |
| download | gentoo-72cce789f9aec775c89788f1f4210e8b287ec334.tar.gz gentoo-72cce789f9aec775c89788f1f4210e8b287ec334.tar.bz2 gentoo-72cce789f9aec775c89788f1f4210e8b287ec334.zip | |
kde-apps/libkface: Lower opencv dependency, fix patch for opencv-2.4.12
Arfrever-enhanced method.
Package-Manager: portage-2.2.28
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/libkface/files/libkface-15.08.2-opencv3.patch | 2 | ||||
| -rw-r--r-- | kde-apps/libkface/libkface-15.08.3.ebuild | 4 | ||||
| -rw-r--r-- | kde-apps/libkface/libkface-15.12.3.ebuild | 4 | ||||
| -rw-r--r-- | kde-apps/libkface/libkface-16.04.3.ebuild | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch index e3c73fa4a5fa..02056a0016ea 100644 --- a/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch +++ b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch @@ -422,7 +422,7 @@ dc62c0e0ea55d189d918501cce4d92f4198a1a0c use same OpenCV logic than digiKam and - obj.info()->addParam(obj, "histograms", obj.m_histograms); // modification: Make Read/Write - obj.info()->addParam(obj, "labels", obj.m_labels); // modification: Make Read/Write - obj.info()->addParam(obj, "statistic", obj.m_statisticsMode)); // modification: Add parameter -+#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11) ++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,99) + CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface", + obj.info()->addParam(obj, "radius", obj.m_radius); + obj.info()->addParam(obj, "neighbors", obj.m_neighbors); diff --git a/kde-apps/libkface/libkface-15.08.3.ebuild b/kde-apps/libkface/libkface-15.08.3.ebuild index 1cb4db851a34..662717f2f3fb 100644 --- a/kde-apps/libkface/libkface-15.08.3.ebuild +++ b/kde-apps/libkface/libkface-15.08.3.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" KEYWORDS=" ~amd64 ~x86" IUSE="" -DEPEND=">=media-libs/opencv-3.0.0:=[contrib]" +DEPEND="media-libs/opencv:=[contrib(+)]" RDEPEND="${DEPEND}" PATCHES=( @@ -23,7 +23,7 @@ PATCHES=( src_configure() { local mycmakeargs=( - -DENABLE_OPENCV3=ON + -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) ) kde4-base_src_configure diff --git a/kde-apps/libkface/libkface-15.12.3.ebuild b/kde-apps/libkface/libkface-15.12.3.ebuild index 61d310b6464e..c88875c5f1ff 100644 --- a/kde-apps/libkface/libkface-15.12.3.ebuild +++ b/kde-apps/libkface/libkface-15.12.3.ebuild @@ -19,7 +19,7 @@ DEPEND=" $(add_qt_dep qtsql) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - >=media-libs/opencv-3:=[contrib] + media-libs/opencv:=[contrib(+)] " RDEPEND="${DEPEND}" @@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) src_configure() { local mycmakeargs=( - -DENABLE_OPENCV3=ON + -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) ) kde5_src_configure diff --git a/kde-apps/libkface/libkface-16.04.3.ebuild b/kde-apps/libkface/libkface-16.04.3.ebuild index 6bda88f33590..847d330aa4a4 100644 --- a/kde-apps/libkface/libkface-16.04.3.ebuild +++ b/kde-apps/libkface/libkface-16.04.3.ebuild @@ -19,7 +19,7 @@ DEPEND=" $(add_qt_dep qtsql) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - >=media-libs/opencv-3:=[contrib] + media-libs/opencv:=[contrib(+)] " RDEPEND="${DEPEND}" @@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) src_configure() { local mycmakeargs=( - -DENABLE_OPENCV3=ON + -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) ) kde5_src_configure |