Date: Wednesday, February 17, 2016 @ 23:54:00
  Author: anatolik
Revision: 162139

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  vtk/repos/community-staging-i686/
  vtk/repos/community-staging-i686/.contrib
    (from rev 162138, vtk/trunk/.contrib)
  vtk/repos/community-staging-i686/PKGBUILD
    (from rev 162138, vtk/trunk/PKGBUILD)
  vtk/repos/community-staging-i686/ffmpeg3_compat.patch
    (from rev 162138, vtk/trunk/ffmpeg3_compat.patch)
  vtk/repos/community-staging-i686/gdal2.patch
    (from rev 162138, vtk/trunk/gdal2.patch)
  vtk/repos/community-staging-x86_64/
  vtk/repos/community-staging-x86_64/.contrib
    (from rev 162138, vtk/trunk/.contrib)
  vtk/repos/community-staging-x86_64/PKGBUILD
    (from rev 162138, vtk/trunk/PKGBUILD)
  vtk/repos/community-staging-x86_64/ffmpeg3_compat.patch
    (from rev 162138, vtk/trunk/ffmpeg3_compat.patch)
  vtk/repos/community-staging-x86_64/gdal2.patch
    (from rev 162138, vtk/trunk/gdal2.patch)

-----------------------------------------------+
 community-staging-i686/.contrib               |    6 +
 community-staging-i686/PKGBUILD               |  128 ++++++++++++++++++++++++
 community-staging-i686/ffmpeg3_compat.patch   |   62 +++++++++++
 community-staging-i686/gdal2.patch            |   31 +++++
 community-staging-x86_64/.contrib             |    6 +
 community-staging-x86_64/PKGBUILD             |  128 ++++++++++++++++++++++++
 community-staging-x86_64/ffmpeg3_compat.patch |   62 +++++++++++
 community-staging-x86_64/gdal2.patch          |   31 +++++
 8 files changed, 454 insertions(+)

Copied: vtk/repos/community-staging-i686/.contrib (from rev 162138, 
vtk/trunk/.contrib)
===================================================================
--- community-staging-i686/.contrib                             (rev 0)
+++ community-staging-i686/.contrib     2016-02-17 22:54:00 UTC (rev 162139)
@@ -0,0 +1,6 @@
+# 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

Copied: vtk/repos/community-staging-i686/PKGBUILD (from rev 162138, 
vtk/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD                             (rev 0)
+++ community-staging-i686/PKGBUILD     2016-02-17 22:54:00 UTC (rev 162139)
@@ -0,0 +1,128 @@
+# $Id$
+# Maintainer: Ray Rashif <sc...@archlinux.org>
+# Contributor: Andrzej Giniewicz <ggi...@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=vtk
+pkgver=7.0.0
+_majorver=7.0
+pkgrel=2
+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')
+optdepends=('python2: python bindings'
+            'java-runtime: java bindings'
+            'tk: tcl bindings'
+            'gnuplot: plotting tools'
+            'graphviz: drawing tools'
+            'python2-matplotlib: for Matplotlib rendering'
+            'python2-twisted: for vtkWeb'
+            'python2-autobahn: for vtkWeb'
+            'openmpi: OpenMPI support'
+            'python2-mpi4py: OpenMPI python support'
+            'unixodbc'
+            'glew'
+            'gdal'
+            'mariadb'
+            'ffmpeg'
+            '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";
+        # https://github.com/Kitware/VTK/pull/21
+        gdal2.patch
+        ffmpeg3_compat.patch)
+options=(staticlibs)
+sha1sums=('7719fac36b36965eaf5076542166ba49bbe7afbb'
+          '1bbaa642a3e3676a58a08c956df73645326c2859'
+          '8d16a1fba15e4eb95c03fe97937488ddcdd7fbd0'
+          'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e'
+          'a78177f8dd6dedd9ad189fa12730ec53c7d02508')
+
+prepare() {
+  cd "${srcdir}"/VTK-$pkgver
+
+  patch -p1 < ../ffmpeg3_compat.patch # 
http://www.vtk.org/Bug/view.php?id=16001
+  patch -p1 < ../gdal2.patch
+
+  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
+
+  # to help cmake find java
+  export JAVA_HOME=/usr/lib/jvm/default
+
+  # flags to enable using system libs
+  local cmake_system_flags=""
+  # TODO: try to use system provided XDMF2, XDMF3, LIBPROJ4 NETCDF
+  # 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
+    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"
+
+  local _tkver=$(echo 'puts $tcl_version' | tclsh)
+
+  cmake \
+    -Wno-dev \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+    -DBUILD_DOCUMENTATION:BOOL=ON \
+    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
+    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
+    -DBUILD_EXAMPLES:BOOL=ON \
+    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
+    -DVTK_BUILD_ALL_MODULES:BOOL=ON \
+    -DVTK_USE_LARGE_DATA:BOOL=ON \
+    -DVTK_QT_VERSION:STRING="5" \
+    -DVTK_WRAP_JAVA:BOOL=ON \
+    -DVTK_WRAP_PYTHON:BOOL=ON \
+    -DVTK_WRAP_TCL:BOOL=ON \
+    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
+    -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+    -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
+    -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
+    ${cmake_system_flags} \
+    ${cmake_system_python_flags} \
+    -DCMAKE_BUILD_TYPE=Release \
+    "${srcdir}/VTK-$pkgver" \
+    -GNinja
+
+  ninja
+}
+
+package() {
+  cd "${srcdir}/build"
+
+  DESTDIR="${pkgdir}" ninja install
+
+  # Move the vtk.jar to the arch-specific location
+  install -dv "${pkgdir}/usr/share/java/vtk"
+  mv -v "${pkgdir}/usr/lib/vtk.jar" "${pkgdir}/usr/share/java/vtk"
+  rm -rf "${pkgdir}/usr/lib/vtk-${_majorver}/java"
+
+  # Install license
+  install -dv "${pkgdir}/usr/share/licenses/vtk"
+  install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" 
"${pkgdir}/usr/share/licenses/vtk"
+
+  # Fix path of QtDesigner plugin
+  install -dv "${pkgdir}/usr/lib/qt5"
+  mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt5/plugins
+}
+

Copied: vtk/repos/community-staging-i686/ffmpeg3_compat.patch (from rev 162138, 
vtk/trunk/ffmpeg3_compat.patch)
===================================================================
--- community-staging-i686/ffmpeg3_compat.patch                         (rev 0)
+++ community-staging-i686/ffmpeg3_compat.patch 2016-02-17 22:54:00 UTC (rev 
162139)
@@ -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);
+ 

Copied: vtk/repos/community-staging-i686/gdal2.patch (from rev 162138, 
vtk/trunk/gdal2.patch)
===================================================================
--- community-staging-i686/gdal2.patch                          (rev 0)
+++ community-staging-i686/gdal2.patch  2016-02-17 22:54:00 UTC (rev 162139)
@@ -0,0 +1,31 @@
+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;

Copied: vtk/repos/community-staging-x86_64/.contrib (from rev 162138, 
vtk/trunk/.contrib)
===================================================================
--- community-staging-x86_64/.contrib                           (rev 0)
+++ community-staging-x86_64/.contrib   2016-02-17 22:54:00 UTC (rev 162139)
@@ -0,0 +1,6 @@
+# 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

Copied: vtk/repos/community-staging-x86_64/PKGBUILD (from rev 162138, 
vtk/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD                           (rev 0)
+++ community-staging-x86_64/PKGBUILD   2016-02-17 22:54:00 UTC (rev 162139)
@@ -0,0 +1,128 @@
+# $Id$
+# Maintainer: Ray Rashif <sc...@archlinux.org>
+# Contributor: Andrzej Giniewicz <ggi...@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=vtk
+pkgver=7.0.0
+_majorver=7.0
+pkgrel=2
+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')
+optdepends=('python2: python bindings'
+            'java-runtime: java bindings'
+            'tk: tcl bindings'
+            'gnuplot: plotting tools'
+            'graphviz: drawing tools'
+            'python2-matplotlib: for Matplotlib rendering'
+            'python2-twisted: for vtkWeb'
+            'python2-autobahn: for vtkWeb'
+            'openmpi: OpenMPI support'
+            'python2-mpi4py: OpenMPI python support'
+            'unixodbc'
+            'glew'
+            'gdal'
+            'mariadb'
+            'ffmpeg'
+            '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";
+        # https://github.com/Kitware/VTK/pull/21
+        gdal2.patch
+        ffmpeg3_compat.patch)
+options=(staticlibs)
+sha1sums=('7719fac36b36965eaf5076542166ba49bbe7afbb'
+          '1bbaa642a3e3676a58a08c956df73645326c2859'
+          '8d16a1fba15e4eb95c03fe97937488ddcdd7fbd0'
+          'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e'
+          'a78177f8dd6dedd9ad189fa12730ec53c7d02508')
+
+prepare() {
+  cd "${srcdir}"/VTK-$pkgver
+
+  patch -p1 < ../ffmpeg3_compat.patch # 
http://www.vtk.org/Bug/view.php?id=16001
+  patch -p1 < ../gdal2.patch
+
+  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
+
+  # to help cmake find java
+  export JAVA_HOME=/usr/lib/jvm/default
+
+  # flags to enable using system libs
+  local cmake_system_flags=""
+  # TODO: try to use system provided XDMF2, XDMF3, LIBPROJ4 NETCDF
+  # 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
+    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"
+
+  local _tkver=$(echo 'puts $tcl_version' | tclsh)
+
+  cmake \
+    -Wno-dev \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+    -DBUILD_DOCUMENTATION:BOOL=ON \
+    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
+    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
+    -DBUILD_EXAMPLES:BOOL=ON \
+    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
+    -DVTK_BUILD_ALL_MODULES:BOOL=ON \
+    -DVTK_USE_LARGE_DATA:BOOL=ON \
+    -DVTK_QT_VERSION:STRING="5" \
+    -DVTK_WRAP_JAVA:BOOL=ON \
+    -DVTK_WRAP_PYTHON:BOOL=ON \
+    -DVTK_WRAP_TCL:BOOL=ON \
+    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
+    -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+    -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
+    -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
+    ${cmake_system_flags} \
+    ${cmake_system_python_flags} \
+    -DCMAKE_BUILD_TYPE=Release \
+    "${srcdir}/VTK-$pkgver" \
+    -GNinja
+
+  ninja
+}
+
+package() {
+  cd "${srcdir}/build"
+
+  DESTDIR="${pkgdir}" ninja install
+
+  # Move the vtk.jar to the arch-specific location
+  install -dv "${pkgdir}/usr/share/java/vtk"
+  mv -v "${pkgdir}/usr/lib/vtk.jar" "${pkgdir}/usr/share/java/vtk"
+  rm -rf "${pkgdir}/usr/lib/vtk-${_majorver}/java"
+
+  # Install license
+  install -dv "${pkgdir}/usr/share/licenses/vtk"
+  install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" 
"${pkgdir}/usr/share/licenses/vtk"
+
+  # Fix path of QtDesigner plugin
+  install -dv "${pkgdir}/usr/lib/qt5"
+  mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt5/plugins
+}
+

Copied: vtk/repos/community-staging-x86_64/ffmpeg3_compat.patch (from rev 
162138, vtk/trunk/ffmpeg3_compat.patch)
===================================================================
--- community-staging-x86_64/ffmpeg3_compat.patch                               
(rev 0)
+++ community-staging-x86_64/ffmpeg3_compat.patch       2016-02-17 22:54:00 UTC 
(rev 162139)
@@ -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);
+ 

Copied: vtk/repos/community-staging-x86_64/gdal2.patch (from rev 162138, 
vtk/trunk/gdal2.patch)
===================================================================
--- community-staging-x86_64/gdal2.patch                                (rev 0)
+++ community-staging-x86_64/gdal2.patch        2016-02-17 22:54:00 UTC (rev 
162139)
@@ -0,0 +1,31 @@
+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;

Reply via email to