Control: tags 1004772 + patch Control: tags 1004772 + pending Dear maintainer,
I've prepared an NMU for kid3 (versioned as 3.9.1-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru kid3-3.9.1/debian/changelog kid3-3.9.1/debian/changelog --- kid3-3.9.1/debian/changelog 2022-01-25 11:29:43.000000000 +0100 +++ kid3-3.9.1/debian/changelog 2022-02-25 21:42:14.000000000 +0100 @@ -1,3 +1,10 @@ +kid3 (3.9.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patch to fix build with ffmpeg 5.0 (Closes: #1004772) + + -- Sebastian Ramacher <sramac...@debian.org> Fri, 25 Feb 2022 21:42:14 +0100 + kid3 (3.9.1-1) unstable; urgency=medium * New upstream release. diff -Nru kid3-3.9.1/debian/patches/ffmpeg-5.0.patch kid3-3.9.1/debian/patches/ffmpeg-5.0.patch --- kid3-3.9.1/debian/patches/ffmpeg-5.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ kid3-3.9.1/debian/patches/ffmpeg-5.0.patch 2022-02-25 21:41:25.000000000 +0100 @@ -0,0 +1,28 @@ +From c1ae9f076af23c3eb8391a984bab89b1ed87be60 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <aro...@archlinux.org> +Date: Wed, 26 Jan 2022 21:27:34 +0000 +Subject: [PATCH] Fix build with FFmpeg 5 + +--- + src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp b/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp +index e156d424..e12b9abd 100644 +--- a/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp ++++ b/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp +@@ -232,7 +232,11 @@ private: + friend class Format; + friend class Converter; + AVCodecContext* m_ptr; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 0) + AVCodec* m_impl; ++#else ++ const AVCodec* m_impl; ++#endif + AVFrame* m_frame; + bool m_opened; + }; +-- +GitLab + diff -Nru kid3-3.9.1/debian/patches/series kid3-3.9.1/debian/patches/series --- kid3-3.9.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ kid3-3.9.1/debian/patches/series 2022-02-25 21:41:48.000000000 +0100 @@ -0,0 +1 @@ +ffmpeg-5.0.patch
signature.asc
Description: PGP signature
