Date: Tuesday, December 6, 2016 @ 05:02:32 Author: anatolik Revision: 198083
upgpkg: vtk 7.1.0-1 Modified: vtk/trunk/PKGBUILD Deleted: vtk/trunk/ffmpeg3_compat.patch vtk/trunk/gcc6.patch vtk/trunk/gdal2.patch ----------------------+ PKGBUILD | 31 ++++++++---------------- ffmpeg3_compat.patch | 62 ------------------------------------------------- gcc6.patch | 21 ---------------- gdal2.patch | 31 ------------------------ 4 files changed, 11 insertions(+), 134 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-06 02:48:26 UTC (rev 198082) +++ PKGBUILD 2016-12-06 05:02:32 UTC (rev 198083) @@ -4,15 +4,15 @@ # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=vtk -pkgver=7.0.0 -_majorver=7.0 -pkgrel=3 +pkgver=7.1.0 +_majorver=7.1 +pkgrel=1 pkgdesc='A software system for 3D computer graphics, image processing, and visualization' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') -depends=('gcc-libs' 'gl2ps') -makedepends=('boost' 'cmake' 'ninja' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' 'ffmpeg' 'lesstif' 'qt5-base' 'jsoncpp') +depends=('gcc-libs') +makedepends=('boost' 'cmake' 'ninja' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' 'ffmpeg' 'lesstif' 'qt5-base' 'qt5-x11extras' 'qt5-tools' 'jsoncpp') optdepends=('python2: python bindings' 'java-runtime: java bindings' 'tk: tcl bindings' @@ -31,25 +31,15 @@ 'jsoncpp') source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz" - "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz" - gdal2.patch - ffmpeg3_compat.patch - gcc6.patch) + "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz") options=(staticlibs) -sha1sums=('7719fac36b36965eaf5076542166ba49bbe7afbb' - '1bbaa642a3e3676a58a08c956df73645326c2859' - '8d16a1fba15e4eb95c03fe97937488ddcdd7fbd0' - 'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e' - 'a78177f8dd6dedd9ad189fa12730ec53c7d02508' - 'efba04fac41ecc390aa7df3009a7a80f395c9949') +sha1sums=('d3701ff23cb935e107e00174cf75d45a7a9cbdda' + 'd67694b32b8720a081fefac3a26b317b81e785c2' + 'bfcf4f87e53f81b7e6bd980e7b0137cef156f66c') prepare() { cd "${srcdir}"/VTK-$pkgver - patch -p1 < ../ffmpeg3_compat.patch # http://www.vtk.org/Bug/view.php?id=16001 - patch -p1 < ../gdal2.patch # https://github.com/Kitware/VTK/pull/21 - patch -p1 < ../gcc6.patch # https://github.com/Kitware/VTK/pull/21 - 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|" \ @@ -72,11 +62,12 @@ # VTK does not work with XDMF2 compiled from git. TODO: make vtk compatible with system XDMF library. # Note: VTK explicitly disables system GLEW dependency, it uses embedded sources with modifications # Note: system HDF5 is incompatible - for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE SIX AUTOBAHN MPI4PY JSONCPP GLEW GL2PS; do + for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE SIX AUTOBAHN MPI4PY JSONCPP GLEW; 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 + # system gl2ps is not used because of http://www.vtk.org/Bug/view.php?id=16083 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" local _tkver=$(echo 'puts $tcl_version' | tclsh) Deleted: ffmpeg3_compat.patch =================================================================== --- ffmpeg3_compat.patch 2016-12-06 02:48:26 UTC (rev 198082) +++ ffmpeg3_compat.patch 2016-12-06 05:02:32 UTC (rev 198083) @@ -1,62 +0,0 @@ -diff --git a/IO/FFMPEG/vtkFFMPEGWriter.cxx b/IO/FFMPEG/vtkFFMPEGWriter.cxx -index d3fd421..294b421 100644 ---- a/IO/FFMPEG/vtkFFMPEGWriter.cxx -+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx -@@ -191,11 +191,11 @@ int vtkFFMPEGWriterInternal::Start() - c->height = this->Dim[1]; - if (this->Writer->GetCompression()) - { -- c->pix_fmt = PIX_FMT_YUVJ422P; -+ c->pix_fmt = AV_PIX_FMT_YUVJ422P; - } - else - { -- c->pix_fmt = PIX_FMT_BGR24; -+ c->pix_fmt = AV_PIX_FMT_BGR24; - } - - //to do playback at actual recorded rate, this will need more work see also below -@@ -274,13 +274,13 @@ int vtkFFMPEGWriterInternal::Start() - #endif - - //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." ); - return 0; - } -- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height); -+ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height); - unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize); - if (!rgb) - { -@@ -288,10 +288,10 @@ int vtkFFMPEGWriterInternal::Start() - return 0; - } - //The rgb buffer should get deleted when this->rgbInput is. -- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height); -+ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_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." ); -@@ -349,12 +349,12 @@ int vtkFFMPEGWriterInternal::Write(vtkImageData *id) - //convert that to YUV for input to the codec - #ifdef VTK_FFMPEG_HAS_IMG_CONVERT - img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, -- (AVPicture *)this->rgbInput, PIX_FMT_RGB24, -+ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24, - cc->width, cc->height); - #else - //convert that to YUV for input to the codec - SwsContext* convert_ctx = sws_getContext( -- cc->width, cc->height, PIX_FMT_RGB24, -+ cc->width, cc->height, AV_PIX_FMT_RGB24, - cc->width, cc->height, cc->pix_fmt, - SWS_BICUBIC, NULL, NULL, NULL); - Deleted: gcc6.patch =================================================================== --- gcc6.patch 2016-12-06 02:48:26 UTC (rev 198082) +++ gcc6.patch 2016-12-06 05:02:32 UTC (rev 198083) @@ -1,21 +0,0 @@ -+++ b/CMake/GenerateExportHeader.cmake 2016-05-07 10:26:51.085595051 +0200 -@@ -166,7 +166,7 @@ - execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*" -+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" - _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - -+++ b/CMake/vtkCompilerExtras.cmake 2016-05-07 10:27:20.496204378 +0200 -@@ -32,7 +32,7 @@ - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*" -+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" - _gcc_version "${_gcc_version_info}") - if(NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0" Deleted: gdal2.patch =================================================================== --- gdal2.patch 2016-12-06 02:48:26 UTC (rev 198082) +++ gdal2.patch 2016-12-06 05:02:32 UTC (rev 198083) @@ -1,31 +0,0 @@ -diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx -index 86854a0..a0e234a 100644 ---- a/IO/GDAL/vtkGDALVectorReader.cxx -+++ b/IO/GDAL/vtkGDALVectorReader.cxx -@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal - public: - Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds ) - { -- this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver ); -+ this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL ); - if ( ! this->Source ) - { - this->LastError = CPLGetLastErrorMsg(); -@@ -61,7 +61,7 @@ public: - { - if ( this->Source ) - { -- OGRDataSource::DestroyDataSource( this->Source ); -+ GDALClose( (GDALDatasetH) this->Source ); - } - } - -@@ -304,7 +304,7 @@ public: - return nCells; - } - -- OGRDataSource* Source; -+ GDALDataset* Source; - OGRSFDriver* Driver; - const char* LastError; - int LayerIdx;