[arch-commits] Commit in digikam/repos (4 files)

[Antonio Rojas]

    Date: Saturday, May 14, 2022 @ 08:22:02
  Author: arojas
Revision: 445444

archrelease: copy trunk to staging-x86_64

Added:
  digikam/repos/staging-x86_64/
  digikam/repos/staging-x86_64/PKGBUILD
    (from rev 445443, digikam/trunk/PKGBUILD)
  digikam/repos/staging-x86_64/akonadi-22.04.patch
    (from rev 445443, digikam/trunk/akonadi-22.04.patch)
  digikam/repos/staging-x86_64/ffmpeg5.patch
    (from rev 445443, digikam/trunk/ffmpeg5.patch)

---------------------+
 PKGBUILD            |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 akonadi-22.04.patch |   16 ++++++++++++++++
 ffmpeg5.patch       |   13 +++++++++++++
 3 files changed, 79 insertions(+)

Copied: digikam/repos/staging-x86_64/PKGBUILD (from rev 445443, digikam/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2022-05-14 08:22:02 UTC (rev 445444)
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=digikam
+_pkgver=7.6.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=3
+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}
+        ffmpeg5.patch
+        akonadi-22.04.patch)
+sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641'
+            'SKIP'
+            'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee'
+            '595f7e971c4f9784046ab7bcba0983305b990bdc21e6257d9ec81b013aab1dc3')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
+options=(debug)
+
+prepare() {
+  patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
+  patch -d $pkgname-$_pkgver -p1 < akonadi-22.04.patch # Fix build with akonadi 22.04
+}
+
+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/akonadi-22.04.patch (from rev 445443, digikam/trunk/akonadi-22.04.patch)
===================================================================
--- staging-x86_64/akonadi-22.04.patch	                        (rev 0)
+++ staging-x86_64/akonadi-22.04.patch	2022-05-14 08:22:02 UTC (rev 445444)
@@ -0,0 +1,16 @@
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include <AkonadiCore/Item>
+ #endif
+ 
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+ 
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)

Copied: digikam/repos/staging-x86_64/ffmpeg5.patch (from rev 445443, digikam/trunk/ffmpeg5.patch)
===================================================================
--- staging-x86_64/ffmpeg5.patch	                        (rev 0)
+++ staging-x86_64/ffmpeg5.patch	2022-05-14 08:22:02 UTC (rev 445444)
@@ -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;