Your message dated Tue, 08 Mar 2016 22:09:44 +0000 with message-id <e1adpp2-0004p5...@franck.debian.org> and subject line Bug#803839: fixed in lives 2.6.0-1 has caused the Debian Bug report #803839, regarding lives: 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.) -- 803839: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803839 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: lives Version: 2.4.0~ds0-1 Severity: important Tags: patch User: pkg-multimedia-maintainers@lists.alioth.debian.org Usertags: ffmpeg2.9 Dear Maintainer, 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..2f651c4 --- /dev/null +++ b/debian/patches/ffmpeg_2.9.patch @@ -0,0 +1,265 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> +Last-Update: <2015-11-02> + +--- lives-2.4.0~ds0.orig/libweed/weed-compat.h ++++ lives-2.4.0~ds0/libweed/weed-compat.h +@@ -590,44 +590,44 @@ const AVCodecTag codec_bmp_tags[] = { + #include <weed/weed-palettes.h> + #endif + +-int avi_pix_fmt_to_weed_palette(enum PixelFormat pix_fmt, int *clamped) { ++int avi_pix_fmt_to_weed_palette(enum AVPixelFormat pix_fmt, int *clamped) { + // clamped may be set to NULL if you are not interested in the value + + switch (pix_fmt) { +- case PIX_FMT_RGB24: ++ case AV_PIX_FMT_RGB24: + return WEED_PALETTE_RGB24; +- case PIX_FMT_BGR24: ++ case AV_PIX_FMT_BGR24: + return WEED_PALETTE_BGR24; +- case PIX_FMT_RGBA: ++ case AV_PIX_FMT_RGBA: + return WEED_PALETTE_RGBA32; +- case PIX_FMT_BGRA: ++ case AV_PIX_FMT_BGRA: + return WEED_PALETTE_BGRA32; +- case PIX_FMT_ARGB: ++ case AV_PIX_FMT_ARGB: + return WEED_PALETTE_ARGB32; +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUV444P: + return WEED_PALETTE_YUV444P; +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUV422P: + return WEED_PALETTE_YUV422P; +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return WEED_PALETTE_YUV420P; +- case PIX_FMT_YUYV422: ++ case AV_PIX_FMT_YUYV422: + return WEED_PALETTE_YUYV; +- case PIX_FMT_UYVY422: ++ case AV_PIX_FMT_UYVY422: + return WEED_PALETTE_UYVY; +- case PIX_FMT_UYYVYY411: ++ case AV_PIX_FMT_UYYVYY411: + return WEED_PALETTE_YUV411; +- case PIX_FMT_GRAY8: ++ case AV_PIX_FMT_GRAY8: + return WEED_PALETTE_A8; +- case PIX_FMT_MONOWHITE: +- case PIX_FMT_MONOBLACK: ++ case AV_PIX_FMT_MONOWHITE: ++ case AV_PIX_FMT_MONOBLACK: + return WEED_PALETTE_A1; +- case PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUVJ422P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV422P; +- case PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUVJ444P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV444P; +- case PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUVJ420P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV420P; + +@@ -639,48 +639,48 @@ int avi_pix_fmt_to_weed_palette(enum Pix + + + +-enum PixelFormat weed_palette_to_avi_pix_fmt(int pal, int *clamped) { ++enum AVPixelFormat weed_palette_to_avi_pix_fmt(int pal, int *clamped) { + + switch (pal) { + case WEED_PALETTE_RGB24: +- return PIX_FMT_RGB24; ++ return AV_PIX_FMT_RGB24; + case WEED_PALETTE_BGR24: +- return PIX_FMT_BGR24; ++ return AV_PIX_FMT_BGR24; + case WEED_PALETTE_RGBA32: +- return PIX_FMT_RGBA; ++ return AV_PIX_FMT_RGBA; + case WEED_PALETTE_BGRA32: +- return PIX_FMT_BGRA; ++ return AV_PIX_FMT_BGRA; + case WEED_PALETTE_ARGB32: +- return PIX_FMT_ARGB; ++ return AV_PIX_FMT_ARGB; + case WEED_PALETTE_YUV444P: + if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED) +- return PIX_FMT_YUVJ444P; +- return PIX_FMT_YUV444P; ++ return AV_PIX_FMT_YUVJ444P; ++ return AV_PIX_FMT_YUV444P; + case WEED_PALETTE_YUV422P: + if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED) +- return PIX_FMT_YUVJ422P; +- return PIX_FMT_YUV422P; ++ return AV_PIX_FMT_YUVJ422P; ++ return AV_PIX_FMT_YUV422P; + case WEED_PALETTE_YUV420P: + if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED) +- return PIX_FMT_YUVJ420P; +- return PIX_FMT_YUV420P; ++ return AV_PIX_FMT_YUVJ420P; ++ return AV_PIX_FMT_YUV420P; + case WEED_PALETTE_YUYV: +- return PIX_FMT_YUYV422; ++ return AV_PIX_FMT_YUYV422; + case WEED_PALETTE_UYVY: +- return PIX_FMT_UYVY422; ++ return AV_PIX_FMT_UYVY422; + case WEED_PALETTE_YUV411: +- return PIX_FMT_UYYVYY411; ++ return AV_PIX_FMT_UYYVYY411; + + case WEED_PALETTE_A8: +- return PIX_FMT_GRAY8; ++ return AV_PIX_FMT_GRAY8; + case WEED_PALETTE_A1: +- return PIX_FMT_MONOBLACK; ++ return AV_PIX_FMT_MONOBLACK; + + default: +- return PIX_FMT_NONE; ++ return AV_PIX_FMT_NONE; + } + +- return PIX_FMT_NONE; ++ return AV_PIX_FMT_NONE; + + } + +--- lives-2.4.0~ds0.orig/lives-plugins/plugins/decoders/avformat_decoder.c ++++ lives-2.4.0~ds0/lives-plugins/plugins/decoders/avformat_decoder.c +@@ -70,45 +70,45 @@ static int stream_peek(int fd, unsigned + + + +-static int pix_fmt_to_palette(enum PixelFormat pix_fmt, int *clamped) { ++static int pix_fmt_to_palette(enum AVPixelFormat pix_fmt, int *clamped) { + if (clamped) *clamped=WEED_YUV_CLAMPING_CLAMPED; + + switch (pix_fmt) { +- case PIX_FMT_RGB24: ++ case AV_PIX_FMT_RGB24: + return WEED_PALETTE_RGB24; +- case PIX_FMT_BGR24: ++ case AV_PIX_FMT_BGR24: + return WEED_PALETTE_BGR24; +- case PIX_FMT_RGBA: ++ case AV_PIX_FMT_RGBA: + return WEED_PALETTE_RGBA32; +- case PIX_FMT_BGRA: ++ case AV_PIX_FMT_BGRA: + return WEED_PALETTE_BGRA32; +- case PIX_FMT_ARGB: ++ case AV_PIX_FMT_ARGB: + return WEED_PALETTE_ARGB32; +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUV444P: + return WEED_PALETTE_YUV444P; +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUV422P: + return WEED_PALETTE_YUV422P; +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return WEED_PALETTE_YUV420P; +- case PIX_FMT_YUYV422: ++ case AV_PIX_FMT_YUYV422: + return WEED_PALETTE_YUYV; +- case PIX_FMT_UYVY422: ++ case AV_PIX_FMT_UYVY422: + return WEED_PALETTE_UYVY; +- case PIX_FMT_UYYVYY411: ++ case AV_PIX_FMT_UYYVYY411: + return WEED_PALETTE_YUV411; +- case PIX_FMT_GRAY8: +- case PIX_FMT_Y400A: ++ case AV_PIX_FMT_GRAY8: ++ case AV_PIX_FMT_Y400A: + return WEED_PALETTE_A8; +- case PIX_FMT_MONOWHITE: +- case PIX_FMT_MONOBLACK: ++ case AV_PIX_FMT_MONOWHITE: ++ case AV_PIX_FMT_MONOBLACK: + return WEED_PALETTE_A1; +- case PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUVJ422P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV422P; +- case PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUVJ444P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV444P; +- case PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUVJ420P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV420P; + +--- lives-2.4.0~ds0.orig/lives-plugins/plugins/decoders/mkv_decoder.c ++++ lives-2.4.0~ds0/lives-plugins/plugins/decoders/mkv_decoder.c +@@ -901,7 +901,7 @@ static int matroska_merge_packets(AVPack + out->data = newdata; + memcpy(out->data+out->size, in->data, in->size); + out->size += in->size; +- av_destruct_packet(in); ++ av_free_packet(in); + av_free(in); + return 0; + } +--- lives-2.4.0~ds0.orig/lives-plugins/plugins/decoders/mpegts_decoder.c ++++ lives-2.4.0~ds0/lives-plugins/plugins/decoders/mpegts_decoder.c +@@ -1023,7 +1023,6 @@ static int mpegts_set_stream_info(lives_ + static void new_pes_packet(PESContext *pes, AVPacket *pkt) { + av_init_packet(pkt); + +- pkt->destruct = av_destruct_packet; + pkt->data = pes->buffer; + pkt->size = pes->data_index; + +--- lives-2.4.0~ds0.orig/src/colourspace.c ++++ lives-2.4.0~ds0/src/colourspace.c +@@ -79,8 +79,8 @@ struct _swscale_ctx { + int iheight; + int width; + int height; +- enum PixelFormat ipixfmt; +- enum PixelFormat opixfmt; ++ enum AVPixelFormat ipixfmt; ++ enum AVPixelFormat opixfmt; + int flags; + struct SwsContext *ctx; + }; +@@ -10179,7 +10179,7 @@ void compact_rowstrides(weed_plant_t *la + + static struct SwsContext *swscale_find_context(int iwidth, int iheight, + int width, int height, +- enum PixelFormat ipixfmt, enum PixelFormat opixfmt, int flags) { ++ enum AVPixelFormat ipixfmt, enum AVPixelFormat opixfmt, int flags) { + register int i; + struct _swscale_ctx tmpctx; + +@@ -10217,7 +10217,7 @@ static struct SwsContext *swscale_find_c + } + + +-static void swscale_add_context(int iwidth, int iheight, int width, int height, enum PixelFormat ipixfmt, enum PixelFormat opixfmt, ++static void swscale_add_context(int iwidth, int iheight, int width, int height, enum AVPixelFormat ipixfmt, enum AVPixelFormat opixfmt, + int flags, struct SwsContext *ctx) { + // add at head of list + register int i; +@@ -10364,7 +10364,7 @@ boolean resize_layer(weed_plant_t *layer + weed_palette_is_resizable(opal_hint, oclamp_hint, FALSE)) { + struct SwsContext *swscale; + +- enum PixelFormat ipixfmt,opixfmt; ++ enum AVPixelFormat ipixfmt,opixfmt; + + void **pd_array; + void **in_pixel_data,**out_pixel_data; diff --git a/debian/patches/series b/debian/patches/series index 2801844..300e98b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 05-gcc-5.patch parallel-build.patch 9990-buildsystem.patch +ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---Source: lives Source-Version: 2.6.0-1 We believe that the bug you reported is fixed in the latest version of lives, 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 803...@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 lives 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: Tue, 08 Mar 2016 22:08:54 +0100 Source: lives Binary: libweed-dev libweed0 lives lives-data lives-plugins Architecture: source all Version: 2.6.0-1 Distribution: unstable Urgency: medium Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org> Changed-By: Sebastian Ramacher <sramac...@debian.org> Description: libweed-dev - Development library for inclusion of plugins into LiVES libweed0 - Runtime library for inclusion of plugins into LiVES lives - Video Editing system allowing users to edit and create video lives-data - Data files for LiVES lives-plugins - LiVES plugins pack Closes: 803839 Changes: lives (2.6.0-1) unstable; urgency=medium . * Team upload. * New upstream release. * debian/control: Bump Standards-Version. * debian/patch/ffmpeg3.0.patch: Apply upstream patch to fix build with ffmpeg 3.0. (Closes: #803839) Checksums-Sha1: b9c1326b87f86def25c9511eba6ff7b2386a5785 2700 lives_2.6.0-1.dsc a18f4f508acc24cd8a738ffb1d7948ed058a2e81 3785980 lives_2.6.0.orig.tar.bz2 4fa9bc4308ad0a2a9c8aa95c0e563338018c9a57 19924 lives_2.6.0-1.debian.tar.xz bccb3f68d228105761368d2ecba9cd5d7d3c0b8a 1517138 lives-data_2.6.0-1_all.deb Checksums-Sha256: c53152a3a5b2d593236f4eab93250a4ab743281f6dbc6eed527199c9e5fb883c 2700 lives_2.6.0-1.dsc 24ddb744434f53653df9275bf30e27beacaf71682e6cc2c31444c06a3e1970bc 3785980 lives_2.6.0.orig.tar.bz2 45ae5d4fb75f6cf824b9686b720c703776540fd98f8455b687125394d6ca5539 19924 lives_2.6.0-1.debian.tar.xz a646d5a112ad4a7a76ff813c7e9b981a5b50264e6cf05c3a1a9ffb8bf6b996be 1517138 lives-data_2.6.0-1_all.deb Files: ccd3654457b09e96c3f4b9150fff522d 2700 video optional lives_2.6.0-1.dsc 9cd5299b00f43fb321e0f132fe68bb0b 3785980 video optional lives_2.6.0.orig.tar.bz2 004cbf8f2abf8456faa0589f95720a9f 19924 video optional lives_2.6.0-1.debian.tar.xz e2dcacbbb00dc79a38c500378f07ab2d 1517138 video optional lives-data_2.6.0-1_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJW30AVAAoJEGny/FFupxmThs4QAJ2wHUjQ5pz/vg048ZRXWtNm 5h3k7BriekT2x6LvsKN1SdtaMCQLuVF/6VULPfXbObCH1AJHwFKqXdEN6p9aDsGe tjiJk1dfFKycRAeZEIEuUjdwsYxiHD5wpn4lOZ4aQwHk9v4K6AS+iMfimMeutl/V CA9cUgyTdMIWRvNPKpP/A7dE2weM1v1cuT109ysFJp7OKHcPsbVoiiUxkzgjDbfH KfVTQ4aJ37tP3UQD59rGQuFozYRnn/2Ybjz3DS8c7ygnUfa6BsefaMoGiQBsFBcb VJ+OF0w3LioWvpHehABHyYK9bcf+PguEoX1IIr2ysRu8rRPiL2bjlFSp7zJRw9sk Ttx9xJjJrgxAhobqi/svKjwtluzy4fc59XORVSoyYKHFr5Tsv1HkYUwYhDg/LqoZ qmteWqO4po4MoUANDb3TzdlenyUslwfxhhR0rvpgUsx5qZnC9s8CjzmOrFBXh+Fx 7m7J6lWeZ9y2ZkG/j7cZQ1dmtCButx5XNNJX2yB+UWJiNPaOm8qefYytDWtOb6zA 6VBu7r/lEcwAxnlJr9LeNO8Etag0atqlJ0CkfPQOYzP6UCLP58MsZF6Yg/Sp77eA i5DZ1sG1t6be4s1rqdVS5d8bt1F2le1BTAOcnPKhzwa0Nn5RyI9u1nPJyraZ7/PT jzvlyjq42afuGD5xlHS2 =u/AT -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
