Date: Friday, January 4, 2019 @ 20:34:41
Author: arojas
Revision: 342968
Update to 6.0.0 beta3
Modified:
digikam/kde-unstable/PKGBUILD
Deleted:
digikam/kde-unstable/digikam-opencv4.patch
-----------------------+
PKGBUILD | 15 ++++--------
digikam-opencv4.patch | 56 ------------------------------------------------
2 files changed, 5 insertions(+), 66 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-04 20:05:05 UTC (rev 342967)
+++ PKGBUILD 2019-01-04 20:34:41 UTC (rev 342968)
@@ -5,9 +5,9 @@
# Contributor: Tobias Powalowski <tpowa at archlinux.org>
pkgname=digikam
-_pkgver=6.0.0-beta2
+_pkgver=6.0.0-beta3
pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=5
+pkgrel=1
pkgdesc="An advanced digital photo management application"
arch=(x86_64)
license=(GPL)
@@ -16,18 +16,13 @@
qt5-xmlpatterns libkvkontakte libmediawiki)
makedepends=(extra-cmake-modules doxygen eigen boost kdoctools)
optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
-source=("http://download.kde.org/unstable/${pkgname}/${pkgname}-${_pkgver}.tar.xz"{,.sig}
- digikam-opencv4.patch)
-sha256sums=('73ae57e2a5af538f335da312b5e9039268c81f124864af047ac3ebe6a86e7330'
- 'SKIP'
- 'd86033a92eb4fbe337636b1fb943d9234181efef9848ff7544e8117645347542')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgname}-${_pkgver}.tar.xz"{,.sig})
+sha256sums=('5660a813eb88035d254ca5ffacbf1ffc6692dca9f42904367d5b330bc44d8012'
+ 'SKIP')
validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
prepare() {
mkdir -p build
-
- cd $pkgname-$_pkgver
- patch -p1 -i ../digikam-opencv4.patch # Fix build with opencv 4
}
build() {
Deleted: digikam-opencv4.patch
===================================================================
--- digikam-opencv4.patch 2019-01-04 20:05:05 UTC (rev 342967)
+++ digikam-opencv4.patch 2019-01-04 20:34:41 UTC (rev 342968)
@@ -1,56 +0,0 @@
-diff --git a/core/app/utils/digikam_opencv.h.cmake.in b/core/app/utils/digikam_opencv.h.cmake.in
-index 9195aad6e7..b3d6de1f86 100644
---- a/core/app/utils/digikam_opencv.h.cmake.in
-+++ b/core/app/utils/digikam_opencv.h.cmake.in
-@@ -54,24 +54,36 @@
- # include <opencv2/legacy/compat.hpp>
- # include <opencv/cvaux.h>
- # include <opencv2/imgproc/imgproc.hpp>
--#else
-+#elif OPENCV_TEST_VERSION(4,0,0)
- # include <opencv/cv.h>
- # include <opencv/cvaux.h>
- # include <opencv/cxcore.h>
- # include <opencv2/imgproc.hpp>
-+#else
-+# include <opencv2/imgproc.hpp>
-+# include <opencv2/core/core_c.h>
-+# include <opencv2/core/types_c.h>
-+# include <opencv2/imgproc/types_c.h>
- #endif
-
- #if OPENCV_TEST_VERSION(3,0,0)
- # include <opencv2/core/core.hpp>
- # include <opencv2/core/internal.hpp>
- # include <opencv2/contrib/contrib.hpp>
--#else
-+#elif OPENCV_TEST_VERSION(4,0,0)
- # include <opencv2/objdetect.hpp>
- # include <opencv2/core.hpp>
- # include <opencv2/core/utility.hpp>
- # include <opencv2/core/persistence.hpp>
- # include <opencv2/imgcodecs.hpp>
- # include <opencv2/imgcodecs/imgcodecs_c.h>
-+#else
-+# include <opencv2/objdetect.hpp>
-+# include <opencv2/core.hpp>
-+# include <opencv2/core/utility.hpp>
-+# include <opencv2/core/persistence.hpp>
-+# include <opencv2/imgcodecs.hpp>
-+# include <opencv2/imgcodecs/legacy/constants_c.h>
- #endif
-
- // for old-style code
-diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
-index 2a28276d09..639540a964 100644
---- a/core/libs/facesengine/detection/opencvfacedetector.cpp
-+++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
-@@ -358,7 +358,7 @@ void OpenCVFaceDetector::updateParameters(const cv::Size& /*scaledSize*/, const
- * unless in we want very high sensitivity at low speed
- */
- if (d->sensitivityVsSpecificity > 0.1 || d->speedVsAccuracy < 0.9)
-- d->primaryParams.flags = CV_HAAR_DO_CANNY_PRUNING;
-+ d->primaryParams.flags = cv::CASCADE_DO_CANNY_PRUNING;
- else
- d->primaryParams.flags = 0;
-