Control: tags -1 + patch On 2014-05-12 13:48:36, Sebastian Ramacher wrote: > Control: reopen -1 > Control: severity -1 serious > Control: tags -1 + sid jessie > > On 2014-03-13 21:24:09, Debian Bug Tracking System wrote: > > Changes: > > paraview (4.0.1+dfsg-1) unstable; urgency=medium > > . > > [ Christophe Trophime ] > > * [c20bad7] Add missing file from install > > (needed to install salome-paravis for instance). > > . > > [ Anton Gladky ] > > * [0f6c102] Imported Upstream version 4.0.1+dfsg > > * [f4ccb4e] Fix libav10 compilation. (Closes: #739434) > > Unfortunately it still fails to build with libav 10: > | cd /«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/IO/FFMPEG && > /usr/lib/ccache/c++ -DMPICH_IGNORE_CXX_SEEK -DVTK_IN_VTK > -DvtkIOFFMPEG_EXPORTS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector > --param=ssp-buffer-size=4 -Wformat -Werror=format-security > -D_FORTIFY_SOURCE=2 -Wno-deprecated -fPIC > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/IO/Movie > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/Movie > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/DataModel > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/DataModel > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/Math > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/Math > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/Core > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/Core > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Utilities/KWSys > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Utilities/KWSys > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/Misc > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/Misc > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/System > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/System > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/Transforms > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/Transforms > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/Common/ExecutionModel > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/Common/ExecutionModel > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/IO/Core > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/Core > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/ThirdParty/zlib > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/ThirdParty/zlib > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/ThirdParty/oggtheora > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/ThirdParty/oggtheora > -I/«BUILDDIR»/paraview-4.0.1+dfsg/obj-x86_64-linux-gnu/VTK/IO/FFMPEG > -I/«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG -fvisibility=hidden > -fvisibility-inlines-hidden -o > CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o -c > /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx > | /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx: In > member function 'int vtkFFMPEGWriterInternal::Start()': > | /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx:151:41: > error: 'CODEC_ID_MJPEG' was not declared in this scope > | this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG; > | ^ > | /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx:155:41: > error: 'CODEC_ID_RAWVIDEO' was not declared in this scope > | this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO; > | ^ > | /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx:178:18: > error: 'CodecID' was not declared in this scope > | c->codec_id = (CodecID)this->avOutputFormat->video_codec; > | ^ > | /«BUILDDIR»/paraview-4.0.1+dfsg/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx:178:26: > error: expected ';' before 'this' > | c->codec_id = (CodecID)this->avOutputFormat->video_codec; > | ^ > | make[3]: *** > [VTK/IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o] Error 1
The attached patch fixes the issue. Since the libav 10 it would be great to have this fixed soon. Please let me know if I can help out with sponsorship or an NMU. Cheers -- Sebastian Ramacher
diff -Nru paraview-4.0.1+dfsg/debian/changelog paraview-4.0.1+dfsg/debian/changelog --- paraview-4.0.1+dfsg/debian/changelog 2014-03-13 19:59:30.000000000 +0100 +++ paraview-4.0.1+dfsg/debian/changelog 2014-05-14 18:31:34.000000000 +0200 @@ -1,3 +1,13 @@ +paraview (4.0.1+dfsg-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/fix_libav10.patch: Make it actually build against libav10. + (Closes: #739434) + * debian/control: Bump B-D on libavcodec-dev to >= 6:9 to make sure + AVCodecID and AV_CODEC_* constants are available. + + -- Sebastian Ramacher <sramac...@debian.org> Wed, 14 May 2014 18:11:05 +0200 + paraview (4.0.1+dfsg-1) unstable; urgency=medium [ Christophe Trophime ] diff -Nru paraview-4.0.1+dfsg/debian/control paraview-4.0.1+dfsg/debian/control --- paraview-4.0.1+dfsg/debian/control 2014-03-13 19:48:41.000000000 +0100 +++ paraview-4.0.1+dfsg/debian/control 2014-05-14 18:30:24.000000000 +0200 @@ -8,7 +8,7 @@ libqt4-dev (>= 4.3.3-2), libsqlite3-dev, qt4-dev-tools, libboost-all-dev, libavformat-dev (>= 4:0.7.1), - libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, python-support, + libavutil-dev, libavcodec-dev (>= 6:9), libswscale-dev, python-dev, python-support, libglu1-mesa-dev, libxt-dev, python-all, python-all-dev (>= 2.7), python-all-dev (<< 2.8), libxext-dev, doxygen, graphviz, gnuplot, libtiff-dev, libpng-dev, libjpeg-dev, diff -Nru paraview-4.0.1+dfsg/debian/patches/fix_libav10.patch paraview-4.0.1+dfsg/debian/patches/fix_libav10.patch --- paraview-4.0.1+dfsg/debian/patches/fix_libav10.patch 2014-03-13 19:48:41.000000000 +0100 +++ paraview-4.0.1+dfsg/debian/patches/fix_libav10.patch 2014-05-14 18:20:36.000000000 +0200 @@ -2,23 +2,11 @@ Author: Anton Khirnov <an...@khirnov.net> Applied-Upstream: http://review.source.kitware.com/#/c/14289/ Reviewed-By: Anton Gladky <gl...@debian.org> -Last-Update: 2014-03-13 +Last-Update: 2014-05-14 --- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx +++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx -@@ -38,6 +38,11 @@ - - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -+#ifndef VTK_FFMPEG_AVCODECID -+#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG -+#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO -+#endif -+ - //--------------------------------------------------------------------------- - class vtkFFMPEGWriterInternal - { -@@ -143,11 +148,11 @@ +@@ -143,11 +143,11 @@ if (this->Writer->GetCompression()) { //choose a codec that is easily playable on windows @@ -32,3 +20,12 @@ } //assign the format to the context +@@ -170,7 +170,7 @@ + + //Set up the codec. + AVCodecContext *c = this->avStream->codec; +- c->codec_id = (CodecID)this->avOutputFormat->video_codec; ++ c->codec_id = (AVCodecID)this->avOutputFormat->video_codec; + #ifdef VTK_FFMPEG_HAS_OLD_HEADER + c->codec_type = CODEC_TYPE_VIDEO; + #else
signature.asc
Description: Digital signature
