Date: Tuesday, March 7, 2023 @ 09:20:17
Author: arojas
Revision: 470365
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
digikam/repos/kde-unstable-x86_64/PKGBUILD
(from rev 470364, digikam/kde-unstable/PKGBUILD)
digikam/repos/kde-unstable-x86_64/ffmpeg-6.patch
(from rev 470364, digikam/kde-unstable/ffmpeg-6.patch)
digikam/repos/kde-unstable-x86_64/keys/
Deleted:
digikam/repos/kde-unstable-x86_64/PKGBUILD
digikam/repos/kde-unstable-x86_64/keys/
----------------+
PKGBUILD | 87 +++++++++++++++++++++++++++++--------------------------
ffmpeg-6.patch | 33 ++++++++++++++++++++
2 files changed, 79 insertions(+), 41 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-07 09:20:04 UTC (rev 470364)
+++ PKGBUILD 2023-03-07 09:20:17 UTC (rev 470365)
@@ -1,41 +0,0 @@
-# $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=8.0.0-beta1
-pkgver=${_pkgver//-/} # for beta versions
-pkgrel=4
-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
marble-common threadweaver kcalendarcore
- qt5-networkauth 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/unstable/$pkgname/${_pkgver%-*}/digiKam-$_pkgver.tar.xz{,.sig})
-sha256sums=('1fcaa0a2a1abd56b759548d049089604710e9c3849e74252667a12c80bf0bdd9'
- 'SKIP')
-validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam
project) <[email protected]>
-options=(debug)
-
-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/kde-unstable-x86_64/PKGBUILD (from rev 470364,
digikam/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-07 09:20:17 UTC (rev 470365)
@@ -0,0 +1,46 @@
+# $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=8.0.0-beta1
+pkgver=${_pkgver//-/} # for beta versions
+pkgrel=5
+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
marble-common threadweaver kcalendarcore
+ qt5-networkauth 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/unstable/$pkgname/${_pkgver%-*}/digiKam-$_pkgver.tar.xz{,.sig}
+ ffmpeg-6.patch)
+sha256sums=('1fcaa0a2a1abd56b759548d049089604710e9c3849e74252667a12c80bf0bdd9'
+ 'SKIP'
+ '09782f698807255e044250f3b51899b5cfd6012565a2aa55f0e7f3a0d3ebb828')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam
project) <[email protected]>
+
+prepare() {
+ patch -d $pkgname-$_pkgver -p1 < ffmpeg-6.patch # Fix build with FFmpeg 6
+}
+
+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/kde-unstable-x86_64/ffmpeg-6.patch (from rev 470364,
digikam/kde-unstable/ffmpeg-6.patch)
===================================================================
--- ffmpeg-6.patch (rev 0)
+++ ffmpeg-6.patch 2023-03-07 09:20:17 UTC (rev 470365)
@@ -0,0 +1,33 @@
+diff --git a/core/libs/video/qtav/codec/video/VideoDecoderFFmpeg.cpp
b/core/libs/video/qtav/codec/video/VideoDecoderFFmpeg.cpp
+index a57e5b73dd..eba04111c7 100644
+--- a/core/libs/video/qtav/codec/video/VideoDecoderFFmpeg.cpp
++++ b/core/libs/video/qtav/codec/video/VideoDecoderFFmpeg.cpp
+@@ -99,10 +99,13 @@ public:
+
+ enum MotionVectorVisFlag
+ {
+- No = 0, // default
++ No = 0 // default
++# if LIBAVCODEC_VERSION_MAJOR < 60
++ ,
+ PF = FF_DEBUG_VIS_MV_P_FOR,
+ BF = FF_DEBUG_VIS_MV_B_FOR,
+ BB = FF_DEBUG_VIS_MV_B_BACK
++# endif
+ };
+ Q_DECLARE_FLAGS(MotionVectorVisFlags, MotionVectorVisFlag)
+ Q_ENUM(MotionVectorVisFlag)
+diff --git a/core/libs/video/qtav/codec/video/VideoDecoderFFmpegHW.cpp
b/core/libs/video/qtav/codec/video/VideoDecoderFFmpegHW.cpp
+index d0a4313762..dedbb43a7f 100644
+--- a/core/libs/video/qtav/codec/video/VideoDecoderFFmpegHW.cpp
++++ b/core/libs/video/qtav/codec/video/VideoDecoderFFmpegHW.cpp
+@@ -149,7 +149,9 @@ bool VideoDecoderFFmpegHWPrivate::prepare()
+ {
+ // From vlc begin
+
++# if LIBAVCODEC_VERSION_MAJOR < 60
+ codec_ctx->thread_safe_callbacks = true;
++# endif
+ codec_ctx->thread_count = threads;
+
+ #ifdef _MSC_VER // krazy:exclude=cpp
