Your message dated Sun, 17 Jul 2016 09:50:41 +0000 with message-id <e1boiif-00049m...@franck.debian.org> and subject line Bug#807853: fixed in k3b 2.0.3a-2 has caused the Debian Bug report #807853, regarding k3b: FTBFS with FFmpeg 2.9 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 807853: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807853 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: k3b Version: 2.0.3a-1 Severity: important Tags: patch User: pkg-multimedia-maintain...@lists.alioth.debian.org Usertags: ffmpeg2.9 Dear Maintainer, thanks for re-enabling the ffmpeg plugin, but unfortunately your package fails to build with the upcoming ffmpeg 2.9. This bug will become release-critical at some point when the ffmpeg2.9 transition gets closer. Attached is a patch replacing the deprecated functionality. It also works with ffmpeg 2.8. Please apply this patch and forward it upstream, if necessary. These changes are non-trivial and should be runtime-tested. Best regards, Andreasdiff --git a/debian/patches/ffmpeg-2.9.patch b/debian/patches/ffmpeg-2.9.patch new file mode 100644 index 0000000..07ee5bc --- /dev/null +++ b/debian/patches/ffmpeg-2.9.patch @@ -0,0 +1,56 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> +Last-Update: <2015-12-13> + +--- k3b-2.0.3a.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.3a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -329,6 +329,11 @@ int K3bFFMpegFile::fillOutputBuffer() + d->outputBufferPos = d->alignedOutputBuffer; + d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; + ++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 ++ AVFrame *frame = av_frame_alloc(); ++ int got_frame = 0; ++ int len = ::avcodec_decode_audio4(FFMPEG_CODEC(d->formatContext->streams[0]), frame, &got_frame, &d->packet); ++#else + #ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 + int len = ::avcodec_decode_audio3( + #else +@@ -347,14 +352,24 @@ int K3bFFMpegFile::fillOutputBuffer() + #else + d->packetData, d->packetSize ); + #endif ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); + if( len < 0 ) { ++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 ++ av_frame_free(&frame); ++#endif + kDebug() << "(K3bFFMpegFile) decoding failed for " << m_filename; + return -1; + } + ++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 ++ d->outputBufferSize = av_get_bytes_per_sample(FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt) * FFMPEG_CODEC(d->formatContext->streams[0])->channels * frame->nb_samples; ++ memcpy(d->alignedOutputBuffer, frame->data[0], d->outputBufferSize); ++ av_frame_free(&frame); ++#endif ++ + d->packetSize -= len; + d->packetData += len; + } +@@ -420,9 +435,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( c + // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do + // its thing. + // +- if( file->type() == CODEC_ID_WMAV1 || +- file->type() == CODEC_ID_WMAV2 || +- file->type() == CODEC_ID_AAC ) ++ if( file->type() == AV_CODEC_ID_WMAV1 || ++ file->type() == AV_CODEC_ID_WMAV2 || ++ file->type() == AV_CODEC_ID_AAC ) + #endif + return file; + } diff --git a/debian/patches/series b/debian/patches/series index 9db785e..f150af0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 112_dont_require_mp3.diff 113_initial_preference.diff cmake-duplicate-doc.diff +ffmpeg-2.9.patch
--- End Message ---
--- Begin Message ---Source: k3b Source-Version: 2.0.3a-2 We believe that the bug you reported is fixed in the latest version of k3b, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 807...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Pino Toscano <p...@debian.org> (supplier of updated k3b package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Sun, 17 Jul 2016 10:34:46 +0200 Source: k3b Binary: k3b k3b-data k3b-extrathemes k3b-i18n libk3b-dev libk3b6 libk3b6-extracodecs Architecture: source Version: 2.0.3a-2 Distribution: unstable Urgency: medium Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Changed-By: Pino Toscano <p...@debian.org> Description: k3b - Sophisticated CD/DVD burning application k3b-data - Sophisticated CD/DVD burning application - data files k3b-extrathemes - Sophisticated CD/DVD burning application - extra themes k3b-i18n - Sophisticated CD/DVD burning application - localizations files libk3b-dev - KDE CD/DVD burning application library - development files libk3b6 - KDE CD/DVD burning application library - runtime files libk3b6-extracodecs - KDE CD/DVD burning application library - extra decoders Closes: 807853 811735 825440 Changes: k3b (2.0.3a-2) unstable; urgency=medium . * Team upload. * Drop menu file and its pixmap, since k3b already provides a .desktop file. * Backport upstream commit 840121f0c0ecb5c1fc6324653b795fb7cba60deb to fix build with FFmpeg 2.9 and greater; patch upstream_Fixed-compilation-on-newer-ffmpeg-libav.patch (Closes: #807853) * Fix typos in README.Debian. * Update Vcs-Browser field. * Backport upstream commit d5b1016e6a4c1dfcf681ce33ea9ffdd0dd5daf24 to fix build with GCC 6; patch upstream_Fix-build-failure-when-compiling-with-GCC-5.patch (Closes: #811735) * With this upload, k3b should hopefully be back in testing. (Closes: #825440) * Remove k3b-dbg in favour of the -dbgsym packages. * Bump Standards-Version to 3.9.8, no changes required. Checksums-Sha1: c295ab20a9045baaf3a01c35549a4ddf630c6bb6 2559 k3b_2.0.3a-2.dsc af6a907bcefca3ea8c2c1c7dd9308201b3aacada 25980 k3b_2.0.3a-2.debian.tar.xz Checksums-Sha256: d9baaacd781f3ce2217aaeaa20e4899280e01af4a9f8032f6993cd3dfca7e3a7 2559 k3b_2.0.3a-2.dsc 0f6574e95733f83ecea5b36f325a7f41feeb163b3783b631e41308e4e8f2bb7a 25980 k3b_2.0.3a-2.debian.tar.xz Files: 14f92d439bada5809c55bc391a758072 2559 utils optional k3b_2.0.3a-2.dsc 13d4a757fdcc4df9f3ad315966c5d29c 25980 utils optional k3b_2.0.3a-2.debian.tar.xz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBV4tGVC0ZHIhDsT9NAQK/Pw/+PWA2VaynqeAyw1OkYPvEXyo/jHsdslZx iNlmgE3hU7Y09lXTnx4OuxH2bnpoWW8EcUvMgLL0Ah3D6lf8JHFh0tMQtyoilpa3 SCuzYe/ThUiXavY0O5FTbKoAuTm970gT+srjJdmalNBCSVAX9YWWoqQ2Ov11ktj/ f/Bw5i+lKJRcQuoe+UJhGFz2Lb9C4UGZKEj2Tja4ElU4SstOo/pFGD8oEOJn7Ots GMQSsNXSaXGwGDavhAdVUOt8TLKd1P/4J5V3ZjPjlqZ6mlRHD1n/Jwgy2vL3CuvZ N5YNaHO+LsUhWRvhjyuiOIb//vSinR8HY7YDooGeFPxjDx2OKI6ycIuQtlODf2Ss 7l2wfzrER4FU3etVqpi2az1HIPSz4B2l7jHsbrPDGaWPUoIN3hkFZ7MEe11JY/AY koWy5G00vxE2FlsHxpO2A0PfahC5JIcZERxAO4cyzcOO2U+sR0RafCD0r+fRI873 ELdPV2YSbPKZSEHGcZMPTq3QfC7AIyce33mBNK6EY3va5lz8w4yrRfBjeYUhvpUO PIoW4HaHj/aYDIP+scxsEzdfIL9xOYswKNSHcRFPHZcmRfPJKRY0y9zAnlZACNYe TxXx/QDB/djT+6DPlcT8lUgvTT+KZHVAxXCba9Qf3MUqbRvoLix5tVw/Aqp2FNJ9 Gpq03+CNQEM= =vUM5 -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ pkg-kde-extras mailing list pkg-kde-extras@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-extras
