diff options
Diffstat (limited to 'community/vtk')
| -rw-r--r-- | community/vtk/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/vtk/ffmpeg-2.0.diff | 21 |
2 files changed, 26 insertions, 3 deletions
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 46db8282a..bcfecb3e8 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90101 2013-05-06 19:39:56Z foutrelis $ +# $Id: PKGBUILD 94911 2013-08-01 06:55:45Z bpiotrowski $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=8 +pkgrel=9 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -26,11 +26,12 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" - ffmpeg-0.8.diff ffmpeg-0.11.diff tcl-8.6.diff python-destdir.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694' + '4ff5668957336709dcd096fbac102558' 'a804a9f034e24ef1a8b28542c15ce1a1' 'f7aba715bcc10de93a6ecf1cd6b0c560') @@ -40,6 +41,7 @@ build() { # fix compilation errors: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff" + patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff" patch -Np1 -i "${srcdir}/tcl-8.6.diff" patch -Np1 -i "${srcdir}/python-destdir.diff" diff --git a/community/vtk/ffmpeg-2.0.diff b/community/vtk/ffmpeg-2.0.diff new file mode 100644 index 000000000..2488d74a0 --- /dev/null +++ b/community/vtk/ffmpeg-2.0.diff @@ -0,0 +1,21 @@ +diff -rupN a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +--- a/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:29:24.625362910 +0000 ++++ b/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:39:16.184515101 +0000 +@@ -149,7 +149,7 @@ int vtkFFMPEGWriterInternal::Start() + + //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; + c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; +@@ -199,7 +199,7 @@ int vtkFFMPEGWriterInternal::Start() + vtkGenericWarningMacro (<< "Codec not found." ); + return 0; + } +- if (avcodec_open(c, codec) < 0) ++ if (avcodec_open2(c, codec, NULL) < 0) + { + vtkGenericWarningMacro (<< "Could not open codec."); + return 0; |