From 16dbede0be07e7d94017442bc4f0202743c797dc Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 19 Mar 2017 21:22:50 +0100
Subject: kde: added digikam, k3b, kdenlive, libkface

---
 kde/patch/digikam.patch                   |  4 ++
 kde/patch/digikam/digikam_clang_fix.patch | 38 +++++++++++++++++++
 kde/patch/libkface.patch                  |  3 ++
 kde/patch/libkface/libkface_opencv3.patch | 61 +++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+)
 create mode 100644 kde/patch/digikam.patch
 create mode 100644 kde/patch/digikam/digikam_clang_fix.patch
 create mode 100644 kde/patch/libkface.patch
 create mode 100644 kde/patch/libkface/libkface_opencv3.patch

(limited to 'kde/patch')

diff --git a/kde/patch/digikam.patch b/kde/patch/digikam.patch
new file mode 100644
index 0000000..21b9052
--- /dev/null
+++ b/kde/patch/digikam.patch
@@ -0,0 +1,4 @@
+# Fix compilation with clang.
+# Fixed in digikam 5.5.0.
+#cat $CWD/patch/digikam/digikam_clang_fix.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/digikam/digikam_clang_fix.patch b/kde/patch/digikam/digikam_clang_fix.patch
new file mode 100644
index 0000000..a4d77b0
--- /dev/null
+++ b/kde/patch/digikam/digikam_clang_fix.patch
@@ -0,0 +1,38 @@
+Taken from:
+http://pkgs.fedoraproject.org/cgit/rpms/digikam.git/
+And added and extra '/core/' path componenent.
+
+From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Wed, 18 Jan 2017 10:13:20 +0100
+Subject: [PATCH 2/2] Fix compilation with clang
+
+---
+ libs/dmetadata/metaengine_p.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/libs/dmetadata/metaengine_p.cpp b/core/libs/dmetadata/metaengine_p.cpp
+index 2c83b58..2b44e06 100644
+--- a/core/libs/dmetadata/metaengine_p.cpp
++++ b/core/libs/dmetadata/metaengine_p.cpp
+@@ -49,7 +49,7 @@ extern "C"
+ #include "digikam_debug.h"
+ 
+ // Pragma directives to reduce warnings from Exiv2.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
+ }  // namespace Digikam
+ 
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+ 
+-- 
+2.9.3
+
diff --git a/kde/patch/libkface.patch b/kde/patch/libkface.patch
new file mode 100644
index 0000000..9775e82
--- /dev/null
+++ b/kde/patch/libkface.patch
@@ -0,0 +1,3 @@
+# Compile libkface against opencv 3.2:
+cat $CWD/patch/libkface/libkface_opencv3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/libkface/libkface_opencv3.patch b/kde/patch/libkface/libkface_opencv3.patch
new file mode 100644
index 0000000..a6804d3
--- /dev/null
+++ b/kde/patch/libkface/libkface_opencv3.patch
@@ -0,0 +1,61 @@
+Taken from Gentoo:
+https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
+
+--- 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;
+             }
-- 
cgit v1.2.3