The NMU for -6.1 was just accepted. I updated Michael Schutte's patch to include: (1) lintian overrides until #638883 is fixed; and a patch to /IO/vtkFFMPEGWriter.cxx (taken from #638246) due to libav changes.
See attached. -Steve
diff -u -r vtk-5.6.1/debian/changelog vtk-5.6.1+nmu/debian/changelog
--- vtk-5.6.1/debian/changelog 2011-06-03 00:02:31.000000000 -0500
+++ vtk-5.6.1+nmu/debian/changelog 2011-09-01 23:35:33.129273039 -0500
@@ -1,3 +1,20 @@
+vtk (5.6.1-6.1) unstable; urgency=low
+
+ [ Michael Schutte ]
+ * Non-maintainer upload.
+ * Remove absolute paths to required libraries from
+ /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+ #506992. Due to the multiarch transition, the original behavior
+ frequently causes reverse build-deps to FTBFS. This change should
+ probably be reverted once all required libraries are multiarched.
+
+ [ Steve M. Robbins ]
+ * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+ * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+ 0.7.
+
+ -- Steve M. Robbins <s...@debian.org> Thu, 01 Sep 2011 23:35:32 -0500
+
vtk (5.6.1-6) unstable; urgency=low
* VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx:
diff -u -r vtk-5.6.1/debian/libvtk5.6.lintian-overrides vtk-5.6.1+nmu/debian/libvtk5.6.lintian-overrides
--- vtk-5.6.1/debian/libvtk5.6.lintian-overrides 2011-02-21 11:03:43.000000000 -0600
+++ vtk-5.6.1+nmu/debian/libvtk5.6.lintian-overrides 2011-09-01 23:27:52.826972503 -0500
@@ -1 +1,3 @@
libvtk5.6: package-name-doesnt-match-sonames libCosmo5.6 libMapReduceMPI5.6 libVPIC5.6 libvtkCharts5.6 libvtkCommon5.6 libvtkDICOMParser5.6 libvtkFiltering5.6 libvtkGenericFiltering5.6 libvtkGeovis5.6 libvtkGraphics5.6 libvtkHybrid5.6 libvtkIO5.6 libvtkImaging5.6 libvtkInfovis5.6 libvtkParallel5.6 libvtkRendering5.6 libvtkViews5.6 libvtkVolumeRendering5.6 libvtkWidgets5.6 libvtkalglib5.6 libvtkexoIIc5.6 libvtkftgl5.6 libvtkmetaio5.6 libvtkproj4-5.6 libvtksqlite5.6 libvtksys5.6 libvtkverdict5.6
+libvtk5.6: embedded-library usr/lib/libvtkftgl.so.5.6.1: ftgl
+libvtk5.6: embedded-library usr/lib/libvtksqlite.so.5.6.1: sqlite
diff -u -r vtk-5.6.1/debian/rules vtk-5.6.1+nmu/debian/rules
--- vtk-5.6.1/debian/rules 2011-02-21 20:54:32.000000000 -0600
+++ vtk-5.6.1+nmu/debian/rules 2011-09-01 23:24:01.507813205 -0500
@@ -121,6 +121,7 @@
if [ "X$(DARTP)" = XUSE_DART ]; then cd Build && xvfb-run -s "-screen 0 1024x768x24" $(MAKE) $(JOBS) Experimental; else cd Build && $(MAKE) $(JOBS);fi
if [ "X$(DARTP)" = XUSE_DART ]; then cd Build && $(MAKE) $(JOBS) ExperimentalSubmit; fi
+ sed -i -e "s#/usr/lib/\(`dpkg-architecture -qDEB_HOST_MULTIARCH`/\)\?lib\([^;]*\)\.so#\2#g" Build/VTKLibraryDepends.cmake
touch build-stamp
diff -u -r vtk-5.6.1/IO/vtkFFMPEGWriter.cxx vtk-5.6.1+nmu/IO/vtkFFMPEGWriter.cxx
--- vtk-5.6.1/IO/vtkFFMPEGWriter.cxx 2010-09-27 15:40:05.000000000 -0500
+++ vtk-5.6.1+nmu/IO/vtkFFMPEGWriter.cxx 2011-09-01 23:36:53.000000000 -0500
@@ -123,7 +123,7 @@
}
//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 @@
//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;
@@ -329,7 +329,7 @@
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
signature.asc
Description: Digital signature
