summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-04-09 11:50:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-04-17 12:43:00 +0200
commit08d54a13dae623d073c3199e96c5393a3102f076 (patch)
tree163ae140bf2820a036b3dd78d0fe370cf6a3e52e /kde-apps/libkface
parentkde-frameworks/kfilemetadata: Drop slot 4 (diff)
downloadgentoo-08d54a13dae623d073c3199e96c5393a3102f076.tar.gz
gentoo-08d54a13dae623d073c3199e96c5393a3102f076.tar.bz2
gentoo-08d54a13dae623d073c3199e96c5393a3102f076.zip
kde-apps: Remove KDE Applications 16.08.3
Some exceptions with reverse-dependencies remain. Closes: https://github.com/gentoo/gentoo/pull/4433
Diffstat (limited to 'kde-apps/libkface')
-rw-r--r--kde-apps/libkface/Manifest1
-rw-r--r--kde-apps/libkface/files/libkface-16.08.3-opencv3.2-gentoo-3.1.patch167
-rw-r--r--kde-apps/libkface/libkface-16.08.3.ebuild34
3 files changed, 0 insertions, 202 deletions
diff --git a/kde-apps/libkface/Manifest b/kde-apps/libkface/Manifest
index 6f725bdebd17..043190104e33 100644
--- a/kde-apps/libkface/Manifest
+++ b/kde-apps/libkface/Manifest
@@ -1,2 +1 @@
-DIST libkface-16.08.3.tar.xz 8987232 SHA256 e76d2c420f9f3314e3acc6ba725759205717cdad328677d187f1914dfe4d9676 SHA512 c670d098e0db0c4b549a7a97e41f64a287c572dfb7ff4f267082324507e4d701e25fc4f8fe0c456f59dc2862b8d91f438d56640fb63271ee226c1774d973d45b WHIRLPOOL 24c7f1013cf760d590d282c2c8e2b98802c8e6c41b71f387eb95e5d15ddfb4631572a02ffb10eb47f2be7c721df26c85bff7a074b4ce858bca364ce7808f24e7
DIST libkface-16.12.3.tar.xz 8989848 SHA256 0867e2c0fdda617543959a60c7398d2132df8d1733769bd888d041c0698f1d19 SHA512 dba6f6c0bcfd3fbd34cd0209a62daa60ce704d1587d0054c2f4ee91ba9e5b9697ca2dfb169125854e1d3b7a9684468c87a2cb7578cad3379c9abf141fa531925 WHIRLPOOL 72c1985dc980f92d58d5cfc4dbefc5ff23717ec973f22d42d0e1e20f289b5b93fbe6358052e22933fe3d9965ca9f18b9baa349e173b5a4f8c1f0c8c633c11f29
diff --git a/kde-apps/libkface/files/libkface-16.08.3-opencv3.2-gentoo-3.1.patch b/kde-apps/libkface/files/libkface-16.08.3-opencv3.2-gentoo-3.1.patch
deleted file mode 100644
index abba02d69016..000000000000
--- a/kde-apps/libkface/files/libkface-16.08.3-opencv3.2-gentoo-3.1.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/src/recognition-opencv-lbph/facerec_borrowed.h b/src/recognition-opencv-lbph/facerec_borrowed.h
-index 27ad77a..f197d22 100644
---- a/src/recognition-opencv-lbph/facerec_borrowed.h
-+++ b/src/recognition-opencv-lbph/facerec_borrowed.h
-@@ -125,6 +125,8 @@ public:
- */
- void update(cv::InputArrayOfArrays src, cv::InputArray labels);
-
-+
-+#if OPENCV_TEST_VERSION(3,1,0)
- /**
- * Predicts the label of a query image in src.
- */
-@@ -134,6 +136,13 @@ public:
- * Predicts the label and confidence for a given sample.
- */
- void predict(cv::InputArray _src, int &label, double &dist) const;
-+#else
-+ using cv::face::FaceRecognizer::predict;
-+ /*
-+ * Predict
-+ */
-+ void predict(cv::InputArray src, cv::Ptr<cv::face::PredictCollector> collector) const override;
-+#endif
-
- /**
- * See FaceRecognizer::load().
-diff --git a/src/recognition-opencv-lbph/facerec_borrowed.cpp b/src/recognition-opencv-lbph/facerec_borrowed.cpp
-index 748691e..3c37ce2 100644
---- a/src/recognition-opencv-lbph/facerec_borrowed.cpp
-+++ b/src/recognition-opencv-lbph/facerec_borrowed.cpp
-@@ -36,6 +36,8 @@
- *
- * ============================================================ */
-
-+#define QT_NO_EMIT
-+
- #include "facerec_borrowed.h"
-
- // C++ includes
-@@ -375,7 +377,11 @@ void LBPHFaceRecognizer::train(InputArrayOfArrays _in_src, InputArray _inm_label
- }
- }
-
-+#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
-+#endif
- {
- if(m_histograms.empty())
- {
-@@ -394,8 +400,12 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- m_grid_y, /* grid size y */
- true /* normed histograms */
- );
-+#if OPENCV_TEST_VERSION(3,1,0)
- minDist = DBL_MAX;
- minClass = -1;
-+#else
-+ collector->init((int)m_histograms.size());
-+#endif
-
- // This is the standard method
-
-@@ -406,11 +416,19 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- {
- double dist = compareHist(m_histograms[sampleIdx], query, CV_COMP_CHISQR);
-
-+#if OPENCV_TEST_VERSION(3,1,0)
- if((dist < minDist) && (dist < m_threshold))
- {
- minDist = dist;
- minClass = m_labels.at<int>((int) sampleIdx);
- }
-+#else
-+ int label = m_labels.at<int>((int) sampleIdx);
-+ if (!collector->collect(label, dist))
-+ {
-+ return;
-+ }
-+#endif
- }
- }
-
-@@ -422,7 +440,7 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- // Create map "label -> vector of distances to all histograms for this label"
- std::map<int, std::vector<int> > distancesMap;
-
-- for(size_t sampleIdx = 0; sampleIdx < m_histograms.size(); sampleIdx++)
-+ for(size_t sampleIdx = 0; sampleIdx < m_histograms.size(); sampleIdx++)
- {
- double dist = compareHist(m_histograms[sampleIdx], query, CV_COMP_CHISQR);
- std::vector<int>& distances = distancesMap[m_labels.at<int>((int) sampleIdx)];
-@@ -445,11 +463,18 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- double mean = sum / it->second.size();
- s += QString::fromLatin1("%1: %2 - ").arg(it->first).arg(mean);
-
-+#if OPENCV_TEST_VERSION(3,1,0)
- if((mean < minDist) && (mean < m_threshold))
- {
- minDist = mean;
- minClass = it->first;
- }
-+#else
-+ if (!collector->collect(it->first, mean))
-+ {
-+ return;
-+ }
-+#endif
- }
-
- qCDebug(LIBKFACE_LOG) << s;
-@@ -462,7 +487,7 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- // map "label -> number of histograms"
- std::map<int, int> countMap;
-
-- for(size_t sampleIdx = 0; sampleIdx < m_histograms.size(); sampleIdx++)
-+ for(size_t sampleIdx = 0; sampleIdx < m_histograms.size(); sampleIdx++)
- {
- int label = m_labels.at<int>((int) sampleIdx);
- double dist = compareHist(m_histograms[sampleIdx], query, CV_COMP_CHISQR);
-@@ -480,7 +505,9 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- scoreMap[it->second]++;
- }
-
-+#if OPENCV_TEST_VERSION(3,1,0)
- minDist = 0;
-+#endif
- QString s = QString::fromLatin1("Nearest Neighbor score: ");
-
- for (std::map<int,int>::iterator it = scoreMap.begin(); it != scoreMap.end(); ++it)
-@@ -488,17 +515,26 @@ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist
- double score = double(it->second) / countMap.at(it->first);
- s += QString::fromLatin1("%1/%2 %3 ").arg(it->second).arg(countMap.at(it->first)).arg(score);
-
-+#if OPENCV_TEST_VERSION(3,1,0)
- if (score > minDist)
- {
- minDist = score;
- minClass = it->first;
- }
-+#else
-+ // large is better thus it is -score.
-+ if (!collector->collect(it->first, -score))
-+ {
-+ return;
-+ }
-+#endif
- }
-
- qCDebug(LIBKFACE_LOG) << s;
- }
- }
-
-+#if OPENCV_TEST_VERSION(3,1,0)
- int LBPHFaceRecognizer::predict(InputArray _src) const
- {
- int label;
-@@ -506,6 +542,7 @@ int LBPHFaceRecognizer::predict(InputArray _src) const
- predict(_src, label, dummy);
- return label;
- }
-+#endif
-
- // Static method ----------------------------------------------------
-
diff --git a/kde-apps/libkface/libkface-16.08.3.ebuild b/kde-apps/libkface/libkface-16.08.3.ebuild
deleted file mode 100644
index 57e0e6cee67a..000000000000
--- a/kde-apps/libkface/libkface-16.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.08.3-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
-}