Sun Nov 13 23:14:59 UTC 2011

2 files changed, 76 insertions, 3 deletions

diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index d1f035081..4dadb8d58 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
@@ -8,7 +9,7 @@
 
 pkgname=vtk
 pkgver=5.8.0
-pkgrel=2
+pkgrel=6
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
@@ -22,10 +23,12 @@ optdepends=('python2: python bindings'
             'graphviz: drawing tools')
 source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff')
+        'fixkernelversioncheck.diff'
+        'ffmpeg-0.8.diff')
 md5sums=('37b7297d02d647cc6ca95b38174cb41f'
          'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389')
+         '9e137af23701f76fc727222ebac23389'
+         'e992321c9d1def6034d0fa6607b40c5a')
 
 build() {
   cd VTK
@@ -34,6 +37,10 @@ build() {
   # remove next pkgver bump
   patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
 
+  # fix compilation error:
+  # remove next pkgver bump
+  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
+
   cd ${srcdir}
 
   rm -rf build
diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff
new file mode 100644
index 000000000..523919d6f
--- /dev/null
+++ b/community/vtk/ffmpeg-0.8.diff
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ 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.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/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;
+@@ -329,7 +329,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