Control: tags -1 + pending Dear maintainer,
to move forward with the libav10 transition, I've prepared an NMU for vtk6 (versioned as 6.0.0-7.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. 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-17 17:16:44.000000000 +0200
@@ -1,3 +1,13 @@
+vtk6 (6.0.0-7.1) unstable; 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> Sat, 17 May 2014 17:16:28 +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
