Control: tags 803870 + pending Dear maintainer,
I've prepared an NMU for vtk (versioned as 5.10.1+dfsg-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru vtk-5.10.1+dfsg/debian/changelog vtk-5.10.1+dfsg/debian/changelog --- vtk-5.10.1+dfsg/debian/changelog 2015-09-08 16:00:51.000000000 +0200 +++ vtk-5.10.1+dfsg/debian/changelog 2016-03-23 18:56:17.000000000 +0100 @@ -1,3 +1,12 @@ +vtk (5.10.1+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Andreas Cadhalpun ] + * Fix build against ffmpeg 3.0. (Closes: #803870) + + -- Sebastian Ramacher <[email protected]> Wed, 23 Mar 2016 18:56:15 +0100 + vtk (5.10.1+dfsg-2) unstable; urgency=medium * Team upload. diff -Nru vtk-5.10.1+dfsg/debian/patches/ffmpeg_2.9.patch vtk-5.10.1+dfsg/debian/patches/ffmpeg_2.9.patch --- vtk-5.10.1+dfsg/debian/patches/ffmpeg_2.9.patch 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.10.1+dfsg/debian/patches/ffmpeg_2.9.patch 2016-03-23 18:55:33.000000000 +0100 @@ -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 -Nru vtk-5.10.1+dfsg/debian/patches/series vtk-5.10.1+dfsg/debian/patches/series --- vtk-5.10.1+dfsg/debian/patches/series 2015-09-08 16:00:51.000000000 +0200 +++ vtk-5.10.1+dfsg/debian/patches/series 2016-03-23 18:55:33.000000000 +0100 @@ -7,3 +7,4 @@ wxpython3.0.patch GLX_GLEXT_LEGACY.patch tcl8.6.patch +ffmpeg_2.9.patch
signature.asc
Description: PGP signature
