Your message dated Sun, 06 Mar 2016 22:22:04 +0000 with message-id <e1ach3s-0000oc...@franck.debian.org> and subject line Bug#810557: fixed in cmus 2.7.1+git20160225-1 has caused the Debian Bug report #810557, regarding cmus: FTBFS with FFmpeg 2.9/3.0 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.) -- 810557: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810557 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: cmus Version: 2.7.1-1 Severity: important Tags: patch User: pkg-multimedia-maintain...@lists.alioth.debian.org Usertags: ffmpeg2.9 Dear Maintainer, your package fails to build with the upcoming version of ffmpeg, which is planned to be released this month (and will be called 2.9 or 3.0). This bug will become release-critical at some point when this ffmpeg 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 have little regression potential. Best regards, Andreasdiff --git a/debian/patches/ffmpeg-2.9.patch b/debian/patches/ffmpeg-2.9.patch new file mode 100644 index 0000000..c67c49c --- /dev/null +++ b/debian/patches/ffmpeg-2.9.patch @@ -0,0 +1,69 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> +Last-Update: <2016-01-09> + +--- cmus-2.7.1.orig/ffmpeg.c ++++ cmus-2.7.1/ffmpeg.c +@@ -39,7 +39,7 @@ + #include <libavformat/avio.h> + #include <libswresample/swresample.h> + #include <libavutil/opt.h> +-#include <libavutil/audioconvert.h> ++#include <libavutil/channel_layout.h> + #ifndef AVUTIL_MATHEMATICS_H + #include <libavutil/mathematics.h> + #endif +@@ -235,7 +235,7 @@ static int ffmpeg_open(struct input_plug + + codec = avcodec_find_decoder(cc->codec_id); + if (!codec) { +- d_print("codec not found: %d, %s\n", cc->codec_id, cc->codec_name); ++ d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id)); + err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; + break; + } +@@ -248,7 +248,7 @@ static int ffmpeg_open(struct input_plug + #else + if (avcodec_open2(cc, codec, NULL) < 0) { + #endif +- d_print("could not open codec: %d, %s\n", cc->codec_id, cc->codec_name); ++ d_print("could not open codec: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id)); + err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; + break; + } +@@ -347,7 +347,7 @@ static int ffmpeg_fill_buffer(AVFormatCo + struct ffmpeg_output *output, SwrContext *swr) + { + #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0)) +- AVFrame *frame = avcodec_alloc_frame(); ++ AVFrame *frame = av_frame_alloc(); + int got_frame; + #endif + while (1) { +@@ -363,7 +363,7 @@ static int ffmpeg_fill_buffer(AVFormatCo + if (av_read_frame(ic, &input->pkt) < 0) { + /* Force EOF once we can read no longer. */ + #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0)) +- avcodec_free_frame(&frame); ++ av_frame_free(&frame); + #endif + return 0; + } +@@ -426,7 +426,7 @@ static int ffmpeg_fill_buffer(AVFormatCo + res = 0; + output->buffer_pos = output->buffer; + output->buffer_used_len = res * cc->channels * sizeof(int16_t); +- avcodec_free_frame(&frame); ++ av_frame_free(&frame); + return output->buffer_used_len; + } + #endif +@@ -566,7 +566,7 @@ static long ffmpeg_current_bitrate(struc + long bitrate = -1; + #if (LIBAVFORMAT_VERSION_INT > ((51<<16)+(43<<8)+0)) + /* ape codec returns silly numbers */ +- if (priv->codec->id == CODEC_ID_APE) ++ if (priv->codec->id == AV_CODEC_ID_APE) + return -1; + #endif + if (priv->input->curr_duration > 0) { diff --git a/debian/patches/series b/debian/patches/series index c2cfb69..cb3676a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_config.mk.diff 02_link_avcodec.patch 11-fix_modplug_detection.patch +ffmpeg-2.9.patch
--- End Message ---
--- Begin Message ---Source: cmus Source-Version: 2.7.1+git20160225-1 We believe that the bug you reported is fixed in the latest version of cmus, 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 810...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Sebastian Ramacher <sramac...@debian.org> (supplier of updated cmus 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: SHA256 Format: 1.8 Date: Sun, 06 Mar 2016 21:37:57 +0100 Source: cmus Binary: cmus cmus-plugin-ffmpeg Architecture: source Version: 2.7.1+git20160225-1 Distribution: unstable Urgency: medium Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintain...@lists.alioth.debian.org> Changed-By: Sebastian Ramacher <sramac...@debian.org> Description: cmus - lightweight ncurses audio player cmus-plugin-ffmpeg - lightweight ncurses audio player (FFmpeg plugin) Closes: 810557 Changes: cmus (2.7.1+git20160225-1) unstable; urgency=medium . * Team upload. * New upstream snapshot. - Fix build against ffmpeg 3.0. (Closes: #810557) * debian/patches/{01_config.mk.diff,02_link_avcodec.patch}: Removed, applied upstream. * debian/control: - Bump Standards Version. - Update Vcs-Git. Checksums-Sha1: de9bc35e3308109670371b34edb392b1ffdcf378 2471 cmus_2.7.1+git20160225-1.dsc 9a5fff0c8c10054d67ee94f28ae97dfa027637ac 233996 cmus_2.7.1+git20160225.orig.tar.xz 1882696f3838c4f0edb52ed15f4d1d5818d36d41 8192 cmus_2.7.1+git20160225-1.debian.tar.xz Checksums-Sha256: 19c7d23754c69f691b0c145c2f9ee35f9e71eb01aa351c53bbc54c2a1e6aae3a 2471 cmus_2.7.1+git20160225-1.dsc da6d939b636b5970ae4fd1f5a39b2d0efe2ae8de8210c82635912097c322bae4 233996 cmus_2.7.1+git20160225.orig.tar.xz b068f53a4b18b2c6fdbccd244fb70cf929e186ccdc6532af8932bc679e10266b 8192 cmus_2.7.1+git20160225-1.debian.tar.xz Files: 755e1a072624fa4066170887d1a2ef18 2471 sound optional cmus_2.7.1+git20160225-1.dsc 5350797e77ba84ad22fbadb55b399c47 233996 sound optional cmus_2.7.1+git20160225.orig.tar.xz a72580d4f86c130422bc9aa58ad405c8 8192 sound optional cmus_2.7.1+git20160225-1.debian.tar.xz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJW3JdHAAoJEGny/FFupxmTPngQAKRoMlp4eciC6si5tsBdD96f 6JPJYB3kB6IvbrD4H5IWpe+Bz2jTev5XkNC7oSi+DSzG35Z9HxTiUFy4oeuD2nQ0 joMgOzibyFDdGrHCwulWrLHtLHYUcp9z8R2o6DM8ofH8tb4h5XoArOVslLnuU4zY Mz0f4unsSx8PnRresbnHMRaTy9ohM5rmq7kP7MHiSUSA90RblgTl2IWtcblHNgYk NaZoeAnnxPS6/XLQHHORGhB1UvsjQYyrUI72HhjHYRWTdjnVuEZHdeAKtPC1P4B4 2uu4Vez3am9RFAV1mykxsKQ035ENXaLPR8NayXLxiL7AJS0QN4BZPInGZK1gYdqC Z1QeuOr0KPu/srXX5N4k+yJLykTrNjQJ+qi0IzRjmbRUPWVKY8RajulDeYzr7+wr Hq/9tc99x/xzHNUfdac71phudaAX2MCJyuALtB6BAyIjRGoVmPRNcBXv8ILB8WNZ Kn8JFCBTrujANstZaCaHKPDYBPNHnnXrTGIGryXzKdfjFTSSg3Z0CmIC+zngrXTX uruofAmxzm/LZCfXYD0fiKYfQ8OzrdbQwygQ1OXwzvwEixX13SLl6pIKxupkoj9o H7NjLLAXVOVhXvzL8EtnopKB53nyz5W/oP/O/pVhqU21wSkM9pnze77Dl4ynoAux fMSHRYy5hjDrXqwxu+cK =m7kL -----END PGP SIGNATURE-----
--- End Message ---
