digikam 7.8.0-3 (aarch64;znver1;x86_64) 2022-15198
9999
Status | published | |||||||||||||||||||||||||||||||||||||||
Submitter | alexander [@T] mezon.ru | |||||||||||||||||||||||||||||||||||||||
Platform | rolling | |||||||||||||||||||||||||||||||||||||||
Repository | main | |||||||||||||||||||||||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/234416 | |||||||||||||||||||||||||||||||||||||||
Packages |
|
|||||||||||||||||||||||||||||||||||||||
Build Date | 2022-09-24 00:27:41 +0000 UTC | |||||||||||||||||||||||||||||||||||||||
Last Updated | 2022-09-30 15:19:24.474217786 +0000 UTC |
$ git diff --patch-with-stat --summary a3dc132781e260eb71c14c28783b49e9823d94a1..105d81bf3bb11f32e96ee021497e4559c3ea364d .abf.yml | 3 +-- digikam-7.4.0-ffmpeg-5.0.patch | 13 +++++++++++++ digikam.spec | 27 +++++++++++++++++++-------- 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 digikam-7.4.0-ffmpeg-5.0.patch diff --git a/.abf.yml b/.abf.yml index 794d7e4..9905c41 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,2 @@ sources: - digikam-7.3.0.tar.xz: ae3f0924ecf1b5dc3473c8b3dc6fc036c36256a1 - digikam-7.2-l10n.tar.xz: e225e54322d2b65f1baadaefd4dbd0687f72b60b + digiKam-7.8.0.tar.xz: a66fa34017a0303d2f2b83908d43701705c9b6d1 diff --git a/digikam-7.4.0-ffmpeg-5.0.patch b/digikam-7.4.0-ffmpeg-5.0.patch new file mode 100644 index 0000000..b61bef3 --- /dev/null +++ b/digikam-7.4.0-ffmpeg-5.0.patch @@ -0,0 +1,13 @@ +diff -up digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.cpp.omv~ digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.cpp +diff -up digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.h.omv~ digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.h +--- digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.h.omv~ 2022-01-16 03:21:14.916693861 +0100 ++++ digikam-7.4.0/core/libs/threadimageio/video/videodecoder_p.h 2022-01-16 03:21:22.510734851 +0100 +@@ -56,7 +56,7 @@ public: + AVFormatContext* pFormatContext; + AVCodecContext* pVideoCodecContext; + AVCodecParameters* pVideoCodecParameters; +- AVCodec* pVideoCodec; ++ const AVCodec* pVideoCodec; + AVStream* pVideoStream; + AVFrame* pFrame; + quint8* pFrameBuffer; diff --git a/digikam.spec b/digikam.spec index 23cd47f..1fff411 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,24 +1,20 @@ -# Workaround for -# Cannot handle 8-byte build ID -#define debug_package %{nil} -%define _empty_manifest_terminate_build 0 - #define beta %{nil} Summary: A KDE photo management utility Name: digikam -Version: 7.3.0 +Version: 7.8.0 License: GPLv2+ Group: Graphics Url: http://www.digikam.org -Source0: http://download.kde.org/%{?beta:un}stable/digikam/%{name}-%{version}%{?beta:-%{beta}}.tar.xz +Source0: http://download.kde.org/%{?beta:un}stable/digikam/%{version}/digiKam-%{version}%{?beta:-%{beta}}.tar.xz %if 0%{?beta:1} # Generated by tarring up po/ after running # cmake -DDIGIKAMSC_CHECKOUT_PO:BOOL=ON Source1: digikam-7.2-l10n.tar.xz %endif -Release: 2 +Release: 3 Source100: %{name}.rpmlintrc +Patch0: digikam-7.4.0-ffmpeg-5.0.patch BuildRequires: doxygen BuildRequires: eigen3 BuildRequires: flex @@ -180,6 +176,11 @@ Obsoletes: %{_lib}digikamdatabase6.1.0 < 6.2.0 Obsoletes: %{_lib}digikamdatabase6.2.0 < 6.3.0 Obsoletes: %{_lib}digikamdatabase6.3.0 < 6.4.0 Obsoletes: %{_lib}digikamdatabase6.4.0 < 6.5.0 +Obsoletes: %{_lib}digikamdatabase7.0.0 < 7.1.0 +Obsoletes: %{_lib}digikamdatabase7.1.0 < 7.2.0 +Obsoletes: %{_lib}digikamdatabase7.2.0 < 7.3.0 +Obsoletes: %{_lib}digikamdatabase7.3.0 < 7.4.0 +Obsoletes: %{_lib}digikamdatabase7.4.0 < 7.5.0 %description -n %{libdigikamdatabase} Librairie File needed by %{name} @@ -203,6 +204,11 @@ Obsoletes: %{_lib}digikamcore6.1.0 < 6.2.0 Obsoletes: %{_lib}digikamcore6.2.0 < 6.3.0 Obsoletes: %{_lib}digikamcore6.3.0 < 6.4.0 Obsoletes: %{_lib}digikamcore6.4.0 < 6.5.0 +Obsoletes: %{_lib}digikamcore7.0.0 < 7.1.0 +Obsoletes: %{_lib}digikamcore7.1.0 < 7.2.0 +Obsoletes: %{_lib}digikamcore7.2.0 < 7.3.0 +Obsoletes: %{_lib}digikamcore7.3.0 < 7.4.0 +Obsoletes: %{_lib}digikamcore7.4.0 < 7.5.0 %description -n %{libdigikamcore} Librairie File needed by %{name} @@ -224,6 +230,11 @@ Obsoletes: %{_lib}digikamgui6.1.0 < 6.2.0 Obsoletes: %{_lib}digikamgui6.2.0 < 6.3.0 Obsoletes: %{_lib}digikamgui6.3.0 < 6.4.0 Obsoletes: %{_lib}digikamgui6.4.0 < 6.5.0 +Obsoletes: %{_lib}digikamgui7.0.0 < 7.1.0 +Obsoletes: %{_lib}digikamgui7.1.0 < 7.2.0 +Obsoletes: %{_lib}digikamgui7.2.0 < 7.3.0 +Obsoletes: %{_lib}digikamgui7.3.0 < 7.4.0 +Obsoletes: %{_lib}digikamgui7.4.0 < 7.5.0 %description -n %{libdigikamgui} Librairie File needed by %name.
Not Available
benbullard79 [@T] cox.net | No Comment. | 578d 09hrs |
benbullard79 [@T] cox.net | No Comment. | 573d 12hrs |
benbullard79 [@T] cox.net | No Comment. | 573d 12hrs |