Control: tags 1004760 + patch Control: tags 1004760 + pending Dear maintainer,
I've prepared an NMU for qmmp (versioned as 1.4.4-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru qmmp-1.4.4/debian/changelog qmmp-1.4.4/debian/changelog --- qmmp-1.4.4/debian/changelog 2021-02-22 21:02:09.000000000 +0100 +++ qmmp-1.4.4/debian/changelog 2022-03-06 12:21:42.000000000 +0100 @@ -1,3 +1,10 @@ +qmmp (1.4.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patch to fix build with ffmpeg 5.0 (Closes: #1004760) + + -- Sebastian Ramacher <sramac...@debian.org> Sun, 06 Mar 2022 12:21:42 +0100 + qmmp (1.4.4-1) unstable; urgency=medium * New upstream version. diff -Nru qmmp-1.4.4/debian/patches/ffmpeg-5.0.patch qmmp-1.4.4/debian/patches/ffmpeg-5.0.patch --- qmmp-1.4.4/debian/patches/ffmpeg-5.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ qmmp-1.4.4/debian/patches/ffmpeg-5.0.patch 2022-03-06 12:21:42.000000000 +0100 @@ -0,0 +1,45 @@ +Description: fixed build with latest ffmpeg version +From: https://sourceforge.net/p/qmmp-dev/code/9959/ + +--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp ++++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +@@ -114,6 +114,9 @@ + qWarning("DecoderFFmpeg: too small buffer size: %d bytes", pd.buf_size); + return false; + } ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 0) ++ const ++#endif + AVInputFormat *fmt = av_probe_input_format(&pd, 1); + if(!fmt) + { +@@ -229,6 +232,9 @@ + + av_dump_format(m_formatContext,0,nullptr,0); + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 0, 0) ++ const ++#endif + AVCodec *codec = avcodec_find_decoder(m_codecContext->codec_id); + + if (!codec) +--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp ++++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +@@ -58,7 +58,7 @@ + pd.buf = buf; + if(pd.buf_size < PROBE_BUFFER_SIZE) + return false; +- AVInputFormat *fmt = av_probe_input_format(&pd, 1); ++ const AVInputFormat *fmt = av_probe_input_format(&pd, 1); + if(!fmt) + return false; + +@@ -220,7 +220,7 @@ + info->setValue(Qmmp::CHANNELS, c->channels); + info->setValue(Qmmp::BITS_PER_SAMPLE, c->bits_per_raw_sample); + +- AVCodec *codec = avcodec_find_decoder(c->codec_id); ++ const AVCodec *codec = avcodec_find_decoder(c->codec_id); + if(codec) + info->setValue(Qmmp::FORMAT_NAME, QString::fromLatin1(codec->name)); + info->setValue(Qmmp::FILE_SIZE, QFileInfo(filePath).size()); //adds file size for cue tracks diff -Nru qmmp-1.4.4/debian/patches/series qmmp-1.4.4/debian/patches/series --- qmmp-1.4.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ qmmp-1.4.4/debian/patches/series 2022-03-06 12:19:10.000000000 +0100 @@ -0,0 +1 @@ +ffmpeg-5.0.patch
signature.asc
Description: PGP signature
