[arch-commits] Commit in vtk/repos (18 files)
Andrzej Giniewicz
aginiewicz at archlinux.org
Tue Sep 16 20:16:26 UTC 2014
Date: Tuesday, September 16, 2014 @ 22:16:26
Author: aginiewicz
Revision: 119061
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
vtk/repos/community-staging-i686/
vtk/repos/community-staging-i686/PKGBUILD
(from rev 119060, vtk/trunk/PKGBUILD)
vtk/repos/community-staging-i686/ffmpeg-0.11.diff
(from rev 119060, vtk/trunk/ffmpeg-0.11.diff)
vtk/repos/community-staging-i686/ffmpeg-0.8.diff
(from rev 119060, vtk/trunk/ffmpeg-0.8.diff)
vtk/repos/community-staging-i686/ffmpeg-2.0.diff
(from rev 119060, vtk/trunk/ffmpeg-2.0.diff)
vtk/repos/community-staging-i686/ffmpeg-2.4.diff
(from rev 119060, vtk/trunk/ffmpeg-2.4.diff)
vtk/repos/community-staging-i686/freetype.diff
(from rev 119060, vtk/trunk/freetype.diff)
vtk/repos/community-staging-i686/python-destdir.diff
(from rev 119060, vtk/trunk/python-destdir.diff)
vtk/repos/community-staging-i686/tcl-8.6.diff
(from rev 119060, vtk/trunk/tcl-8.6.diff)
vtk/repos/community-staging-x86_64/
vtk/repos/community-staging-x86_64/PKGBUILD
(from rev 119060, vtk/trunk/PKGBUILD)
vtk/repos/community-staging-x86_64/ffmpeg-0.11.diff
(from rev 119060, vtk/trunk/ffmpeg-0.11.diff)
vtk/repos/community-staging-x86_64/ffmpeg-0.8.diff
(from rev 119060, vtk/trunk/ffmpeg-0.8.diff)
vtk/repos/community-staging-x86_64/ffmpeg-2.0.diff
(from rev 119060, vtk/trunk/ffmpeg-2.0.diff)
vtk/repos/community-staging-x86_64/ffmpeg-2.4.diff
(from rev 119060, vtk/trunk/ffmpeg-2.4.diff)
vtk/repos/community-staging-x86_64/freetype.diff
(from rev 119060, vtk/trunk/freetype.diff)
vtk/repos/community-staging-x86_64/python-destdir.diff
(from rev 119060, vtk/trunk/python-destdir.diff)
vtk/repos/community-staging-x86_64/tcl-8.6.diff
(from rev 119060, vtk/trunk/tcl-8.6.diff)
----------------------------------------------+
community-staging-i686/PKGBUILD | 127 +++++++++++++++++++++++++
community-staging-i686/ffmpeg-0.11.diff | 46 +++++++++
community-staging-i686/ffmpeg-0.8.diff | 66 ++++++++++++
community-staging-i686/ffmpeg-2.0.diff | 21 ++++
community-staging-i686/ffmpeg-2.4.diff | 59 +++++++++++
community-staging-i686/freetype.diff | 16 +++
community-staging-i686/python-destdir.diff | 11 ++
community-staging-i686/tcl-8.6.diff | 13 ++
community-staging-x86_64/PKGBUILD | 127 +++++++++++++++++++++++++
community-staging-x86_64/ffmpeg-0.11.diff | 46 +++++++++
community-staging-x86_64/ffmpeg-0.8.diff | 66 ++++++++++++
community-staging-x86_64/ffmpeg-2.0.diff | 21 ++++
community-staging-x86_64/ffmpeg-2.4.diff | 59 +++++++++++
community-staging-x86_64/freetype.diff | 16 +++
community-staging-x86_64/python-destdir.diff | 11 ++
community-staging-x86_64/tcl-8.6.diff | 13 ++
16 files changed, 718 insertions(+)
Copied: vtk/repos/community-staging-i686/PKGBUILD (from rev 119060, vtk/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,127 @@
+# $Id$
+# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
+# Contributor: leepesjee <lpeschier at xs4all dot nl>
+# Contributor: Olivier Medoc
+# Contributor: ignotus
+# Contributor: Fabian Moser
+# Contributor: djscholl
+
+# Qt5 support status: http://vtk.org/Bug/view.php?id=12945
+
+pkgname=vtk
+pkgver=5.10.1
+pkgrel=13
+pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
+arch=('i686' 'x86_64')
+url='http://www.vtk.org/'
+license=('BSD')
+depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk' 'wget')
+optdepends=('python2: python bindings'
+ 'java-runtime: java bindings'
+ 'tk: tcl bindings'
+ 'gnuplot: plotting tools'
+ '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 ffmpeg-2.0.diff ffmpeg-2.4.diff
+ tcl-8.6.diff python-destdir.diff freetype.diff)
+md5sums=('264b0052e65bd6571a84727113508789'
+ 'b6355063264cd56bcd1396c92f6ca59a'
+ 'e992321c9d1def6034d0fa6607b40c5a'
+ '81922ea61989e5591135f233a0400694'
+ '4ff5668957336709dcd096fbac102558'
+ '731e870919314d7512a6586210e79165'
+ 'a804a9f034e24ef1a8b28542c15ce1a1'
+ 'f7aba715bcc10de93a6ecf1cd6b0c560'
+ '1e45b3664b395c70017ff46d3370c84d')
+
+prepare() {
+ cd "${srcdir}"/VTK$pkgver
+
+ # 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}/ffmpeg-2.4.diff"
+ patch -Np1 -i "${srcdir}/tcl-8.6.diff"
+ patch -Np1 -i "${srcdir}/python-destdir.diff"
+ patch -Np1 -i "${srcdir}/freetype.diff"
+
+ sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+ -i $(find . -name '*.py')
+}
+
+build() {
+ cd "${srcdir}"
+ rm -rf build
+ mkdir build
+ cd build
+
+ # flags to enable using system libs
+ local cmake_system_flags=""
+ for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do
+ cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+ done
+
+ # flags to use python2 instead of python which is 3.x.x on archlinux
+ local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
+
+ cmake \
+ -Wno-dev \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+ -DVTK_DATA_ROOT:FILEPATH="${srcdir}/VTKData$pkgver" \
+ -DBUILD_DOCUMENTATION:BOOL=ON \
+ -DDOCUMENTATION_HTML_HELP:BOOL=ON \
+ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
+ -DBUILD_EXAMPLES:BOOL=ON \
+ -DVTK_USE_CHEMISTRY:BOOL=ON \
+ -DVTK_USE_HYBRID:BOOL=ON \
+ -DVTK_USE_PARALLEL:BOOL=ON \
+ -DVTK_USE_PATENTED:BOOL=ON \
+ -DVTK_USE_BOOST:BOOL=ON \
+ -DVTK_USE_INFOVIS:BOOL=ON \
+ -DVTK_USE_GL2PS:BOOL=ON \
+ -DVTK_USE_MYSQL:BOOL=ON \
+ -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
+ -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
+ -DVTK_WRAP_JAVA:BOOL=ON \
+ -DVTK_WRAP_PYTHON:BOOL=ON \
+ -DVTK_WRAP_TCL:BOOL=ON \
+ -DVTK_USE_QT:BOOL=ON \
+ -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \
+ -DVTK_USE_GUISUPPORT:BOOL=ON \
+ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
+ ${cmake_system_flags} \
+ ${cmake_system_python_flags} \
+ "${srcdir}/VTK$pkgver"
+
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Move the vtk.jar to the arch-specific location
+ install -dv "${pkgdir}/usr/share/java/vtk"
+ mv -v "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java/vtk.jar" \
+ "${pkgdir}/usr/share/java/vtk"
+ rm -rf "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java"
+
+ # Install license
+ install -dv "${pkgdir}/usr/share/licenses/vtk"
+ install -m644 "${srcdir}/VTK$pkgver/Copyright.txt" \
+ "${pkgdir}/usr/share/licenses/vtk"
+
+ # Put an entry in /etc/ld.so.conf.d
+ install -dv "${pkgdir}/etc/ld.so.conf.d"
+ echo "/usr/lib/vtk-${pkgver:0:4}" > "${pkgdir}/etc/ld.so.conf.d/vtk.conf"
+}
+
Copied: vtk/repos/community-staging-i686/ffmpeg-0.11.diff (from rev 119060, vtk/trunk/ffmpeg-0.11.diff)
===================================================================
--- community-staging-i686/ffmpeg-0.11.diff (rev 0)
+++ community-staging-i686/ffmpeg-0.11.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,46 @@
+--- VTK/IO/vtkFFMPEGWriter.cxx.orig 2012-07-08 13:40:55.000000000 +0200
++++ VTK/IO/vtkFFMPEGWriter.cxx 2012-07-08 13:59:37.000000000 +0200
+@@ -192,13 +192,6 @@
+ c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
+ }
+
+- //apply the chosen parameters
+- if (av_set_parameters(this->avFormatContext, NULL) < 0)
+- {
+- vtkGenericWarningMacro (<< "Invalid output format parameters." );
+- return 0;
+- }
+-
+ //manufacture a codec with the chosen parameters
+ AVCodec *codec = avcodec_find_encoder(c->codec_id);
+ if (!codec)
+@@ -259,14 +252,14 @@
+
+
+ //Finally, open the file and start it off.
+- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0)
++ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0)
+ {
+ vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
+ return 0;
+ }
+ this->openedFile = 1;
+
+- av_write_header(this->avFormatContext);
++ avformat_write_header(this->avFormatContext, NULL);
+ return 1;
+ }
+
+@@ -388,11 +381,7 @@
+ if (this->openedFile)
+ {
+ av_write_trailer(this->avFormatContext);
+-#ifdef VTK_FFMPEG_OLD_URL_FCLOSE
+- url_fclose(&this->avFormatContext->pb);
+-#else
+- url_fclose(this->avFormatContext->pb);
+-#endif
++ avio_close(this->avFormatContext->pb);
+ this->openedFile = 0;
+ }
+
Copied: vtk/repos/community-staging-i686/ffmpeg-0.8.diff (from rev 119060, vtk/trunk/ffmpeg-0.8.diff)
===================================================================
--- community-staging-i686/ffmpeg-0.8.diff (rev 0)
+++ community-staging-i686/ffmpeg-0.8.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -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 at 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
Copied: vtk/repos/community-staging-i686/ffmpeg-2.0.diff (from rev 119060, vtk/trunk/ffmpeg-2.0.diff)
===================================================================
--- community-staging-i686/ffmpeg-2.0.diff (rev 0)
+++ community-staging-i686/ffmpeg-2.0.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -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;
Copied: vtk/repos/community-staging-i686/ffmpeg-2.4.diff (from rev 119060, vtk/trunk/ffmpeg-2.4.diff)
===================================================================
--- community-staging-i686/ffmpeg-2.4.diff (rev 0)
+++ community-staging-i686/ffmpeg-2.4.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,59 @@
+diff -rupN VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx
+--- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx 2014-09-16 21:06:54.681786419 +0200
++++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2014-09-16 21:36:23.589177218 +0200
+@@ -140,12 +140,13 @@ int vtkFFMPEGWriterInternal::Start()
+ strcpy(this->avFormatContext->filename, this->Writer->GetFileName());
+
+ //create a stream for that file
+- this->avStream = av_new_stream(this->avFormatContext, 0);
++ this->avStream = avformat_new_stream(this->avFormatContext, NULL);
+ if (!this->avStream)
+ {
+ vtkGenericWarningMacro (<< "Could not create video stream.");
+ return 0;
+ }
++ this->avStream->id = 0;
+
+ //Set up the codec.
+ AVCodecContext *c = this->avStream->codec;
+@@ -217,7 +218,7 @@ int vtkFFMPEGWriterInternal::Start()
+ }
+
+ //for the output of the writer's input...
+- this->rgbInput = avcodec_alloc_frame();
++ this->rgbInput = av_frame_alloc();
+ if (!this->rgbInput)
+ {
+ vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
+@@ -234,7 +235,7 @@ int vtkFFMPEGWriterInternal::Start()
+ avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
+
+ //and for the output to the codec's input.
+- this->yuvOutput = avcodec_alloc_frame();
++ this->yuvOutput = av_frame_alloc();
+ if (!this->yuvOutput)
+ {
+ vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
+@@ -314,12 +315,17 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+ }
+ #endif
+
+-
+ //run the encoder
+- int toAdd = avcodec_encode_video(cc,
+- this->codecBuf,
+- this->codecBufSize,
+- this->yuvOutput);
++ AVPacket avpacket;
++ int got_packet;
++ av_init_packet(&avpacket);
++ avpacket.data = this->codecBuf;
++ avpacket.size = this->codecBufSize;
++ int toAdd = avcodec_encode_video2(cc,
++ &avpacket,
++ this->yuvOutput,
++ &got_packet);
++ if (!toAdd && got_packet) toAdd = avpacket.size;
+
+ //dump the compressed result to file
+ if (toAdd)
Copied: vtk/repos/community-staging-i686/freetype.diff (from rev 119060, vtk/trunk/freetype.diff)
===================================================================
--- community-staging-i686/freetype.diff (rev 0)
+++ community-staging-i686/freetype.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,16 @@
+--- VTK5.10.1/CMake/FindFREETYPE.cmake.orig 2014-01-30 12:40:11.252760741 +0100
++++ VTK5.10.1/CMake/FindFREETYPE.cmake 2014-01-30 12:40:43.235853875 +0100
+@@ -10,9 +10,11 @@
+ # also defined, but not for general use are
+ # FREETYPE_LIBRARY, where to find the FREETYPE library.
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++ /usr/include/freetype2
++)
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+ /usr/include/freetype2
+ /usr/local/include/freetype2
+ PATH_SUFFIXES freetype2
Copied: vtk/repos/community-staging-i686/python-destdir.diff (from rev 119060, vtk/trunk/python-destdir.diff)
===================================================================
--- community-staging-i686/python-destdir.diff (rev 0)
+++ community-staging-i686/python-destdir.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,11 @@
+--- VTK/Wrapping/Python/CMakeLists.txt.orig 2013-02-02 12:56:08.067142089 +0100
++++ VTK/Wrapping/Python/CMakeLists.txt 2013-02-02 12:58:16.182794679 +0100
+@@ -558,7 +558,7 @@
+
+ # Create default python setup arguments if they are not set.
+ IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
+- SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
++ SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}DESTDIR\" --prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
+ CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
+ MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
+ ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
Copied: vtk/repos/community-staging-i686/tcl-8.6.diff (from rev 119060, vtk/trunk/tcl-8.6.diff)
===================================================================
--- community-staging-i686/tcl-8.6.diff (rev 0)
+++ community-staging-i686/tcl-8.6.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,13 @@
+--- VTK5.10.1/Common/vtkTcl.h 2012-10-15 22:33:21.000000000 +0200
++++ VTK5.10.1/Common/vtkTcl.h.new 2012-12-22 12:27:56.176482722 +0100
+@@ -17,6 +17,10 @@
+
+ #include "vtkConfigure.h"
+
++// see http://paraview.org/Bug/view.php?id=11810
++#define USE_INTERP_RESULT
++#define USE_INTERP_ERRORLINE
++
+ #ifdef VTK_TCL_TK_STATIC
+ # ifndef STATIC_BUILD
+ # define STATIC_BUILD
Copied: vtk/repos/community-staging-x86_64/PKGBUILD (from rev 119060, vtk/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,127 @@
+# $Id$
+# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
+# Contributor: leepesjee <lpeschier at xs4all dot nl>
+# Contributor: Olivier Medoc
+# Contributor: ignotus
+# Contributor: Fabian Moser
+# Contributor: djscholl
+
+# Qt5 support status: http://vtk.org/Bug/view.php?id=12945
+
+pkgname=vtk
+pkgver=5.10.1
+pkgrel=13
+pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
+arch=('i686' 'x86_64')
+url='http://www.vtk.org/'
+license=('BSD')
+depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk' 'wget')
+optdepends=('python2: python bindings'
+ 'java-runtime: java bindings'
+ 'tk: tcl bindings'
+ 'gnuplot: plotting tools'
+ '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 ffmpeg-2.0.diff ffmpeg-2.4.diff
+ tcl-8.6.diff python-destdir.diff freetype.diff)
+md5sums=('264b0052e65bd6571a84727113508789'
+ 'b6355063264cd56bcd1396c92f6ca59a'
+ 'e992321c9d1def6034d0fa6607b40c5a'
+ '81922ea61989e5591135f233a0400694'
+ '4ff5668957336709dcd096fbac102558'
+ '731e870919314d7512a6586210e79165'
+ 'a804a9f034e24ef1a8b28542c15ce1a1'
+ 'f7aba715bcc10de93a6ecf1cd6b0c560'
+ '1e45b3664b395c70017ff46d3370c84d')
+
+prepare() {
+ cd "${srcdir}"/VTK$pkgver
+
+ # 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}/ffmpeg-2.4.diff"
+ patch -Np1 -i "${srcdir}/tcl-8.6.diff"
+ patch -Np1 -i "${srcdir}/python-destdir.diff"
+ patch -Np1 -i "${srcdir}/freetype.diff"
+
+ sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+ -i $(find . -name '*.py')
+}
+
+build() {
+ cd "${srcdir}"
+ rm -rf build
+ mkdir build
+ cd build
+
+ # flags to enable using system libs
+ local cmake_system_flags=""
+ for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do
+ cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+ done
+
+ # flags to use python2 instead of python which is 3.x.x on archlinux
+ local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
+
+ cmake \
+ -Wno-dev \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+ -DVTK_DATA_ROOT:FILEPATH="${srcdir}/VTKData$pkgver" \
+ -DBUILD_DOCUMENTATION:BOOL=ON \
+ -DDOCUMENTATION_HTML_HELP:BOOL=ON \
+ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
+ -DBUILD_EXAMPLES:BOOL=ON \
+ -DVTK_USE_CHEMISTRY:BOOL=ON \
+ -DVTK_USE_HYBRID:BOOL=ON \
+ -DVTK_USE_PARALLEL:BOOL=ON \
+ -DVTK_USE_PATENTED:BOOL=ON \
+ -DVTK_USE_BOOST:BOOL=ON \
+ -DVTK_USE_INFOVIS:BOOL=ON \
+ -DVTK_USE_GL2PS:BOOL=ON \
+ -DVTK_USE_MYSQL:BOOL=ON \
+ -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
+ -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
+ -DVTK_WRAP_JAVA:BOOL=ON \
+ -DVTK_WRAP_PYTHON:BOOL=ON \
+ -DVTK_WRAP_TCL:BOOL=ON \
+ -DVTK_USE_QT:BOOL=ON \
+ -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \
+ -DVTK_USE_GUISUPPORT:BOOL=ON \
+ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
+ ${cmake_system_flags} \
+ ${cmake_system_python_flags} \
+ "${srcdir}/VTK$pkgver"
+
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Move the vtk.jar to the arch-specific location
+ install -dv "${pkgdir}/usr/share/java/vtk"
+ mv -v "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java/vtk.jar" \
+ "${pkgdir}/usr/share/java/vtk"
+ rm -rf "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java"
+
+ # Install license
+ install -dv "${pkgdir}/usr/share/licenses/vtk"
+ install -m644 "${srcdir}/VTK$pkgver/Copyright.txt" \
+ "${pkgdir}/usr/share/licenses/vtk"
+
+ # Put an entry in /etc/ld.so.conf.d
+ install -dv "${pkgdir}/etc/ld.so.conf.d"
+ echo "/usr/lib/vtk-${pkgver:0:4}" > "${pkgdir}/etc/ld.so.conf.d/vtk.conf"
+}
+
Copied: vtk/repos/community-staging-x86_64/ffmpeg-0.11.diff (from rev 119060, vtk/trunk/ffmpeg-0.11.diff)
===================================================================
--- community-staging-x86_64/ffmpeg-0.11.diff (rev 0)
+++ community-staging-x86_64/ffmpeg-0.11.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,46 @@
+--- VTK/IO/vtkFFMPEGWriter.cxx.orig 2012-07-08 13:40:55.000000000 +0200
++++ VTK/IO/vtkFFMPEGWriter.cxx 2012-07-08 13:59:37.000000000 +0200
+@@ -192,13 +192,6 @@
+ c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
+ }
+
+- //apply the chosen parameters
+- if (av_set_parameters(this->avFormatContext, NULL) < 0)
+- {
+- vtkGenericWarningMacro (<< "Invalid output format parameters." );
+- return 0;
+- }
+-
+ //manufacture a codec with the chosen parameters
+ AVCodec *codec = avcodec_find_encoder(c->codec_id);
+ if (!codec)
+@@ -259,14 +252,14 @@
+
+
+ //Finally, open the file and start it off.
+- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0)
++ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0)
+ {
+ vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
+ return 0;
+ }
+ this->openedFile = 1;
+
+- av_write_header(this->avFormatContext);
++ avformat_write_header(this->avFormatContext, NULL);
+ return 1;
+ }
+
+@@ -388,11 +381,7 @@
+ if (this->openedFile)
+ {
+ av_write_trailer(this->avFormatContext);
+-#ifdef VTK_FFMPEG_OLD_URL_FCLOSE
+- url_fclose(&this->avFormatContext->pb);
+-#else
+- url_fclose(this->avFormatContext->pb);
+-#endif
++ avio_close(this->avFormatContext->pb);
+ this->openedFile = 0;
+ }
+
Copied: vtk/repos/community-staging-x86_64/ffmpeg-0.8.diff (from rev 119060, vtk/trunk/ffmpeg-0.8.diff)
===================================================================
--- community-staging-x86_64/ffmpeg-0.8.diff (rev 0)
+++ community-staging-x86_64/ffmpeg-0.8.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -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 at 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
Copied: vtk/repos/community-staging-x86_64/ffmpeg-2.0.diff (from rev 119060, vtk/trunk/ffmpeg-2.0.diff)
===================================================================
--- community-staging-x86_64/ffmpeg-2.0.diff (rev 0)
+++ community-staging-x86_64/ffmpeg-2.0.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -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;
Copied: vtk/repos/community-staging-x86_64/ffmpeg-2.4.diff (from rev 119060, vtk/trunk/ffmpeg-2.4.diff)
===================================================================
--- community-staging-x86_64/ffmpeg-2.4.diff (rev 0)
+++ community-staging-x86_64/ffmpeg-2.4.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,59 @@
+diff -rupN VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx
+--- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx 2014-09-16 21:06:54.681786419 +0200
++++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2014-09-16 21:36:23.589177218 +0200
+@@ -140,12 +140,13 @@ int vtkFFMPEGWriterInternal::Start()
+ strcpy(this->avFormatContext->filename, this->Writer->GetFileName());
+
+ //create a stream for that file
+- this->avStream = av_new_stream(this->avFormatContext, 0);
++ this->avStream = avformat_new_stream(this->avFormatContext, NULL);
+ if (!this->avStream)
+ {
+ vtkGenericWarningMacro (<< "Could not create video stream.");
+ return 0;
+ }
++ this->avStream->id = 0;
+
+ //Set up the codec.
+ AVCodecContext *c = this->avStream->codec;
+@@ -217,7 +218,7 @@ int vtkFFMPEGWriterInternal::Start()
+ }
+
+ //for the output of the writer's input...
+- this->rgbInput = avcodec_alloc_frame();
++ this->rgbInput = av_frame_alloc();
+ if (!this->rgbInput)
+ {
+ vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
+@@ -234,7 +235,7 @@ int vtkFFMPEGWriterInternal::Start()
+ avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
+
+ //and for the output to the codec's input.
+- this->yuvOutput = avcodec_alloc_frame();
++ this->yuvOutput = av_frame_alloc();
+ if (!this->yuvOutput)
+ {
+ vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
+@@ -314,12 +315,17 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+ }
+ #endif
+
+-
+ //run the encoder
+- int toAdd = avcodec_encode_video(cc,
+- this->codecBuf,
+- this->codecBufSize,
+- this->yuvOutput);
++ AVPacket avpacket;
++ int got_packet;
++ av_init_packet(&avpacket);
++ avpacket.data = this->codecBuf;
++ avpacket.size = this->codecBufSize;
++ int toAdd = avcodec_encode_video2(cc,
++ &avpacket,
++ this->yuvOutput,
++ &got_packet);
++ if (!toAdd && got_packet) toAdd = avpacket.size;
+
+ //dump the compressed result to file
+ if (toAdd)
Copied: vtk/repos/community-staging-x86_64/freetype.diff (from rev 119060, vtk/trunk/freetype.diff)
===================================================================
--- community-staging-x86_64/freetype.diff (rev 0)
+++ community-staging-x86_64/freetype.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,16 @@
+--- VTK5.10.1/CMake/FindFREETYPE.cmake.orig 2014-01-30 12:40:11.252760741 +0100
++++ VTK5.10.1/CMake/FindFREETYPE.cmake 2014-01-30 12:40:43.235853875 +0100
+@@ -10,9 +10,11 @@
+ # also defined, but not for general use are
+ # FREETYPE_LIBRARY, where to find the FREETYPE library.
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++ /usr/include/freetype2
++)
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+ /usr/include/freetype2
+ /usr/local/include/freetype2
+ PATH_SUFFIXES freetype2
Copied: vtk/repos/community-staging-x86_64/python-destdir.diff (from rev 119060, vtk/trunk/python-destdir.diff)
===================================================================
--- community-staging-x86_64/python-destdir.diff (rev 0)
+++ community-staging-x86_64/python-destdir.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,11 @@
+--- VTK/Wrapping/Python/CMakeLists.txt.orig 2013-02-02 12:56:08.067142089 +0100
++++ VTK/Wrapping/Python/CMakeLists.txt 2013-02-02 12:58:16.182794679 +0100
+@@ -558,7 +558,7 @@
+
+ # Create default python setup arguments if they are not set.
+ IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
+- SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
++ SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}DESTDIR\" --prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
+ CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
+ MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
+ ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
Copied: vtk/repos/community-staging-x86_64/tcl-8.6.diff (from rev 119060, vtk/trunk/tcl-8.6.diff)
===================================================================
--- community-staging-x86_64/tcl-8.6.diff (rev 0)
+++ community-staging-x86_64/tcl-8.6.diff 2014-09-16 20:16:26 UTC (rev 119061)
@@ -0,0 +1,13 @@
+--- VTK5.10.1/Common/vtkTcl.h 2012-10-15 22:33:21.000000000 +0200
++++ VTK5.10.1/Common/vtkTcl.h.new 2012-12-22 12:27:56.176482722 +0100
+@@ -17,6 +17,10 @@
+
+ #include "vtkConfigure.h"
+
++// see http://paraview.org/Bug/view.php?id=11810
++#define USE_INTERP_RESULT
++#define USE_INTERP_ERRORLINE
++
+ #ifdef VTK_TCL_TK_STATIC
+ # ifndef STATIC_BUILD
+ # define STATIC_BUILD
More information about the arch-commits
mailing list