From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1814A1396D9 for ; Sun, 19 Nov 2017 22:33:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DC56E0F40; Sun, 19 Nov 2017 22:33:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E49FE0F40 for ; Sun, 19 Nov 2017 22:33:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E03434069A for ; Sun, 19 Nov 2017 22:33:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CDB8A0AC for ; Sun, 19 Nov 2017 22:33:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1511130610.be678488163ca20922ebd1477e20ad0d288f99e7.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkface/files/, kde-apps/libkface/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch kde-apps/libkface/libkface-9999.ebuild kde-apps/libkface/metadata.xml X-VCS-Directories: kde-apps/libkface/files/ kde-apps/libkface/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: be678488163ca20922ebd1477e20ad0d288f99e7 X-VCS-Branch: master Date: Sun, 19 Nov 2017 22:33:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cd2a6472-8988-4d52-8c93-22d4995ef8f2 X-Archives-Hash: d60c8c25265e42d98f52c61766370aff commit: be678488163ca20922ebd1477e20ad0d288f99e7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 19 22:30:10 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 19 22:30:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=be678488 kde-apps/libkface: Dropped upstream See also: https://mail.kde.org/pipermail/release-team/2017-November/010718.html .../libkface-16.11.80-opencv3.2-gentoo-3.1.patch | 58 ---------------------- kde-apps/libkface/libkface-9999.ebuild | 34 ------------- kde-apps/libkface/metadata.xml | 8 --- 3 files changed, 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 bd61e9c52c..0000000000 --- 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 collector, const int state = 0) const override; -+ void predict(cv::InputArray src, cv::Ptr 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 collector, const int state) const -+void LBPHFaceRecognizer::predict(cv::InputArray _src, cv::Ptr 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) 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 571b7dde0c..0000000000 --- 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.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 2fdbf33d96..0000000000 --- a/kde-apps/libkface/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - -