[arch-commits] Commit in vtk/trunk (PKGBUILD hdf5.diff mesa.diff vtk-type.patch)
Anatol Pomozov
anatolik at archlinux.org
Wed Oct 7 00:33:20 UTC 2015
Date: Wednesday, October 7, 2015 @ 02:33:20
Author: anatolik
Revision: 143104
upgpkg: vtk 6.3.0-1
- enable release compilation mode
- use system python2-six package
- move dependencies needed for modules into optdepends
Modified:
vtk/trunk/PKGBUILD
Deleted:
vtk/trunk/hdf5.diff
vtk/trunk/mesa.diff
vtk/trunk/vtk-type.patch
----------------+
PKGBUILD | 49 ++++++++++++++++++++++++++++---------------------
hdf5.diff | 11 -----------
mesa.diff | 11 -----------
vtk-type.patch | 23 -----------------------
4 files changed, 28 insertions(+), 66 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-07 00:33:01 UTC (rev 143103)
+++ PKGBUILD 2015-10-07 00:33:20 UTC (rev 143104)
@@ -6,15 +6,15 @@
# TODO: for Qt5 see FS#43007
pkgname=vtk
-pkgver=6.1.0
-_majorver=6.1
-pkgrel=11
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
+pkgver=6.3.0
+_majorver=6.3
+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=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'mariadb' 'gdal' 'unixodbc' 'openmpi' 'jsoncpp')
-makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted')
+depends=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'jsoncpp')
+makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-six' 'unixodbc' 'gdal' 'openmpi' 'mariadb')
optdepends=('python2: python bindings'
'java-runtime: java bindings'
'tk: tcl bindings'
@@ -21,29 +21,35 @@
'gnuplot: plotting tools'
'graphviz: drawing tools'
'python2-matplotlib: for Matplotlib rendering'
- 'python2-twisted: for vtkWeb')
+ 'python2-twisted: for vtkWeb'
+ 'python2-six: for vtkWeb'
+ 'unixodbc'
+ 'gdal'
+ 'openmpi'
+ 'mariadb')
provides=('python2-autobahn')
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"
- mesa.diff hdf5.diff vtk-type.patch gdal2.patch)
+ # 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)
options=(staticlibs)
-md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
- 'f82c8fe151279c0422ab8a6cfe991c94'
- '5bc47885923ef30e3ac77fcdf6d4e599'
- '381921f3169facf5d6ef22de3cb3fbe5'
- '1cf6b69312ed424a3595c3c11c82750d'
- 'ec131e2c51b826d75bd996a410745279'
- 'e85edd330937a2395a233e0cb6be0b83')
+sha1sums=('452efab1eedf6202f2d9a3362b5f69adfc44edda'
+ '424b138c079a688cd8c52c43d12b54e2f2b06acf'
+ '622a2bd314262961c6d96f2686f96224e8e31de3'
+ 'f8c9270941707a296ff5e0ea3c73a1f0407c6f9b'
+ 'baa807e4495219b3104b6245ca79b8f33ff299db'
+ 'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e')
prepare() {
cd "${srcdir}"/VTK-$pkgver
# fix compilation errors:
- patch -Np1 -i "${srcdir}/mesa.diff"
- patch -Np1 -i "${srcdir}/hdf5.diff"
- patch -Np1 -i "${srcdir}/vtk-type.patch"
- patch -Np1 -i "${srcdir}/gdal2.patch"
+ patch -Np1 -i "${srcdir}"/remove-vtkxdmf3.patch
+ patch -Np1 -i "${srcdir}"/find-libxml2.patch
+ patch -Np1 -i "${srcdir}"/gdal2.patch
sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
@@ -62,8 +68,8 @@
# flags to enable using system libs
local cmake_system_flags=""
- # TODO: try to use system provided AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
- for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; do
+ # TODO: try to use system provided AUTOBAHN, XDMF2, XDMF3, GL2PS, LIBPROJ4, GLEW, MPI4PY and NETCDF
+ for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE SIX JSONCPP; do
cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
done
@@ -91,6 +97,7 @@
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
${cmake_system_flags} \
${cmake_system_python_flags} \
+ -DCMAKE_BUILD_TYPE=Release \
"${srcdir}/VTK-$pkgver"
make
Deleted: hdf5.diff
===================================================================
--- hdf5.diff 2015-10-07 00:33:01 UTC (rev 143103)
+++ hdf5.diff 2015-10-07 00:33:20 UTC (rev 143104)
@@ -1,11 +0,0 @@
---- a/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt.orig 2014-11-24 19:29:00.084619157 +0100
-+++ b/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt 2014-11-24 19:29:22.824443117 +0100
-@@ -233,7 +233,7 @@
- if (NOT VTK_USE_SYSTEM_HDF5)
- # using VTK's HDF5, we always build that with HL support.
- set (USE_NETCDF4 ON)
--elseif(HDF5_HL_LIBRARY OR HDF5_hdf5_hl_LIBRARY)
-+elseif(HDF5_HL_LIBRARY OR HDF5_hdf5_hl_LIBRARY OR HDF5_hdf5_hl_LIBRARY_RELEASE)
- set (USE_NETCDF4 ON)
- else()
- message(STATUS "Disabling NETCDF4 support since HDF5_HL or HDF5_hdf5_hl is missing.")
Deleted: mesa.diff
===================================================================
--- mesa.diff 2015-10-07 00:33:01 UTC (rev 143103)
+++ mesa.diff 2015-10-07 00:33:20 UTC (rev 143104)
@@ -1,11 +0,0 @@
---- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig 2014-11-23 22:16:50.000000000 +0100
-+++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2014-11-23 22:16:59.000000000 +0100
-@@ -27,7 +27,7 @@
-
- // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
- // the system
--//#define GLX_GLXEXT_LEGACY
-+#define GLX_GLXEXT_LEGACY
- #include "GL/glx.h"
-
- #include "vtkgl.h"
Deleted: vtk-type.patch
===================================================================
--- vtk-type.patch 2015-10-07 00:33:01 UTC (rev 143103)
+++ vtk-type.patch 2015-10-07 00:33:20 UTC (rev 143104)
@@ -1,23 +0,0 @@
-diff -up VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx
---- VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type 2014-01-22 08:55:41.000000000 -0700
-+++ VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-08 15:00:40.492667074 -0700
-@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
- if (bitmap)
- {
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
- metaData.descent);
- }
- ++heightString;
-@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
- if (bitmap)
- {
- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
-- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
-- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
- }
- else
More information about the arch-commits
mailing list