[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-opencv-4.2.patch)

[Antonio Rojas]

    Date: Saturday, December 21, 2019 @ 12:11:58
  Author: arojas
Revision: 372017

opencv 4.2 rebuild

Added:
  digikam/trunk/digikam-opencv-4.2.patch
Modified:
  digikam/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   11 +++++++----
 digikam-opencv-4.2.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-21 09:16:04 UTC (rev 372016)
+++ PKGBUILD	2019-12-21 12:11:58 UTC (rev 372017)
@@ -7,7 +7,7 @@
 pkgname=digikam
 _pkgver=6.4.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced digital photo management application"
 arch=(x86_64)
 license=(GPL)
@@ -14,15 +14,17 @@
 url="https://www.digikam.org/"
 depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore
          qt5-xmlpatterns imagemagick glu)
-makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte)
+makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte xorgproto)
 optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
             'libkvkontakte: VKontakte plugin'
             'rawtherapee: RAW import' 'darktable: RAW import')
 source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
-         initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae")
+         initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
+         digikam-opencv-4.2.patch)
 sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
             'SKIP'
-            'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360')
+            'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
+            'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
 
 prepare() {
@@ -30,6 +32,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
+  patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
 }
 
 build() {

Added: digikam-opencv-4.2.patch
===================================================================
--- digikam-opencv-4.2.patch	                        (rev 0)
+++ digikam-opencv-4.2.patch	2019-12-21 12:11:58 UTC (rev 372017)
@@ -0,0 +1,35 @@
+diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
+index 46a56bb2f3..178d31f093 100644
+--- a/core/libs/facesengine/detection/opencvfacedetector.cpp
++++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
+@@ -166,7 +166,7 @@ public:
+      * of the region of interest of this cascade (still relative to whole image).
+      * For frontal face cascades, returns the given parameter unchanged.
+      */
+-    cv::Rect faceROI(const CvRect& faceRect) const
++    cv::Rect faceROI(const cv::Rect faceRect) const
+     {
+         return cv::Rect(lround(faceRect.x + roi.x()      * faceRect.width),
+                         lround(faceRect.y + roi.y()      * faceRect.height),
+diff --git a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+index 370aca14d6..1baf33c2bf 100644
+--- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
++++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+@@ -52,7 +52,7 @@ public:
+                      << "\n\t img.channels(): " << img.channels()
+                      << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
+                      );
+-        IplImage temp = img;
++        IplImage temp = cvIplImage(img);
+         init(&temp);
+     }
+ 
+@@ -125,7 +125,7 @@ public:
+ 
+     cv_image& operator=( const cv::Mat img)
+     {
+-        IplImage temp = img;
++        IplImage temp = cvIplImage(img);
+         init(&temp);
+         return *this;
+     }