commit: 70132f237102800691e177705a3b55eda7cdad06
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 13:27:35 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 13:27:35 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=70132f23
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
.../libkface-16.11.80-opencv3.2-gentoo-3.1.patch | 58 ++++++++++++++++++++++
kde-apps/libkface/libkface-16.12.49.9999.ebuild | 5 +-
kde-apps/libkface/libkface-9999.ebuild | 5 +-
3 files changed, 66 insertions(+), 2 deletions(-)
diff --git
a/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
b/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
new file mode 100644
index 0000000..bd61e9c
--- /dev/null
+++ b/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
@@ -0,0 +1,58 @@
+--- a/src/recognition-opencv-lbph/facerec_borrowed.h 2016-11-26
14:19:01.492645170 +0100
++++ b/src/recognition-opencv-lbph/facerec_borrowed.h.new 2016-11-26
14:19:17.655835794 +0100
+@@ -141,7 +141,7 @@
+ /*
+ * Predict
+ */
+- void predict(cv::InputArray src, cv::Ptr<cv::face::PredictCollector>
collector, const int state = 0) const override;
++ void predict(cv::InputArray src, cv::Ptr<cv::face::PredictCollector>
collector) const override;
+ #endif
+
+ /**
+--- a/src/recognition-opencv-lbph/facerec_borrowed.cpp 2016-11-26
14:19:01.492645170 +0100
++++ b/src/recognition-opencv-lbph/facerec_borrowed.cpp.new 2016-11-26
14:19:29.184971765 +0100
+@@ -380,7 +380,7 @@
+ #if OPENCV_TEST_VERSION(3,1,0)
+ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double
&minDist) const
+ #else
+-void LBPHFaceRecognizer::predict(cv::InputArray _src,
cv::Ptr<cv::face::PredictCollector> collector, const int state) const
++void LBPHFaceRecognizer::predict(cv::InputArray _src,
cv::Ptr<cv::face::PredictCollector> collector) const
+ #endif
+ {
+ if(m_histograms.empty())
+@@ -404,7 +404,7 @@
+ minDist = DBL_MAX;
+ minClass = -1;
+ #else
+- collector->init((int)m_histograms.size(), state);
++ collector->init((int)m_histograms.size());
+ #endif
+
+ // This is the standard method
+@@ -424,7 +424,7 @@
+ }
+ #else
+ int label = m_labels.at<int>((int) sampleIdx);
+- if (!collector->emit(label, dist, state))
++ if (!collector->collect(label, dist))
+ {
+ return;
+ }
+@@ -470,7 +470,7 @@
+ minClass = it->first;
+ }
+ #else
+- if (!collector->emit(it->first, mean, state))
++ if (!collector->collect(it->first, mean))
+ {
+ return;
+ }
+@@ -523,7 +523,7 @@
+ }
+ #else
+ // large is better thus it is -score.
+- if (!collector->emit(it->first, -score, state))
++ if (!collector->collect(it->first, -score))
+ {
+ return;
+ }
diff --git a/kde-apps/libkface/libkface-16.12.49.9999.ebuild
b/kde-apps/libkface/libkface-16.12.49.9999.ebuild
index 213af06..57cb029 100644
--- a/kde-apps/libkface/libkface-16.12.49.9999.ebuild
+++ b/kde-apps/libkface/libkface-16.12.49.9999.ebuild
@@ -19,10 +19,13 @@ 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}-16.11.80-opencv3.2-gentoo-3.1.patch" ) # not
upstreamable like that
+
src_configure() {
local mycmakeargs=(
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
diff --git a/kde-apps/libkface/libkface-9999.ebuild
b/kde-apps/libkface/libkface-9999.ebuild
index 213af06..57cb029 100644
--- a/kde-apps/libkface/libkface-9999.ebuild
+++ b/kde-apps/libkface/libkface-9999.ebuild
@@ -19,10 +19,13 @@ 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}-16.11.80-opencv3.2-gentoo-3.1.patch" ) # not
upstreamable like that
+
src_configure() {
local mycmakeargs=(
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
