kde-apps: Version bump KDE Applications 16.12.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

3 files changed, 94 insertions, 0 deletions

diff --git a/kde-apps/libkface/Manifest b/kde-apps/libkface/Manifest
index d2be47e755cb..d6dd4a75f597 100644
--- a/kde-apps/libkface/Manifest
+++ b/kde-apps/libkface/Manifest
@@ -1,2 +1,3 @@
 DIST libkface-16.04.3.tar.xz 8987296 SHA256 5737d76d739561a048b52895b226bf66ee916e3593562a46dc3f2dc99e01a757 SHA512 b4d47e83115488faa12d12798049057c5e01ec55cf322f0ff5a2bb414e22629ddf43ced8c5f369aad9f2345376ec02132fe33dee0bc430d19d971ace025fda3d WHIRLPOOL e115567066c6adbc87e98713dcf10212ce3f60caf6aa7bd87c2ea4333964d7f93e5ff4c592b7d8bc665a6a67dcd8fde266ad96124e69d79201d8d9302cb5cefa
 DIST libkface-16.08.3.tar.xz 8987232 SHA256 e76d2c420f9f3314e3acc6ba725759205717cdad328677d187f1914dfe4d9676 SHA512 c670d098e0db0c4b549a7a97e41f64a287c572dfb7ff4f267082324507e4d701e25fc4f8fe0c456f59dc2862b8d91f438d56640fb63271ee226c1774d973d45b WHIRLPOOL 24c7f1013cf760d590d282c2c8e2b98802c8e6c41b71f387eb95e5d15ddfb4631572a02ffb10eb47f2be7c721df26c85bff7a074b4ce858bca364ce7808f24e7
+DIST libkface-16.12.0.tar.xz 8989864 SHA256 678f34186f688210b21bb34012b5c2a976c84dcd3f3d4c46156b6980cbc4200a SHA512 4532f6b3826c45212118d1066f9b84d83bb8eed08e4bf6b67bb80c663c7849dfa3e28aa1ae0c63a32147ede0fa3c0422d6dc7c33038cc056e787761e0f2b4b7b WHIRLPOOL d8c4cefd8ebe9339244a1f21716900f4fd145809f04b5d5a6f77195a87c604e8cca3f3eada8cd0bf0ad3a6efa13c97ea36f9b898c1ab83e262a3981a0d798a8d
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 000000000000..bd61e9c52ca1
--- /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.0.ebuild b/kde-apps/libkface/libkface-16.12.0.ebuild
new file mode 100644
index 000000000000..7925a104c08b
--- /dev/null
+++ b/kde-apps/libkface/libkface-16.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
+HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
+
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	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)
+	)
+
+	kde5_src_configure
+}