[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-63-gc75b9bf

[Anton Gladky]

The following commit has been merged in the master branch:
commit c75b9bfe46fdd73ae1d77ec4c70adb0e98c003e0
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Sep 2 21:50:39 2011 +0300

    Fix FTBFS with libav/0.7.1. Thanks to Moritz Mühlenhoff <jmm at inutil.org>. (Closes: #638246)

diff --git a/debian/patches/paraview-fix-libav07-compat.patch b/debian/patches/paraview-fix-libav07-compat.patch
new file mode 100644
index 0000000..3e32e9d
--- /dev/null
+++ b/debian/patches/paraview-fix-libav07-compat.patch
@@ -0,0 +1,35 @@
+Description: Fixes paraview compilation with libav/0.7 by 
+ changing deprecated API-elements.
+Author: Moritz Mühlenhoff <jmm at inutil.org>
+Bug-Debian: http://bugs.debian.org/638246
+Last-Update: <2011-09-02>
+
+--- paraview-3.10.1.orig/VTK/IO/vtkFFMPEGWriter.cxx
++++ paraview-3.10.1/VTK/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+     }
+ 
+   //choose avi media file format
+-  this->avOutputFormat = guess_format("avi", NULL, NULL);
++  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+   if (!this->avOutputFormat) 
+     {
+     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+-  c->codec_type = CODEC_TYPE_VIDEO;
++  c->codec_type = AVMEDIA_TYPE_VIDEO;
+   c->width = this->Dim[0];
+   c->height = this->Dim[1];
+   c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -343,7 +343,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+     pkt.stream_index = this->avStream->index;
+     if (cc->coded_frame->key_frame) //treat keyframes well
+       {
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       }
+     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/debian/patches/series b/debian/patches/series
index e6db0b6..f0df7e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ stddef_ptrdiff.patch
 enable_some_more_plugins.patch
 fix_manpages_errors.patch
 change_std_parameter_for_compiler.patch
+paraview-fix-libav07-compat.patch

-- 
Paraview packaging