| 1 |
commit: 72cce789f9aec775c89788f1f4210e8b287ec334 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 3 13:20:02 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 14:31:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72cce789 |
| 7 |
|
| 8 |
kde-apps/libkface: Lower opencv dependency, fix patch for opencv-2.4.12 |
| 9 |
|
| 10 |
Arfrever-enhanced method. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
kde-apps/libkface/files/libkface-15.08.2-opencv3.patch | 2 +- |
| 15 |
kde-apps/libkface/libkface-15.08.3.ebuild | 4 ++-- |
| 16 |
kde-apps/libkface/libkface-15.12.3.ebuild | 4 ++-- |
| 17 |
kde-apps/libkface/libkface-16.04.3.ebuild | 4 ++-- |
| 18 |
4 files changed, 7 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch |
| 21 |
index e3c73fa..02056a0 100644 |
| 22 |
--- a/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch |
| 23 |
+++ b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch |
| 24 |
@@ -422,7 +422,7 @@ dc62c0e0ea55d189d918501cce4d92f4198a1a0c use same OpenCV logic than digiKam and |
| 25 |
- obj.info()->addParam(obj, "histograms", obj.m_histograms); // modification: Make Read/Write |
| 26 |
- obj.info()->addParam(obj, "labels", obj.m_labels); // modification: Make Read/Write |
| 27 |
- obj.info()->addParam(obj, "statistic", obj.m_statisticsMode)); // modification: Add parameter |
| 28 |
-+#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11) |
| 29 |
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,99) |
| 30 |
+ CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface", |
| 31 |
+ obj.info()->addParam(obj, "radius", obj.m_radius); |
| 32 |
+ obj.info()->addParam(obj, "neighbors", obj.m_neighbors); |
| 33 |
|
| 34 |
diff --git a/kde-apps/libkface/libkface-15.08.3.ebuild b/kde-apps/libkface/libkface-15.08.3.ebuild |
| 35 |
index 1cb4db8..662717f 100644 |
| 36 |
--- a/kde-apps/libkface/libkface-15.08.3.ebuild |
| 37 |
+++ b/kde-apps/libkface/libkface-15.08.3.ebuild |
| 38 |
@@ -13,7 +13,7 @@ LICENSE="GPL-2" |
| 39 |
KEYWORDS=" ~amd64 ~x86" |
| 40 |
IUSE="" |
| 41 |
|
| 42 |
-DEPEND=">=media-libs/opencv-3.0.0:=[contrib]" |
| 43 |
+DEPEND="media-libs/opencv:=[contrib(+)]" |
| 44 |
RDEPEND="${DEPEND}" |
| 45 |
|
| 46 |
PATCHES=( |
| 47 |
@@ -23,7 +23,7 @@ PATCHES=( |
| 48 |
|
| 49 |
src_configure() { |
| 50 |
local mycmakeargs=( |
| 51 |
- -DENABLE_OPENCV3=ON |
| 52 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 53 |
) |
| 54 |
|
| 55 |
kde4-base_src_configure |
| 56 |
|
| 57 |
diff --git a/kde-apps/libkface/libkface-15.12.3.ebuild b/kde-apps/libkface/libkface-15.12.3.ebuild |
| 58 |
index 61d310b..c88875c 100644 |
| 59 |
--- a/kde-apps/libkface/libkface-15.12.3.ebuild |
| 60 |
+++ b/kde-apps/libkface/libkface-15.12.3.ebuild |
| 61 |
@@ -19,7 +19,7 @@ DEPEND=" |
| 62 |
$(add_qt_dep qtsql) |
| 63 |
$(add_qt_dep qtwidgets) |
| 64 |
$(add_qt_dep qtxml) |
| 65 |
- >=media-libs/opencv-3:=[contrib] |
| 66 |
+ media-libs/opencv:=[contrib(+)] |
| 67 |
" |
| 68 |
RDEPEND="${DEPEND}" |
| 69 |
|
| 70 |
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
local mycmakeargs=( |
| 74 |
- -DENABLE_OPENCV3=ON |
| 75 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 76 |
) |
| 77 |
|
| 78 |
kde5_src_configure |
| 79 |
|
| 80 |
diff --git a/kde-apps/libkface/libkface-16.04.3.ebuild b/kde-apps/libkface/libkface-16.04.3.ebuild |
| 81 |
index 6bda88f..847d330 100644 |
| 82 |
--- a/kde-apps/libkface/libkface-16.04.3.ebuild |
| 83 |
+++ b/kde-apps/libkface/libkface-16.04.3.ebuild |
| 84 |
@@ -19,7 +19,7 @@ DEPEND=" |
| 85 |
$(add_qt_dep qtsql) |
| 86 |
$(add_qt_dep qtwidgets) |
| 87 |
$(add_qt_dep qtxml) |
| 88 |
- >=media-libs/opencv-3:=[contrib] |
| 89 |
+ media-libs/opencv:=[contrib(+)] |
| 90 |
" |
| 91 |
RDEPEND="${DEPEND}" |
| 92 |
|
| 93 |
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
local mycmakeargs=( |
| 97 |
- -DENABLE_OPENCV3=ON |
| 98 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 99 |
) |
| 100 |
|
| 101 |
kde5_src_configure |
Archives