Date: Monday, March 13, 2023 @ 07:47:26 Author: arojas Revision: 470764
upgpkg: digikam 7.10.0-1: Update to 7.10.0 Modified: digikam/trunk/PKGBUILD Deleted: digikam/trunk/f2f86c3c.patch ----------------+ PKGBUILD | 9 ++----- f2f86c3c.patch | 62 ------------------------------------------------------- 2 files changed, 3 insertions(+), 68 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-13 07:32:14 UTC (rev 470763) +++ PKGBUILD 2023-03-13 07:47:26 UTC (rev 470764) @@ -5,9 +5,9 @@ # Contributor: Tobias Powalowski <[email protected]> pkgname=digikam -_pkgver=7.9.0 +_pkgver=7.10.0 pkgver=${_pkgver//-/_} # for beta versions -pkgrel=6 +pkgrel=1 pkgdesc='An advanced digital photo management application' arch=(x86_64) license=(GPL) @@ -19,17 +19,14 @@ 'rawtherapee: RAW import' 'darktable: RAW import' 'perl: for digitaglinktree') source=(https://download.kde.org/stable/$pkgname/$pkgver/digiKam-$_pkgver.tar.xz{,.sig} - f2f86c3c.patch ffmpeg5.patch) -sha256sums=('c3b80abc090da3cbbc42e67a403080d7f5fe0a7c98698735bda556c60314bab4' +sha256sums=('a3f30f01b7d1b6d585822bcd5ebf8df69e0ff024563a72462ebf8069dbda22e1' 'SKIP' - '0e27a08d8e4d9b20567537452d604f239d8b6b8896d50229c56bb3b6536c6154' 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee') validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <[email protected]> prepare() { patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5 - patch -d $pkgname-$_pkgver -p1 < f2f86c3c.patch # Fix crashes on face recognition } build() { Deleted: f2f86c3c.patch =================================================================== --- f2f86c3c.patch 2023-03-13 07:32:14 UTC (rev 470763) +++ f2f86c3c.patch 2023-03-13 07:47:26 UTC (rev 470764) @@ -1,62 +0,0 @@ -From f2f86c3c6719e4ea0bc7de95ce1ae33e8c45495e Mon Sep 17 00:00:00 2001 -From: Maik Qualmann <[email protected]> -Date: Sun, 29 Jan 2023 21:30:24 +0100 -Subject: [PATCH] fix crash with the release version of OpenCV-4.7.0 The - problem is already fixed with the master version of OpenCV. BUGS: 464646 - BUGS: 464745 FIXED-IN: 7.10.0 - -diff --git a/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectorssd.cpp b/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectorssd.cpp -index e178ea435a..e0f9eda6c7 100644 ---- a/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectorssd.cpp -+++ b/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectorssd.cpp -@@ -78,6 +78,12 @@ bool DNNFaceDetectorSSD::loadModels() - net = cv::dnn::readNetFromCaffe(nnmodel.toStdString(), - nndata.toStdString()); - -+#endif -+ -+#if (OPENCV_VERSION == QT_VERSION_CHECK(4, 7, 0)) -+ -+ net.enableWinograd(false); -+ - #endif - - } -diff --git a/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectoryolo.cpp b/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectoryolo.cpp -index 3524d07071..0624a745f6 100644 ---- a/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectoryolo.cpp -+++ b/core/libs/facesengine/detection/opencv-dnn/dnnfacedetectoryolo.cpp -@@ -89,6 +89,13 @@ bool DNNFaceDetectorYOLO::loadModels() - - net.setPreferableBackend(cv::dnn::DNN_BACKEND_DEFAULT); - net.setPreferableTarget(cv::dnn::DNN_TARGET_CPU); -+ -+#if (OPENCV_VERSION == QT_VERSION_CHECK(4, 7, 0)) -+ -+ net.enableWinograd(false); -+ -+#endif -+ - } - catch (cv::Exception& e) - { -diff --git a/core/libs/facesengine/recognition/opencv-dnn/dnnfaceextractor.cpp b/core/libs/facesengine/recognition/opencv-dnn/dnnfaceextractor.cpp -index e9a2fe9efb..7067af2590 100644 ---- a/core/libs/facesengine/recognition/opencv-dnn/dnnfaceextractor.cpp -+++ b/core/libs/facesengine/recognition/opencv-dnn/dnnfaceextractor.cpp -@@ -149,6 +149,12 @@ bool DNNFaceExtractor::loadModels() - - d->net = cv::dnn::readNetFromTorch(nnmodel.toStdString()); - -+#endif -+ -+#if (OPENCV_VERSION == QT_VERSION_CHECK(4, 7, 0)) -+ -+ d->net.enableWinograd(false); -+ - #endif - - } --- -GitLab -
