Control: tags -1 + patch On 2014-05-13 18:47:42, Moritz Muehlenhoff wrote: > Package: vtk6 > Severity: serious > > Your packages FTBFS with libav10: > > ./lib/libvtkIOMovieTCL-6.0.so.6.0 ../../lib/libvtkIOMovieTCL-6.0.so > make[4]: Leaving directory '/home/jmm/vtk6-6.0.0/debian/build' > /usr/bin/cmake -E cmake_progress_report > /home/jmm/vtk6-6.0.0/debian/build/CMakeFiles > [ 70%] Built target vtkIOMovieTCL > make -f IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/build.make > IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/depend > make[4]: Entering directory '/home/jmm/vtk6-6.0.0/debian/build' > /usr/bin/cmake -E cmake_progress_report > /home/jmm/vtk6-6.0.0/debian/build/CMakeFiles > [ 70%] For vtkIOFFMPEG - updating vtkIOFFMPEGHierarchy.txt > cd /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG && > ../../bin/vtkWrapHierarchy-6.0 @vtkIOFFMPEGHierarchy.args -o > /home/jmm/vtk6-6.0.0/debian/build/lib/cmake/vtk-6.0/Modules/vtkIOFFMPEGHierarchy.txt > vtkIOFFMPEGHierarchy.data > /home/jmm/vtk6-6.0.0/debian/build/lib/cmake/vtk-6.0/Modules/vtkIOMovieHierarchy.txt > cd /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG && /usr/bin/cmake -E touch > /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG/vtkIOFFMPEGHierarchy.stamp > cd /home/jmm/vtk6-6.0.0/debian/build && /usr/bin/cmake -E cmake_depends "Unix > Makefiles" /home/jmm/vtk6-6.0.0 /home/jmm/vtk6-6.0.0/IO/FFMPEG > /home/jmm/vtk6-6.0.0/debian/build /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG > /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/DependInfo.cmake > --color= > Scanning dependencies of target vtkIOFFMPEG > make[4]: Leaving directory '/home/jmm/vtk6-6.0.0/debian/build' > make -f IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/build.make > IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/build > make[4]: Entering directory '/home/jmm/vtk6-6.0.0/debian/build' > /usr/bin/cmake -E cmake_progress_report > /home/jmm/vtk6-6.0.0/debian/build/CMakeFiles > [ 70%] Building CXX object > IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o > cd /home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG && /usr/bin/c++ -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 -O2 -g -DNDEBUG -Wnon-virtual-dtor > -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra > -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow > -Wunused-parameter -fno-check-new -fno-common -fPIC > -I/home/jmm/vtk6-6.0.0/debian/build/IO/Movie -I/home/jmm/vtk6-6.0.0/IO/Movie > -I/home/jmm/vtk6-6.0.0/debian/build/Common/DataModel > -I/home/jmm/vtk6-6.0.0/Common/DataModel > -I/home/jmm/vtk6-6.0.0/debian/build/Common/Math > -I/home/jmm/vtk6-6.0.0/Common/Math > -I/home/jmm/vtk6-6.0.0/debian/build/Common/Core > -I/home/jmm/vtk6-6.0.0/Common/Core > -I/home/jmm/vtk6-6.0.0/debian/build/Utilities/KWSys > -I/home/jmm/vtk6-6.0.0/Utilities/KWSys > -I/home/jmm/vtk6-6.0.0/debian/build/Common/Misc > -I/home/jmm/vtk6-6.0.0/Common/Misc -I/home/jmm/vtk6-6.0.0/d > ebian/build/Common/System -I/home/jmm/vtk6-6.0.0/Common/System > -I/home/jmm/vtk6-6.0.0/debian/build/Common/Transforms > -I/home/jmm/vtk6-6.0.0/Common/Transforms > -I/home/jmm/vtk6-6.0.0/debian/build/Common/ExecutionModel > -I/home/jmm/vtk6-6.0.0/Common/ExecutionModel > -I/home/jmm/vtk6-6.0.0/debian/build/IO/Core -I/home/jmm/vtk6-6.0.0/IO/Core > -I/home/jmm/vtk6-6.0.0/debian/build/ThirdParty/zlib > -I/home/jmm/vtk6-6.0.0/ThirdParty/zlib > -I/home/jmm/vtk6-6.0.0/debian/build/ThirdParty/oggtheora > -I/home/jmm/vtk6-6.0.0/ThirdParty/oggtheora > -I/home/jmm/vtk6-6.0.0/debian/build/IO/FFMPEG > -I/home/jmm/vtk6-6.0.0/IO/FFMPEG -fvisibility=hidden > -fvisibility-inlines-hidden -o > CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o -c > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx: In member int > vtkFFMPEGWriterInternal::: > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:42:27: CODEC_ID_ was not > declared in this scope > #define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:151:41: note: in expansion > of AV_CODEC_ID_ > this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG; > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:43:30: CODEC_ID_ was not > declared in this scope > #define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:155:41: note: in expansion > of AV_CODEC_ID_ > this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO; > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:178:18: was not declared > in this scope > c->codec_id = (CodecID)this->avOutputFormat->video_codec; > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:178:26: > c->codec_id = (CodecID)this->avOutputFormat->video_codec; > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx: In member int > vtkFFMPEGWriterInternal::Write(: > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > AVPacket pkt = { 0 }; > ^ > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket::stream_ [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket::side_ [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket::side_data_ [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket:: [-Wmissing-field-initializers] > /home/jmm/vtk6-6.0.0/IO/FFMPEG/vtkFFMPEGWriter.cxx:377:22: warning: missing > initializer for AVPacket::convergence_ [-Wmissing-field-initializers] > IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/build.make:67: recipe for target > 'IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o' failed > make[4]: *** [IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/vtkFFMPEGWriter.cxx.o] > Error 1 > make[4]: Leaving directory '/home/jmm/vtk6-6.0.0/debian/build' > CMakeFiles/Makefile2:18739: recipe for target > 'IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/all' failed > make[3]: *** [IO/FFMPEG/CMakeFiles/vtkIOFFMPEG.dir/all] Error 2 > make[3]: Leaving directory '/home/jmm/vtk6-6.0.0/debian/build' > Makefile:116: recipe for target 'all' failed > make[2]: *** [all] Error 2 > make[2]: Leaving directory '/home/jmm/vtk6-6.0.0/debian/build' > dh_auto_build: make -jdurationmember posmember privmember destructmember > durationmember elemsmember datamember flagsmember indexmember sizemember > datamember dtsmember ptsmember vtkImageData*)function thisbefore error: > ;expected CodecIDerror: RAWVIDEOmacro RAWVIDEOerror: MJPEGmacro MJPEGerror: > Start()function
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 vtk6-6.0.0/debian/changelog vtk6-6.0.0/debian/changelog --- vtk6-6.0.0/debian/changelog 2014-05-09 20:27:08.000000000 +0200 +++ vtk6-6.0.0/debian/changelog 2014-05-14 19:13:22.000000000 +0200 @@ -1,3 +1,13 @@ +vtk6 (6.0.0-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/fix_libav10.patch: Make it actually build against libav10. + (Closes: #748053) + * 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 19:09:34 +0200 + vtk6 (6.0.0-7) unstable; urgency=medium * [9796292] Add some more entries in Depends section of libvtk6-dev. diff -Nru vtk6-6.0.0/debian/control vtk6-6.0.0/debian/control --- vtk6-6.0.0/debian/control 2014-04-23 21:34:33.000000000 +0200 +++ vtk6-6.0.0/debian/control 2014-05-14 19:12:32.000000000 +0200 @@ -16,7 +16,7 @@ graphviz, hdf5-tools, javahelper, - libavcodec-dev, + libavcodec-dev (>= 6:9), libavformat-dev, libavutil-dev, libboost-all-dev, diff -Nru vtk6-6.0.0/debian/patches/fix_libav10.patch vtk6-6.0.0/debian/patches/fix_libav10.patch --- vtk6-6.0.0/debian/patches/fix_libav10.patch 2014-03-13 14:38:44.000000000 +0100 +++ vtk6-6.0.0/debian/patches/fix_libav10.patch 2014-05-14 19:12:04.000000000 +0200 @@ -6,19 +6,7 @@ --- a/IO/FFMPEG/vtkFFMPEGWriter.cxx +++ b/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