Your message dated Fri, 25 Mar 2016 18:53:06 +0000
with message-id <[email protected]>
and subject line Bug#803870: fixed in vtk 5.10.1+dfsg-2.1
has caused the Debian Bug report #803870,
regarding vtk: 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 [email protected]
immediately.)
--
803870: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803870
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: vtk
Version: 5.10.1+dfsg-2
Severity: important
Tags: patch
User: [email protected]
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,
Andreas
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..d464a2a
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,89 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2015-11-02>
+
+--- vtk-5.10.1+dfsg.orig/CMake/vtkFFMPEGTestImgConvert.cxx
++++ vtk-5.10.1+dfsg/CMake/vtkFFMPEGTestImgConvert.cxx
+@@ -8,8 +8,8 @@ extern "C" {
+
+ 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;
+ }
+--- vtk-5.10.1+dfsg.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.10.1+dfsg/IO/vtkFFMPEGWriter.cxx
+@@ -161,7 +161,7 @@ int vtkFFMPEGWriterInternal::Start()
+ c->codec_type = AVMEDIA_TYPE_VIDEO;
+ c->width = this->Dim[0];
+ c->height = this->Dim[1];
+- c->pix_fmt = PIX_FMT_YUVJ420P;
++ c->pix_fmt = AV_PIX_FMT_YUVJ420P;
+ //change DIV3 to MP43 fourCC to be easily playable on windows
+ //c->codec_tag = ('3'<<24) + ('4'<<16) + ('P'<<8) + 'M';
+ //to do playback at actual recorded rate, this will need more work see also below
+@@ -239,13 +239,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 = new unsigned char[RGBsize];
+ if (!rgb)
+ {
+@@ -253,10 +253,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." );
+@@ -314,12 +314,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);
+
+@@ -414,14 +414,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 aa28e71..fd67a89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ multiarch-libpq.patch
wxpython3.0.patch
GLX_GLEXT_LEGACY.patch
tcl8.6.patch
+ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---
Source: vtk
Source-Version: 5.10.1+dfsg-2.1
We believe that the bug you reported is fixed in the latest version of
vtk, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sebastian Ramacher <[email protected]> (supplier of updated vtk 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 23 Mar 2016 18:56:15 +0100
Source: vtk
Binary: vtk-doc vtk-examples libvtk5.10 libvtk-java libvtk5-dev libvtk5.10-qt4
libvtk5-qt4-dev tcl-vtk python-vtk
Architecture: source all
Version: 5.10.1+dfsg-2.1
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Team
<[email protected]>
Changed-By: Sebastian Ramacher <[email protected]>
Description:
libvtk-java - Visualization Toolkit - A high level 3D visualization library - j
libvtk5-dev - VTK header files for building C++ code
libvtk5-qt4-dev - Visualization Toolkit - A high level 3D visualization
library - Q
libvtk5.10 - Visualization Toolkit - A high level 3D visualization library - r
libvtk5.10-qt4 - Visualization Toolkit - A high level 3D visualization library
- Q
python-vtk - Python bindings for VTK
tcl-vtk - Tcl bindings for VTK
vtk-doc - VTK class reference documentation
vtk-examples - C++, Tcl and Python example programs/scripts for VTK
Closes: 803870
Changes:
vtk (5.10.1+dfsg-2.1) unstable; urgency=medium
.
* Non-maintainer upload.
.
[ Andreas Cadhalpun ]
* Fix build against ffmpeg 3.0. (Closes: #803870)
Checksums-Sha1:
d295d90ca417b7f6218e57d0b71895ad33c89f41 3073 vtk_5.10.1+dfsg-2.1.dsc
2f6a01b8e527dc870c8a14efd8eddd64f9fcd7a1 46120
vtk_5.10.1+dfsg-2.1.debian.tar.xz
9de029af6c4201d7b43c37c59feb9ef635e6bc80 424084 vtk-doc_5.10.1+dfsg-2.1_all.deb
f1f28695eff937a70b9e01f54b0b411225deae4e 309856
vtk-examples_5.10.1+dfsg-2.1_all.deb
Checksums-Sha256:
f2c11ab9cf3fd1f944dab5ed2448ef1b79c264fc26c32474652f460ed7f09dc0 3073
vtk_5.10.1+dfsg-2.1.dsc
7695b213e5e09b3e9da31588daf593e84514d1cfd81688862d698f6cf5c87c1b 46120
vtk_5.10.1+dfsg-2.1.debian.tar.xz
1ac7f32db1ca9c0ead62f3d34d452e01c86fe299d562f09ec239b22c6dd99c19 424084
vtk-doc_5.10.1+dfsg-2.1_all.deb
e7f693a35567f47c56eda6f0d2e53353e26095b0f40c17af2abfa3d6ed153622 309856
vtk-examples_5.10.1+dfsg-2.1_all.deb
Files:
6482789557c0eb9fc1698d59d9466a95 3073 graphics optional vtk_5.10.1+dfsg-2.1.dsc
a219b6bb9fdac1a875feffee41d7fa97 46120 graphics optional
vtk_5.10.1+dfsg-2.1.debian.tar.xz
41569fc56ac7f57c4f79c9e7b35984d9 424084 doc optional
vtk-doc_5.10.1+dfsg-2.1_all.deb
979c1775a9dcd58b6ee4b08adde8ba9d 309856 graphics optional
vtk-examples_5.10.1+dfsg-2.1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJW8t8QAAoJEGny/FFupxmTXacP/iw5yT9ZZJmuofMIOiKA3LVJ
G2B0aSbox0BrQ99VPi0GzRRVa0wcO49DqjWfVDFVfOfKCiFdhceOtM6rMN+3GeyD
ONeQTT86jUZlK6Ydnsy5Ol+nCFZ2jC5BCmPFG7ybwCQYQyMQeqDbEGfkYWDQrktY
+TgxgoUV86qLmzhxCi8qEOQqci5P/CbERYoEtStShYrhxXf2zU7Fdqzw9I/Z278q
06VJGF7K7tvNPRfrZD7OYSENhHpQmRfijfyak+irRF1iTC16HdX9DgaoxIkK3Izv
LZJ1ZE1OktS7bdu6yjQVO8kB8N6/oEDS1cpfh/3WqBj/jwFkAlxuJEUQZjcjGBMT
r+74P//fBUwCgpYZx7jGsKuIy1xFJs0B82vawhSkKAurR6AeUJRubgSNAnbCvp4g
mmZ0w1Q1A5nTSmW7Xa2iGMEZQ/qOO/aofx9E7xbVvrY95lrx2UNa5kNVgToN2Zop
W1LS0ryVh+g67JffiDnSFbNvuwBgnWWsnVG8X0Yh/35CGRO/17pm/JvQJv2IuFqV
8+HhFKoIr00a1v5dOotkl1uZgoTNMPIXhnIA6tBkxnSrIA2NxsinLeBFztnkrpU6
tuMMQECvqyFFd/ViG+zS9nz382A+ciAyoBD1AFR+YmKz26yhCW6SUgC7HFwVc5W6
Sb3CLjomYzDhQGzWUUmi
=IzKx
-----END PGP SIGNATURE-----
--- End Message ---
--
debian-science-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
