summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-11-19 23:30:10 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-11-19 23:30:10 +0100
commitbe678488163ca20922ebd1477e20ad0d288f99e7 (patch)
treeae685bb233921702472515e991f3630c4f246f7a
parentc37607e69413b85037e69b4e1a4fd0252c13d548 (diff)
downloadkde-be678488163ca20922ebd1477e20ad0d288f99e7.tar.gz
kde-be678488163ca20922ebd1477e20ad0d288f99e7.tar.bz2
kde-be678488163ca20922ebd1477e20ad0d288f99e7.zip
kde-apps/libkface: Dropped upstream
See also: https://mail.kde.org/pipermail/release-team/2017-November/010718.html
-rw-r--r--kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch58
-rw-r--r--kde-apps/libkface/libkface-9999.ebuild34
-rw-r--r--kde-apps/libkface/metadata.xml8
3 files changed, 0 insertions, 100 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
deleted file mode 100644
index bd61e9c52ca..00000000000
--- a/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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-9999.ebuild b/kde-apps/libkface/libkface-9999.ebuild
deleted file mode 100644
index 571b7dde0c8..00000000000
--- a/kde-apps/libkface/libkface-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 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://cgit.kde.org/libkface.git"
-
-LICENSE="BSD GPL-2+"
-KEYWORDS=""
-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
-}
diff --git a/kde-apps/libkface/metadata.xml b/kde-apps/libkface/metadata.xml
deleted file mode 100644
index 2fdbf33d963..00000000000
--- a/kde-apps/libkface/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>