move from community

Signed-off-by: Florian Pritz <bluewind@xinu.at>

4 files changed, 124 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31f0eb499031..2765ba74701a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 07:04:01 UTC 2016
+# Thu Mar 22 09:47:22 UTC 2018
 pkgbase = vtk6
 	pkgdesc = A software system for 3D computer graphics, image processing, and visualization. Legacy 6.3 version.
 	pkgver = 6.3.0
-	pkgrel = 1
-	url = http://www.vtk.org/
-	arch = i686
+	pkgrel = 11
+	url = https://www.vtk.org/
 	arch = x86_64
 	license = BSD
 	makedepends = boost
@@ -26,9 +25,10 @@ pkgbase = vtk6
 	makedepends = mariadb
 	makedepends = glew
 	makedepends = ffmpeg
-	makedepends = lesstif
 	makedepends = qt5-base
 	makedepends = jsoncpp
+	makedepends = qt5-webkit
+	makedepends = qt5-tools
 	depends = gcc-libs
 	depends = gl2ps
 	optdepends = python2: python bindings
@@ -46,18 +46,22 @@ pkgbase = vtk6
 	optdepends = gdal
 	optdepends = mariadb
 	options = staticlibs
-	source = http://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz
-	source = http://www.vtk.org/files/release/6.3/VTKData-6.3.0.tar.gz
-	source = http://www.vtk.org/files/release/6.3/VTKLargeData-6.3.0.tar.gz
+	source = https://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz
+	source = https://www.vtk.org/files/release/6.3/VTKData-6.3.0.tar.gz
+	source = https://www.vtk.org/files/release/6.3/VTKLargeData-6.3.0.tar.gz
 	source = remove-vtkxdmf3.patch::https://github.com/nschloe/VTK/commit/a98527dfe9ce23beebf386fab07caef99b911ede.patch
 	source = find-libxml2.patch::https://github.com/nschloe/VTK/commit/6216f98a7124e12a2c1cefd113347f94b51f3c51.patch
+	source = ffmpeg3_compat.patch
 	source = gdal2.patch
+	source = gcc6.patch
 	sha1sums = 452efab1eedf6202f2d9a3362b5f69adfc44edda
 	sha1sums = 424b138c079a688cd8c52c43d12b54e2f2b06acf
 	sha1sums = 622a2bd314262961c6d96f2686f96224e8e31de3
-	sha1sums = f8c9270941707a296ff5e0ea3c73a1f0407c6f9b
-	sha1sums = baa807e4495219b3104b6245ca79b8f33ff299db
+	sha1sums = 191a9393dc0e2e8c40e5042611102cd5e421dfaa
+	sha1sums = 1c26fc85939eb95696e52c7ae1bfac3cc0df52b7
+	sha1sums = a78177f8dd6dedd9ad189fa12730ec53c7d02508
 	sha1sums = c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e
+	sha1sums = 0dc5e510a7f522e32484e2e77205c1a9d2c48854
 
 pkgname = vtk6
 
diff --git a/PKGBUILD b/PKGBUILD
index 211395e9fccd..fb217367b8e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Mainteriner: Florian Pritz <bluewind@xinu.at>
+# Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=vtk6
 pkgver=6.3.0
 _majorver=6.3
-pkgrel=1
+pkgrel=11
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization. Legacy 6.3 version.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org/'
+arch=('x86_64')
+url='https://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')
+makedepends=('boost' 'cmake' 'ninja' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' 'ffmpeg' 'qt5-base' 'jsoncpp' 'qt5-webkit' 'qt5-tools')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -27,20 +27,24 @@ optdepends=('python2: python bindings'
             'glew'
             'gdal'
             'mariadb')
-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"
+source=("https://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz"
+        "https://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz"
+        "https://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz"
         # https://github.com/Kitware/VTK/pull/21
         remove-vtkxdmf3.patch::https://github.com/nschloe/VTK/commit/a98527dfe9ce23beebf386fab07caef99b911ede.patch
         find-libxml2.patch::https://github.com/nschloe/VTK/commit/6216f98a7124e12a2c1cefd113347f94b51f3c51.patch
-        gdal2.patch)
+		ffmpeg3_compat.patch
+        gdal2.patch
+        gcc6.patch)
 options=(staticlibs)
 sha1sums=('452efab1eedf6202f2d9a3362b5f69adfc44edda'
           '424b138c079a688cd8c52c43d12b54e2f2b06acf'
           '622a2bd314262961c6d96f2686f96224e8e31de3'
-          'f8c9270941707a296ff5e0ea3c73a1f0407c6f9b'
-          'baa807e4495219b3104b6245ca79b8f33ff299db'
-          'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e')
+          '191a9393dc0e2e8c40e5042611102cd5e421dfaa'
+          '1c26fc85939eb95696e52c7ae1bfac3cc0df52b7'
+          'a78177f8dd6dedd9ad189fa12730ec53c7d02508'
+          'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e'
+          '0dc5e510a7f522e32484e2e77205c1a9d2c48854')
 
 prepare() {
   cd "${srcdir}"/VTK-$pkgver
@@ -49,6 +53,8 @@ prepare() {
   patch -Np1 -i "${srcdir}"/remove-vtkxdmf3.patch
   patch -Np1 -i "${srcdir}"/find-libxml2.patch
   patch -Np1 -i "${srcdir}"/gdal2.patch
+  patch -Np1 -i "${srcdir}"/ffmpeg3_compat.patch
+  patch -Np1 -i "${srcdir}"/gcc6.patch
 
   sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
       -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
@@ -71,7 +77,7 @@ build() {
   # VTK fails to compile with recent netcdf-cxx package, VTK should be ported to the latest API
   # 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
-  for lib in HDF5 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 GL2PS; do
     cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
@@ -106,11 +112,15 @@ build() {
   ninja
 }
 
+
 package() {
   cd "${srcdir}/build"
 
   DESTDIR="${pkgdir}" ninja install
 
+  mkdir -p "$pkgdir/etc/ld.so.conf.d/"
+  printf "%s\n" "/opt/vtk6/lib" > "$pkgdir/etc/ld.so.conf.d/$pkgname.conf"
+
   # Move the vtk.jar to the arch-specific location
   install -dv "${pkgdir}/opt/${pkgname}/share/java/vtk"
   mv -v "${pkgdir}/opt/${pkgname}/lib/vtk.jar" "${pkgdir}/opt/${pkgname}/share/java/vtk"
diff --git a/ffmpeg3_compat.patch b/ffmpeg3_compat.patch
new file mode 100644
index 000000000000..bf9100ce351c
--- /dev/null
+++ b/ffmpeg3_compat.patch
@@ -0,0 +1,62 @@
+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);
+ 
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 000000000000..e2697d1a8f47
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,24 @@
+diff -Naur a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
+--- a/CMake/GenerateExportHeader.cmake	2016-05-07 10:25:47.104258276 +0200
++++ 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:
+diff -Naur a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
+--- a/CMake/vtkCompilerExtras.cmake	2016-05-07 10:25:47.104258276 +0200
++++ 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"