Date: Thursday, March 2, 2023 @ 07:07:12
Author: arojas
Revision: 469874
archrelease: copy trunk to staging-x86_64
Added:
digikam/repos/staging-x86_64/
digikam/repos/staging-x86_64/PKGBUILD
(from rev 469873, digikam/trunk/PKGBUILD)
digikam/repos/staging-x86_64/f2f86c3c.patch
(from rev 469873, digikam/trunk/f2f86c3c.patch)
digikam/repos/staging-x86_64/ffmpeg5.patch
(from rev 469873, digikam/trunk/ffmpeg5.patch)
digikam/repos/staging-x86_64/keys/
----------------+
PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++
f2f86c3c.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg5.patch | 13 +++++++++++
3 files changed, 124 insertions(+)
Copied: digikam/repos/staging-x86_64/PKGBUILD (from rev 469873,
digikam/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2023-03-02 07:07:12 UTC (rev 469874)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
+# Maintainer: Ronald van Haren <[email protected]>
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Tobias Powalowski <[email protected]>
+
+pkgname=digikam
+_pkgver=7.9.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=6
+pkgdesc='An advanced digital photo management application'
+arch=(x86_64)
+license=(GPL)
+url='https://www.digikam.org/'
+depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata
qtav marble-common threadweaver kcalendarcore
+ qt5-xmlpatterns imagemagick jasper glu perl-image-exiftool)
+makedepends=(extra-cmake-modules doxygen eigen boost kdoctools)
+optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional
image formats (WEBP, TIFF)'
+ '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'
+ '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() {
+ cmake -B build -S $pkgname-$_pkgver \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_QWEBENGINE=ON
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: digikam/repos/staging-x86_64/f2f86c3c.patch (from rev 469873,
digikam/trunk/f2f86c3c.patch)
===================================================================
--- staging-x86_64/f2f86c3c.patch (rev 0)
+++ staging-x86_64/f2f86c3c.patch 2023-03-02 07:07:12 UTC (rev 469874)
@@ -0,0 +1,62 @@
+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
+
Copied: digikam/repos/staging-x86_64/ffmpeg5.patch (from rev 469873,
digikam/trunk/ffmpeg5.patch)
===================================================================
--- staging-x86_64/ffmpeg5.patch (rev 0)
+++ staging-x86_64/ffmpeg5.patch 2023-03-02 07:07:12 UTC (rev 469874)
@@ -0,0 +1,13 @@
+diff --git a/core/libs/threadimageio/video/videodecoder_p.h
b/core/libs/threadimageio/video/videodecoder_p.h
+index 251e092809..d82926b77e 100644
+--- a/core/libs/threadimageio/video/videodecoder_p.h
++++ b/core/libs/threadimageio/video/videodecoder_p.h
+@@ -56,7 +56,7 @@ public:
+ AVFormatContext* pFormatContext;
+ AVCodecContext* pVideoCodecContext;
+ AVCodecParameters* pVideoCodecParameters;
+- AVCodec* pVideoCodec;
++ const AVCodec* pVideoCodec;
+ AVStream* pVideoStream;
+ AVFrame* pFrame;
+ quint8* pFrameBuffer;
