Control: tags 1004829 + patch Control: tags 1004829 + pending Dear maintainer,
I've prepared an NMU for goldendict (versioned as 1.5.0~rc2+git20210630+ds-2.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru goldendict-1.5.0~rc2+git20210630+ds/debian/changelog goldendict-1.5.0~rc2+git20210630+ds/debian/changelog --- goldendict-1.5.0~rc2+git20210630+ds/debian/changelog 2021-09-21 00:41:11.000000000 +0200 +++ goldendict-1.5.0~rc2+git20210630+ds/debian/changelog 2022-03-01 01:08:32.000000000 +0100 @@ -1,3 +1,10 @@ +goldendict (1.5.0~rc2+git20210630+ds-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patch to fix build with ffmpeg 5.0 (Closes: #1004829) + + -- Sebastian Ramacher <sramac...@debian.org> Tue, 01 Mar 2022 01:08:32 +0100 + goldendict (1.5.0~rc2+git20210630+ds-2) unstable; urgency=medium * Rebuild against opencc 1.1.3. diff -Nru goldendict-1.5.0~rc2+git20210630+ds/debian/patches/0002-add-supprt-for-ffmpeg-5.0.patch goldendict-1.5.0~rc2+git20210630+ds/debian/patches/0002-add-supprt-for-ffmpeg-5.0.patch --- goldendict-1.5.0~rc2+git20210630+ds/debian/patches/0002-add-supprt-for-ffmpeg-5.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ goldendict-1.5.0~rc2+git20210630+ds/debian/patches/0002-add-supprt-for-ffmpeg-5.0.patch 2022-03-01 01:07:48.000000000 +0100 @@ -0,0 +1,25 @@ +From 8acb288c9e9bdb3c6bf2e803954dd3b6ac273c05 Mon Sep 17 00:00:00 2001 +From: Liao Junxuan <mike...@126.com> +Date: Sun, 20 Feb 2022 12:28:05 +0800 +Subject: [PATCH] add support for ffmpeg 5.0 + +--- + ffmpegaudio.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index d550f4a77..7948d2187 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -94,7 +94,11 @@ struct DecoderContext + QByteArray audioData_; + QDataStream audioDataStream_; + AVFormatContext * formatContext_; ++#if LIBAVCODEC_VERSION_MAJOR < 59 + AVCodec * codec_; ++#else ++ const AVCodec * codec_; ++#endif + AVCodecContext * codecContext_; + AVIOContext * avioContext_; + AVStream * audioStream_; diff -Nru goldendict-1.5.0~rc2+git20210630+ds/debian/patches/series goldendict-1.5.0~rc2+git20210630+ds/debian/patches/series --- goldendict-1.5.0~rc2+git20210630+ds/debian/patches/series 2021-08-28 19:07:48.000000000 +0200 +++ goldendict-1.5.0~rc2+git20210630+ds/debian/patches/series 2022-03-01 01:07:58.000000000 +0100 @@ -1 +1,2 @@ 0001-Disable-default-autostart.patch +0002-add-supprt-for-ffmpeg-5.0.patch
signature.asc
Description: PGP signature
