Your message dated Mon, 25 Jan 2016 17:02:32 +0000 with message-id <e1ankxa-0007ag...@franck.debian.org> and subject line Bug#803869: fixed in vtk6 6.2.0+dfsg1-5 has caused the Debian Bug report #803869, regarding vtk6: 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.) -- 803869: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803869 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: vtk6 Version: 6.2.0+dfsg1-4 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 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 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..dd14b97 --- /dev/null +++ b/debian/patches/ffmpeg_2.9.patch @@ -0,0 +1,94 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> +Last-Update: <2015-11-02> + +--- vtk6-6.2.0+dfsg1.orig/CMake/vtkTestFFMPEG.cmake ++++ vtk6-6.2.0+dfsg1/CMake/vtkTestFFMPEG.cmake +@@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR) + #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h> + int main() + { +- img_convert(0, PIX_FMT_RGB24, +- 0, PIX_FMT_RGB24, ++ img_convert(0, AV_PIX_FMT_RGB24, ++ 0, AV_PIX_FMT_RGB24, + 0, 0); + return 0; + }\n") +--- vtk6-6.2.0+dfsg1.orig/IO/FFMPEG/vtkFFMPEGWriter.cxx ++++ vtk6-6.2.0+dfsg1/IO/FFMPEG/vtkFFMPEGWriter.cxx +@@ -189,11 +189,11 @@ int vtkFFMPEGWriterInternal::Start() + c->height = this->Dim[1]; + if (this->Writer->GetCompression()) + { +- c->pix_fmt = PIX_FMT_YUVJ422P; ++ c->pix_fmt = AV_PIX_FMT_YUVJ422P; + } + else + { +- c->pix_fmt = PIX_FMT_BGR24; ++ c->pix_fmt = AV_PIX_FMT_BGR24; + } + + //to do playback at actual recorded rate, this will need more work see also below +@@ -272,13 +272,13 @@ int vtkFFMPEGWriterInternal::Start() + #endif + + //for the output of the writer's input... +- this->rgbInput = avcodec_alloc_frame(); ++ this->rgbInput = av_frame_alloc(); + if (!this->rgbInput) + { + vtkGenericWarningMacro (<< "Could not make rgbInput avframe." ); + return 0; + } +- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height); ++ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height); + unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize); + if (!rgb) + { +@@ -286,10 +286,10 @@ int vtkFFMPEGWriterInternal::Start() + return 0; + } + //The rgb buffer should get deleted when this->rgbInput is. +- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height); ++ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height); + + //and for the output to the codec's input. +- this->yuvOutput = avcodec_alloc_frame(); ++ this->yuvOutput = av_frame_alloc(); + if (!this->yuvOutput) + { + vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." ); +@@ -347,12 +347,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm + //convert that to YUV for input to the codec + #ifdef VTK_FFMPEG_HAS_IMG_CONVERT + img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, +- (AVPicture *)this->rgbInput, PIX_FMT_RGB24, ++ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24, + cc->width, cc->height); + #else + //convert that to YUV for input to the codec + SwsContext* convert_ctx = sws_getContext( +- cc->width, cc->height, PIX_FMT_RGB24, ++ cc->width, cc->height, AV_PIX_FMT_RGB24, + cc->width, cc->height, cc->pix_fmt, + SWS_BICUBIC, NULL, NULL, NULL); + +@@ -445,14 +445,14 @@ void vtkFFMPEGWriterInternal::End() + if (this->yuvOutput) + { + av_free(this->yuvOutput->data[0]); +- av_free(this->yuvOutput); ++ av_frame_free(&this->yuvOutput); + this->yuvOutput = NULL; + } + + if (this->rgbInput) + { + av_free(this->rgbInput->data[0]); +- av_free(this->rgbInput); ++ av_frame_free(&this->rgbInput); + this->rgbInput = NULL; + } + diff --git a/debian/patches/series b/debian/patches/series index 0428c1d..b7f38e6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 60_use_system_mpi4py.patch 70_fix_ftbfs_gcc49.patch 80_fix_arm_compilation.patch +ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---Source: vtk6 Source-Version: 6.2.0+dfsg1-5 We believe that the bug you reported is fixed in the latest version of vtk6, 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. Anton Gladky <gl...@debian.org> (supplier of updated vtk6 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, 20 Dec 2015 18:02:41 +0100 Source: vtk6 Binary: libvtk6-dev libvtk6-qt-dev libvtk6.2 libvtk6.2-qt libvtk6-java python-vtk6 tcl-vtk6 vtk6 vtk6-doc vtk6-examples Architecture: source ppc64el all Version: 6.2.0+dfsg1-5 Distribution: unstable Urgency: medium Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org> Changed-By: Anton Gladky <gl...@debian.org> Description: libvtk6-dev - VTK header files libvtk6-java - Visualization Toolkit - A high level 3D visualization library - j libvtk6-qt-dev - VTK header files, containing Qt files libvtk6.2 - VTK libraries libvtk6.2-qt - VTK libraries, Qt files python-vtk6 - Python bindings for VTK tcl-vtk6 - Tcl bindings for VTK vtk6 - Binaries for VTK6 vtk6-doc - VTK class reference documentation vtk6-examples - VTK examples Closes: 751395 798963 802624 803869 Changes: vtk6 (6.2.0+dfsg1-5) unstable; urgency=medium . [ Anton Gladky ] * [5110a34] Remove libqtwebkit-dev from depends of libvtk6-qt-dev. * Update d/copyright. Thanks to Thorsten Alteholz for pointing this out. . [ Gert Wollny ] * [8fd5f1f] Move vtk-doc perl-scripts to dev-package. (Closes: #751395) . [ Andreas Tille ] * [9581b71] Re-introduce libvtk6-java. (Closes: #798963) * [9689d50] Remove files from Git repository that are not part of upstream source . [ Bas Couwenberg ] * [429f902] Add patch for GDAL 2.0 support. (Closes: #802624) . [ Andreas Cadhalpun ] * [8c4dcf0] Add support for FFmpeg 2.9. (Closes: #803869) Checksums-Sha1: 645d3563c9c3b1e54992f8525b5d6c0d4f5a7946 3786 vtk6_6.2.0+dfsg1-5.dsc 1e36e119cac7dabed6189b0017c487bda8217893 23292 vtk6_6.2.0+dfsg1-5.debian.tar.xz d47d711280d09d63e790f7a3bbad79c0bf398022 39596422 libvtk6-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb a00501d14985d7caf1a2e855e8f4429247f87d6d 6229068 libvtk6-dev_6.2.0+dfsg1-5_ppc64el.deb 29e24c81bcdeb9dd3e0eafd74dc95be1d9a6086c 374518 libvtk6-java-dbgsym_6.2.0+dfsg1-5_ppc64el.deb b96567c428b31a909ec2414579c73cf46350d5e3 3253896 libvtk6-java_6.2.0+dfsg1-5_ppc64el.deb 8553cc672ae54cfd255a9c343ef198affab1fd25 9538 libvtk6-qt-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb ca716ad89280263d07e16039cce9a01722914e16 42422 libvtk6-qt-dev_6.2.0+dfsg1-5_ppc64el.deb aebf31eca99a22de24f938363268a37c603d2b01 191308070 libvtk6.2-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 14c95caf22c98cb1f9346d52dfafc17c6f7eacba 4512316 libvtk6.2-qt-dbgsym_6.2.0+dfsg1-5_ppc64el.deb e2ce474f9d27f65dbd344afeb84b700ebda2da5a 231264 libvtk6.2-qt_6.2.0+dfsg1-5_ppc64el.deb 7b9b28670484198c9a1471dd84dba40bd6ea3f60 29109780 libvtk6.2_6.2.0+dfsg1-5_ppc64el.deb aba5d453ecec193e46cd30612b293b78b788d43d 1112004 python-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 55502ce855b8b893243bb98decd5faa32f2e698d 239244 python-vtk6_6.2.0+dfsg1-5_ppc64el.deb e11b4c56fb43c5d8260b536d33f1de979cbc1f82 210124 tcl-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 9d08120499dd4ce599a3c1cda316b43e54ae179b 128220 tcl-vtk6_6.2.0+dfsg1-5_ppc64el.deb af2840dde9b90e4e6fc6f4da91d07dedee8bbdaa 454014 vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb ac99bfba7f6acbaa30085a4f288a2e24d6ef8342 52678992 vtk6-doc_6.2.0+dfsg1-5_all.deb 0438ba8c73e4d5a4df65448d345e5d3dbb64e560 506130 vtk6-examples_6.2.0+dfsg1-5_all.deb d4f03dd7718e2a6ad62dc21dfc8dd895b4590424 164566 vtk6_6.2.0+dfsg1-5_ppc64el.deb Checksums-Sha256: 0dccaef4297b02f2c627363ce63535d7c6ad6a28ef1383f251cc4c7ffae56b5d 3786 vtk6_6.2.0+dfsg1-5.dsc 40f57371dc064e4b730f21a22cdc234afcee028908789eb60e1eff5906c30021 23292 vtk6_6.2.0+dfsg1-5.debian.tar.xz 96d166d3b7b9349b11e7e0274632e64e2bf5efe6955af2f9d1f49f1fee998fdc 39596422 libvtk6-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb b6b2b92c405b487c86af180f75f74e291f682d90b890db66cd46eb78053f4de4 6229068 libvtk6-dev_6.2.0+dfsg1-5_ppc64el.deb 12f9a44c048df04b23ac4e921307bd4194a911bf257d525aa03b7f6a1b8e0530 374518 libvtk6-java-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 76c48d0f9b9deade2989249bef31d43b8025cc95c932b704ddac774be66d7b7c 3253896 libvtk6-java_6.2.0+dfsg1-5_ppc64el.deb 998b95dd0e463aa578cb1e426b2122320398a9933ba046d41aa577530c5899c6 9538 libvtk6-qt-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 820d37a60ad322007ce0025726e7396ec9179d10b3abc7b2df245b40ff9a1e76 42422 libvtk6-qt-dev_6.2.0+dfsg1-5_ppc64el.deb bf68e86a15593a8772220955ebba2ac56ee802142173ec15c1e9a46b26e80460 191308070 libvtk6.2-dbgsym_6.2.0+dfsg1-5_ppc64el.deb d7d01ddd2121fbea379421d79731efebc37aec4c15b4e6c2186676451900e6bc 4512316 libvtk6.2-qt-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 23c882ca486ff05bcf391ac5aea996025b82de9e3bb7a3cc18a6b8fac53de3d4 231264 libvtk6.2-qt_6.2.0+dfsg1-5_ppc64el.deb 4100e0dc041df51f225b1935f6088b78c9e2b861f8ab16cd410a56dcdfc7c552 29109780 libvtk6.2_6.2.0+dfsg1-5_ppc64el.deb e062dc56d09975b4f51e6e08ce23a73888f27a3cb57b998b53a347ba0ae92d54 1112004 python-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 23da8e6362e3c229e8b30d37995ae425f47456eebc94dca5da9168bdd744f7a2 239244 python-vtk6_6.2.0+dfsg1-5_ppc64el.deb bc2dbf74319816deef855af0d15bc4f925aeabc792ba21d54a86d3f4399a6ab5 210124 tcl-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 5397b2d73220002ea80b03ad9a5cf7916fec8aa0800418a660b3cd61c0df42c5 128220 tcl-vtk6_6.2.0+dfsg1-5_ppc64el.deb 47133898a624528d0e8b833c69b137f70f5562d14cfe08e038c2c96c7cf5103a 454014 vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 61df703b0aa495e7bbe56392b8462ebe843848938685f1e64e6f879b88cde272 52678992 vtk6-doc_6.2.0+dfsg1-5_all.deb 57e8f4ce232966d1831328a1d6667d855b9b93450abe222e4bbacc22c76803e0 506130 vtk6-examples_6.2.0+dfsg1-5_all.deb 20f6f893a29cb76edc2c2b03b7422d3d8f013e205153adcdf1eba58539666ee3 164566 vtk6_6.2.0+dfsg1-5_ppc64el.deb Files: d72c9bc99abd4c4c4a4dc9e5a29fb53d 3786 graphics optional vtk6_6.2.0+dfsg1-5.dsc f4f3adf66ffa65d57adf029d6e299897 23292 graphics optional vtk6_6.2.0+dfsg1-5.debian.tar.xz 0471b9ab3bbc4c5018e49dd33fa7c7d5 39596422 debug extra libvtk6-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 4c323ef50008e79fa3309f97b5c1203b 6229068 libdevel optional libvtk6-dev_6.2.0+dfsg1-5_ppc64el.deb c4b3a521bc273288c4bede7cd6f351a7 374518 debug extra libvtk6-java-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 2e1658716b24f98c1d06215b7904ff18 3253896 java optional libvtk6-java_6.2.0+dfsg1-5_ppc64el.deb 8831715deb29dbeceaa23c788759d1bd 9538 debug extra libvtk6-qt-dev-dbgsym_6.2.0+dfsg1-5_ppc64el.deb b407db0841c725190e8ab86e08456ad0 42422 libdevel optional libvtk6-qt-dev_6.2.0+dfsg1-5_ppc64el.deb 0dd8506d50fe9e92993f036fe87cfd48 191308070 debug extra libvtk6.2-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 2ef6221aedad33cff36456a43a19a76f 4512316 debug extra libvtk6.2-qt-dbgsym_6.2.0+dfsg1-5_ppc64el.deb a4902cc4cefa3673c19712e8927ec0fe 231264 libs optional libvtk6.2-qt_6.2.0+dfsg1-5_ppc64el.deb 59d956043834c60be0335e6d0c82efad 29109780 libs optional libvtk6.2_6.2.0+dfsg1-5_ppc64el.deb fa327c9bb8b0a0da7241ee987dcfd694 1112004 debug extra python-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb 463df048120808e415ca554c0c988036 239244 python optional python-vtk6_6.2.0+dfsg1-5_ppc64el.deb e2e524978493bb4839979e10975e0c80 210124 debug extra tcl-vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb d6b4493193aed7bbd76f007089b3b2d0 128220 interpreters optional tcl-vtk6_6.2.0+dfsg1-5_ppc64el.deb 87c126179e7f9a38e8c1c68c7a99b620 454014 debug extra vtk6-dbgsym_6.2.0+dfsg1-5_ppc64el.deb f3a9ccad08e3963e0b28f87407426b60 52678992 doc optional vtk6-doc_6.2.0+dfsg1-5_all.deb c6c8b25dbe9e783871c5585fdb4bdea3 506130 graphics optional vtk6-examples_6.2.0+dfsg1-5_all.deb 74c0f7216a66442c7a5fb68787aa77bf 164566 interpreters optional vtk6_6.2.0+dfsg1-5_ppc64el.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWlrEPAAoJENPhc4PPp/8GiPwP/1ZqRdoeAefAwrb70AT4GmPp 0Nge+15JQdF+25ygptzMLf8dHkpCIBknhcX2QoPGb9hr+cVuLtwnmxNhNOte2wJp tPambO+YgSVog41ZKEfp7GtG37sxlLqAOhhAzy5MOOgA+tcFou2Js3Y7UxQe8UZi 027vNxSozPM3wv0HU2JLpzdoGiZi4Su1v/vnGouqNkLOy466rovMfUfHGnjKqC8c HgRxV7eFRI3sjH8T3rXekI2pHnde9JiT7SSk/khWB9VQkDPlJhP9sZG8j2M1lJ8R C7WFG9Y6mQLd/T2pKIUb9ee2/AP5+W+rblBdSN6D8YQHEGqmL2lKcHTnnm+yIktj Ff9LDHHfcGSQVYho9vQflWKzQzwu8DSB0L79ScMKba7QXxTTuPboAVOkemuSu8ig PHzu9mMVrtotNgq3NJuXJmzw13JXTIxUhFyu91kxrl6R4veXqArLqWtVppV9/Hau q+RtdhN11/XpVUXXNBFtESR/Y3hWp2W5jx9et2BVD0ZRXYUifFPGF7llH0QjwLys kjPUGOwWIS5UD3HrnKii9RoGSNP6VolDBFiZuuF1NpbsMzlJ4tx+Yc3QpuUyoz/w p+8qjEJ3tasIYXL7DuQNemFQUF/xqrxmKeJUMNKGw2lvXa/C1tcKuzpnXDmRV953 kaUZqCjC/2yUOOYW/pAq =DCz8 -----END PGP SIGNATURE-----
--- End Message ---
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
