[arch-commits] Commit in digikam/repos/staging-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Feb 3 18:02:37 UTC 2022
Date: Thursday, February 3, 2022 @ 18:02:37
Author: arojas
Revision: 436126
archrelease: copy trunk to staging-x86_64
Added:
digikam/repos/staging-x86_64/PKGBUILD
(from rev 436125, digikam/trunk/PKGBUILD)
digikam/repos/staging-x86_64/ffmpeg5.patch
(from rev 436125, digikam/trunk/ffmpeg5.patch)
Deleted:
digikam/repos/staging-x86_64/PKGBUILD
digikam/repos/staging-x86_64/ffmpeg5.patch
---------------+
PKGBUILD | 93 ++++++++++++++++++++++++++++----------------------------
ffmpeg5.patch | 26 +++++++--------
2 files changed, 60 insertions(+), 59 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-03 18:02:20 UTC (rev 436125)
+++ PKGBUILD 2022-02-03 18:02:37 UTC (rev 436126)
@@ -1,46 +0,0 @@
-# $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.5.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=2
-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)
-sha256sums=('cc143dcdba0ab138036d78cd80b29d5cfd32bceb2c3e74e46b363a661dfca780'
- 'SKIP'
- 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee')
-validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
-
-prepare() {
- patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch
-}
-
-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/PKGBUILD (from rev 436125, digikam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-03 18:02:37 UTC (rev 436126)
@@ -0,0 +1,47 @@
+# $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.5.0
+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 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)
+sha256sums=('cc143dcdba0ab138036d78cd80b29d5cfd32bceb2c3e74e46b363a661dfca780'
+ 'SKIP'
+ 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
+options=(debug)
+
+prepare() {
+ patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch
+}
+
+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
+}
Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch 2022-02-03 18:02:20 UTC (rev 436125)
+++ ffmpeg5.patch 2022-02-03 18:02:37 UTC (rev 436126)
@@ -1,13 +0,0 @@
-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;
Copied: digikam/repos/staging-x86_64/ffmpeg5.patch (from rev 436125, digikam/trunk/ffmpeg5.patch)
===================================================================
--- ffmpeg5.patch (rev 0)
+++ ffmpeg5.patch 2022-02-03 18:02:37 UTC (rev 436126)
@@ -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;
More information about the arch-commits
mailing list