commit ddd366f21e8c62b4ab62e315ec7f6e804f128c65 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Feb 26 22:45:47 2022 +0000 Update ffmpegthumbs to 21.12.2 Add ffmpeg-5 PR lang has disappear from the package 16.patch | 28 ++++++++++++++++++++++++++++ ffmpegthumbs.spec | 20 ++++++++++++-------- 2 files changed, 40 insertions(+), 8 deletions(-) --- diff --git a/16.patch b/16.patch new file mode 100644 index 0000000..6232215 --- /dev/null +++ b/16.patch @@ -0,0 +1,28 @@ +From 8c9491775a5af072bfbcf1a2fdfc1f016d1333cf Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas(a)archlinux.org&gt; +Date: Tue, 25 Jan 2022 12:53:45 +0100 +Subject: [PATCH] Fix build with FFmpeg 5 + +--- + ffmpegthumbnailer/moviedecoder.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h +index 502abe9..03eb6dd 100644 +--- a/ffmpegthumbnailer/moviedecoder.h ++++ b/ffmpegthumbnailer/moviedecoder.h +@@ -57,7 +57,11 @@ private: + int m_VideoStream; + AVFormatContext* m_pFormatContext; + AVCodecContext* m_pVideoCodecContext; ++#if LIBAVCODEC_VERSION_MAJOR < 59 + AVCodec* m_pVideoCodec; ++#else ++ const AVCodec* m_pVideoCodec; ++#endif + AVStream* m_pVideoStream; + AVFrame* m_pFrame; + quint8* m_pFrameBuffer; +-- +GitLab + diff --git a/ffmpegthumbs.spec b/ffmpegthumbs.spec index 6f6b8c6..3457fdf 100644 --- a/ffmpegthumbs.spec +++ b/ffmpegthumbs.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: ffmpegthumbs -Version: 21.04.2 -Release: 4%{?dist} +Version: 21.12.2 +Release: 1%{?dist} Summary: KDE ffmpegthumbnailer service License: GPLv2+ @@ -13,7 +13,8 @@ URL: https://projects.kde.org/projects/kde/kdemultimedia/%{name} %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-... +Source0: https://download.kde.org/%{stable}/release-service/%{version}/src/%{name}... +Patch0: https://invent.kde.org/multimedia/ffmpegthumbs/-/merge_requests/16.patch BuildRequires: extra-cmake-modules BuildRequires: pkgconfig(libjpeg) @@ -34,7 +35,7 @@ KDE ffmpegthumbnailer service %prep -%autosetup +%autosetup -p1 %build @@ -46,11 +47,9 @@ KDE ffmpegthumbnailer service %install %cmake3_install -%find_lang ffmpegthumbs - -%files -f ffmpegthumbs.lang -%license COPYING +%files +%license LICENSES/* %{_kf5_qtplugindir}/ffmpegthumbs.so %{_kf5_datadir}/kservices5/ffmpegthumbs.desktop %{_kf5_datadir}/config.kcfg/ffmpegthumbnailersettings5.kcfg @@ -59,6 +58,11 @@ KDE ffmpegthumbnailer service %changelog +* Sat Feb 26 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 21.12.2-1 +- Update ffmpegthumbs to 21.12.2 +- Add ffmpeg-5 PR +- lang has disappear from the package + * Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 21.04.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild