From b2c353d874b85e06f355a9419852e2616613c7d0 Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 4 May 2012 20:00:41 +0000 Subject: Fri May 4 20:00:31 UTC 2012 --- community/vtk/PKGBUILD | 116 ------------------------- community/vtk/ffmpeg-0.8.diff | 66 -------------- community/vtk/fix-boost-graph-api-changes.diff | 42 --------- community/vtk/fixkernelversioncheck.diff | 19 ---- 4 files changed, 243 deletions(-) delete mode 100644 community/vtk/PKGBUILD delete mode 100644 community/vtk/ffmpeg-0.8.diff delete mode 100644 community/vtk/fix-boost-graph-api-changes.diff delete mode 100644 community/vtk/fixkernelversioncheck.diff (limited to 'community/vtk') diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD deleted file mode 100644 index c1984cfb6..000000000 --- a/community/vtk/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 63769 2012-02-05 12:13:32Z ibiru $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christofer Bertonha -# Contributor: leepesjee -# Contributor: Olivier Medoc -# Contributor: ignotus -# Contributor: Fabian Moser -# Contributor: djscholl - -pkgname=vtk -pkgver=5.8.0 -pkgrel=8 -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' -license=('BSD') -depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') -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:3}/vtk-${pkgver}.tar.gz" - "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" - 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff' - 'fix-boost-graph-api-changes.diff') -md5sums=('37b7297d02d647cc6ca95b38174cb41f' - 'a05295b81930e894fc0e31866f399151' - '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a' - 'e715aef2aea26fc05f904efb5d0d5627') - -build() { - cd VTK - - # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # 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 - - # fix compilation error: http://vtk.org/Bug/view.php?id=12772 - # remove next pkgver bump - patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff - - 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 # LIBPROJ4 - 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 \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DDOCUMENTATION_HTML_HELP:BOOL=ON \ - -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ - -DBUILD_EXAMPLES: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_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ - -DVTK_USE_QT:BOOL=ON \ - -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ - -DVTK_USE_GUISUPPORT:BOOL=ON \ - -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ - ${cmake_system_flags} \ - ${cmake_system_python_flags} \ - ${srcdir}/VTK - - make -} - -package() { - cd 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:3}/java/vtk.jar \ - ${pkgdir}/usr/share/java/vtk - - # Install license - install -dv ${pkgdir}/usr/share/licenses/vtk - install -m644 ${srcdir}/VTK/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:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf -} diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff deleted file mode 100644 index 523919d6f..000000000 --- a/community/vtk/ffmpeg-0.8.diff +++ /dev/null @@ -1,66 +0,0 @@ -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 -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: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- 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 diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff deleted file mode 100644 index 2162e7a28..000000000 --- a/community/vtk/fix-boost-graph-api-changes.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit d3ecc2c459dd1df937fc97887581ace1036da533 -Author: Marcus D. Hanwell -Date: Tue Dec 13 15:36:06 2011 -0500 - - BUG: 12772 fixes for change in Boost graph API - - This fixes bug 12772, where an API change in Boost was causing - compilation failures using Boost 1.38. Thanks to Orion Poplawski for - reporting the issue and posting the patch. - - Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 - -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..cf7cd47 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,15 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor const &e) { -+ return e.underlying_desc.Id; -+ } -+} -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template -@@ -95,7 +104,8 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); - } - - private: diff --git a/community/vtk/fixkernelversioncheck.diff b/community/vtk/fixkernelversioncheck.diff deleted file mode 100644 index 165f07366..000000000 --- a/community/vtk/fixkernelversioncheck.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Utilities/vtkhdf5/ConfigureChecks.cmake -+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake -@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) - ENDIF (HDF5_WANT_DCONV_EXCEPTION) - - SET (LINUX_LFS 0) --IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+IF (CMAKE_SYSTEM MATCHES "Linux") - # Linux Specific flags - ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) - OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) - IF (HDF5_ENABLE_LARGE_FILE) - SET (LARGEFILE 1) - ENDIF (HDF5_ENABLE_LARGE_FILE) --ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+ENDIF (CMAKE_SYSTEM MATCHES "Linux") - SET (HDF5_EXTRA_FLAGS) - IF (LINUX_LFS) - SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) -- cgit v1.2.3-54-g00ecf