Your message dated Sun, 10 Jan 2016 13:34:19 +0000
with message-id <e1aig8r-000145...@franck.debian.org>
and subject line Bug#803852: fixed in paraview 4.1.0+dfsg+1-3
has caused the Debian Bug report #803852,
regarding paraview: 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.)
--
803852: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803852
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: paraview
Version: 4.1.0+dfsg+1-2
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,
Andreas
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..044e96e
--- /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>
+
+--- paraview-4.1.0+dfsg+1.orig/VTK/CMake/vtkTestFFMPEG.cmake
++++ paraview-4.1.0+dfsg+1/VTK/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")
+--- paraview-4.1.0+dfsg+1.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ paraview-4.1.0+dfsg+1/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -184,11 +184,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
+@@ -267,13 +267,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)
+ {
+@@ -281,10 +281,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." );
+@@ -342,12 +342,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);
+
+@@ -440,14 +440,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 7eea230..ba82afb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix_ftbfs_gcc49.patch
fix_GLintptr_FTBFS.patch
fix_ftbfs_freetype.patch
reduce_cmake_error.cmake
+ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---
Source: paraview
Source-Version: 4.1.0+dfsg+1-3
We believe that the bug you reported is fixed in the latest version of
paraview, 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 paraview 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, 10 Jan 2016 13:53:22 +0100
Source: paraview
Binary: paraview paraview-dev paraview-doc paraview-python
Architecture: source
Version: 4.1.0+dfsg+1-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Team
<debian-science-maintainers@lists.alioth.debian.org>
Changed-By: Anton Gladky <gl...@debian.org>
Description:
paraview - Parallel Visualization Application
paraview-dev - Parallel Visualization Application. Development header files
paraview-doc - Parallel Visualization Application. Comprehensive documentation
paraview-python - Parallel Visualization Application. python-support
Closes: 766406 803852
Changes:
paraview (4.1.0+dfsg+1-3) unstable; urgency=medium
.
[ Andreas Cadhalpun ]
* [53ca345] Replace deprecated FFmpeg API. (Closes: #803852)
.
[ Anton Gladky ]
* [ff45e72] Fix rescale over time. (Closes: #766406)
* [b909a2d] Apply cme fix dpkg.
Checksums-Sha1:
cd8d92b6e3aca39e1a94b45fba5c9c06285c5ed5 2786 paraview_4.1.0+dfsg+1-3.dsc
b370aeef983fb23ab4c499c00bd3d3757cb5a1c7 31244
paraview_4.1.0+dfsg+1-3.debian.tar.xz
Checksums-Sha256:
667c0f6c90f7a38165d469fb64083150fdbb2b19337794914e119fef6c7c6534 2786
paraview_4.1.0+dfsg+1-3.dsc
afb51ba0f843d14e195123cbcd7c299ad395a9fa9f5053551dd2061d8b8a442d 31244
paraview_4.1.0+dfsg+1-3.debian.tar.xz
Files:
27df66b58cdcbd34b19ed1770b481a8b 2786 science extra paraview_4.1.0+dfsg+1-3.dsc
44f2b886447c2d14fb5ba72a18908845 31244 science extra
paraview_4.1.0+dfsg+1-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJWklvUAAoJENPhc4PPp/8GcicP/AxU+DFGTHwm+Pj/al/lBE1K
AHlSiTClDtnjWeankf0zntBfjfYcz30AE3o/fx64aWTqNcC+9Va6ghtUNR1b/vnT
0MJY46U4jzI0/E4UAaktON3MIx8frvHeJDIho9lQkA8lBUcSVPH0DQN1MxjcYu8/
j5vyihEjY/HR3KC14vxRaINxnLHM/cPRGOEqkb+iWjoOvo4fIqK89dZYlqfQAnNc
5B6BNryeyE2gE8OB9E/DB5s0O4C5tVs6hKJB0iS6luDu7xYFbxpnpBm12tq+NSG+
lW8cM2Ze5QYARwhGACFGVA5Zr+I+eltMC2zvhMJG/HdN+ruofmGb59vmoCSHPBYK
Sr0nQLrrciYkAymE9T2R/oD8Eds8bu171vqoCaqQlAj35yPw4Dlx1v3gSSPwKx4M
zZSG7hmas1lrhyNQ7u0okI/9rcJ38ShsfkL29ab1Q4Y+o9kqmpdvZ8XB/e5gqWr8
Whc4rOoHbf+mpt7enqVJmnpvN7Y43WygafHJwVpNGpxolRxWv5bQmNOrNca9yYsB
fbYMa/inyD4ppmsKBE6A8NQQVScsCqojht32kXLIIwJ0Bsq5er1Yh0ixrU8unPmZ
p6sbYGGNa7oOs0WKmn8nkjFP2p7TgEjqHC/f5XxSiYALrQNNnEig2tHzHYdzgWtR
/dQANpMHzMVu+M32OMj3
=CBf3
-----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
