[arch-commits] Commit in vtk/repos (20 files)
Ray Rashif
schiv at archlinux.org
Fri Sep 25 10:41:39 UTC 2015
Date: Friday, September 25, 2015 @ 12:41:38
Author: schiv
Revision: 141595
archrelease: copy trunk to community-i686, community-x86_64
Added:
vtk/repos/community-i686/.contrib
(from rev 141594, vtk/trunk/.contrib)
vtk/repos/community-i686/PKGBUILD
(from rev 141594, vtk/trunk/PKGBUILD)
vtk/repos/community-i686/gdal2.patch
(from rev 141594, vtk/trunk/gdal2.patch)
vtk/repos/community-i686/hdf5.diff
(from rev 141594, vtk/trunk/hdf5.diff)
vtk/repos/community-i686/mesa.diff
(from rev 141594, vtk/trunk/mesa.diff)
vtk/repos/community-i686/vtk-type.patch
(from rev 141594, vtk/trunk/vtk-type.patch)
vtk/repos/community-x86_64/.contrib
(from rev 141594, vtk/trunk/.contrib)
vtk/repos/community-x86_64/PKGBUILD
(from rev 141594, vtk/trunk/PKGBUILD)
vtk/repos/community-x86_64/gdal2.patch
(from rev 141594, vtk/trunk/gdal2.patch)
vtk/repos/community-x86_64/hdf5.diff
(from rev 141594, vtk/trunk/hdf5.diff)
vtk/repos/community-x86_64/mesa.diff
(from rev 141594, vtk/trunk/mesa.diff)
vtk/repos/community-x86_64/vtk-type.patch
(from rev 141594, vtk/trunk/vtk-type.patch)
Deleted:
vtk/repos/community-i686/PKGBUILD
vtk/repos/community-i686/hdf5.diff
vtk/repos/community-i686/mesa.diff
vtk/repos/community-i686/vtk-type.patch
vtk/repos/community-x86_64/PKGBUILD
vtk/repos/community-x86_64/hdf5.diff
vtk/repos/community-x86_64/mesa.diff
vtk/repos/community-x86_64/vtk-type.patch
---------------------------------+
/PKGBUILD | 234 ++++++++++++++++++++++++++++++++++++++
/hdf5.diff | 22 +++
/mesa.diff | 22 +++
/vtk-type.patch | 46 +++++++
community-i686/.contrib | 6
community-i686/PKGBUILD | 119 -------------------
community-i686/gdal2.patch | 31 +++++
community-i686/hdf5.diff | 11 -
community-i686/mesa.diff | 11 -
community-i686/vtk-type.patch | 23 ---
community-x86_64/.contrib | 6
community-x86_64/PKGBUILD | 119 -------------------
community-x86_64/gdal2.patch | 31 +++++
community-x86_64/hdf5.diff | 11 -
community-x86_64/mesa.diff | 11 -
community-x86_64/vtk-type.patch | 23 ---
16 files changed, 398 insertions(+), 328 deletions(-)
Copied: vtk/repos/community-i686/.contrib (from rev 141594, vtk/trunk/.contrib)
===================================================================
--- community-i686/.contrib (rev 0)
+++ community-i686/.contrib 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-i686/PKGBUILD 2015-09-25 10:41:38 UTC (rev 141595)
@@ -1,119 +0,0 @@
-# $Id$
-# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# 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
-
-# TODO: for Qt5 see FS#43007
-
-pkgname=vtk
-pkgver=6.1.0
-_majorver=6.1
-pkgrel=10
-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' 'gdal1' 'unixodbc' 'openmpi' 'jsoncpp')
-makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted')
-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')
-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)
-options=(staticlibs)
-md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
- 'f82c8fe151279c0422ab8a6cfe991c94'
- '5bc47885923ef30e3ac77fcdf6d4e599'
- '381921f3169facf5d6ef22de3cb3fbe5'
- '1cf6b69312ed424a3595c3c11c82750d'
- 'ec131e2c51b826d75bd996a410745279')
-
-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"
-
- 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 AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
- for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; 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"
-
- cmake \
- -Wno-dev \
- -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="4" \
- -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 \
- ${cmake_system_flags} \
- ${cmake_system_python_flags} \
- "${srcdir}/VTK-$pkgver"
-
- make
-}
-
-package() {
- cd "${srcdir}/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.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/qt4"
- mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
-}
-
Copied: vtk/repos/community-i686/PKGBUILD (from rev 141594, vtk/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,117 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Andrzej Giniewicz <gginiu at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+# 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.'
+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')
+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')
+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)
+options=(staticlibs)
+md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
+ 'f82c8fe151279c0422ab8a6cfe991c94'
+ '5bc47885923ef30e3ac77fcdf6d4e599'
+ '381921f3169facf5d6ef22de3cb3fbe5'
+ '1cf6b69312ed424a3595c3c11c82750d'
+ 'ec131e2c51b826d75bd996a410745279'
+ 'e85edd330937a2395a233e0cb6be0b83')
+
+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"
+
+ 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 AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
+ for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; 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"
+
+ 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="4" \
+ -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 \
+ ${cmake_system_flags} \
+ ${cmake_system_python_flags} \
+ "${srcdir}/VTK-$pkgver"
+
+ make
+}
+
+package() {
+ cd "${srcdir}/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.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/qt4"
+ mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
+}
+
Copied: vtk/repos/community-i686/gdal2.patch (from rev 141594, vtk/trunk/gdal2.patch)
===================================================================
--- community-i686/gdal2.patch (rev 0)
+++ community-i686/gdal2.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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;
Deleted: community-i686/hdf5.diff
===================================================================
--- community-i686/hdf5.diff 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-i686/hdf5.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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.")
Copied: vtk/repos/community-i686/hdf5.diff (from rev 141594, vtk/trunk/hdf5.diff)
===================================================================
--- community-i686/hdf5.diff (rev 0)
+++ community-i686/hdf5.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,11 @@
+--- 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: community-i686/mesa.diff
===================================================================
--- community-i686/mesa.diff 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-i686/mesa.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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"
Copied: vtk/repos/community-i686/mesa.diff (from rev 141594, vtk/trunk/mesa.diff)
===================================================================
--- community-i686/mesa.diff (rev 0)
+++ community-i686/mesa.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,11 @@
+--- 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: community-i686/vtk-type.patch
===================================================================
--- community-i686/vtk-type.patch 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-i686/vtk-type.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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
Copied: vtk/repos/community-i686/vtk-type.patch (from rev 141594, vtk/trunk/vtk-type.patch)
===================================================================
--- community-i686/vtk-type.patch (rev 0)
+++ community-i686/vtk-type.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,23 @@
+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
Copied: vtk/repos/community-x86_64/.contrib (from rev 141594, vtk/trunk/.contrib)
===================================================================
--- community-x86_64/.contrib (rev 0)
+++ community-x86_64/.contrib 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-x86_64/PKGBUILD 2015-09-25 10:41:38 UTC (rev 141595)
@@ -1,119 +0,0 @@
-# $Id$
-# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# 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
-
-# TODO: for Qt5 see FS#43007
-
-pkgname=vtk
-pkgver=6.1.0
-_majorver=6.1
-pkgrel=10
-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' 'gdal1' 'unixodbc' 'openmpi' 'jsoncpp')
-makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted')
-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')
-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)
-options=(staticlibs)
-md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
- 'f82c8fe151279c0422ab8a6cfe991c94'
- '5bc47885923ef30e3ac77fcdf6d4e599'
- '381921f3169facf5d6ef22de3cb3fbe5'
- '1cf6b69312ed424a3595c3c11c82750d'
- 'ec131e2c51b826d75bd996a410745279')
-
-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"
-
- 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 AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
- for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; 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"
-
- cmake \
- -Wno-dev \
- -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="4" \
- -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 \
- ${cmake_system_flags} \
- ${cmake_system_python_flags} \
- "${srcdir}/VTK-$pkgver"
-
- make
-}
-
-package() {
- cd "${srcdir}/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.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/qt4"
- mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
-}
-
Copied: vtk/repos/community-x86_64/PKGBUILD (from rev 141594, vtk/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,117 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Andrzej Giniewicz <gginiu at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+# 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.'
+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')
+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')
+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)
+options=(staticlibs)
+md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
+ 'f82c8fe151279c0422ab8a6cfe991c94'
+ '5bc47885923ef30e3ac77fcdf6d4e599'
+ '381921f3169facf5d6ef22de3cb3fbe5'
+ '1cf6b69312ed424a3595c3c11c82750d'
+ 'ec131e2c51b826d75bd996a410745279'
+ 'e85edd330937a2395a233e0cb6be0b83')
+
+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"
+
+ 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 AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
+ for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; 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"
+
+ 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="4" \
+ -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 \
+ ${cmake_system_flags} \
+ ${cmake_system_python_flags} \
+ "${srcdir}/VTK-$pkgver"
+
+ make
+}
+
+package() {
+ cd "${srcdir}/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.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/qt4"
+ mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
+}
+
Copied: vtk/repos/community-x86_64/gdal2.patch (from rev 141594, vtk/trunk/gdal2.patch)
===================================================================
--- community-x86_64/gdal2.patch (rev 0)
+++ community-x86_64/gdal2.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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;
Deleted: community-x86_64/hdf5.diff
===================================================================
--- community-x86_64/hdf5.diff 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-x86_64/hdf5.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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.")
Copied: vtk/repos/community-x86_64/hdf5.diff (from rev 141594, vtk/trunk/hdf5.diff)
===================================================================
--- community-x86_64/hdf5.diff (rev 0)
+++ community-x86_64/hdf5.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,11 @@
+--- 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: community-x86_64/mesa.diff
===================================================================
--- community-x86_64/mesa.diff 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-x86_64/mesa.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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"
Copied: vtk/repos/community-x86_64/mesa.diff (from rev 141594, vtk/trunk/mesa.diff)
===================================================================
--- community-x86_64/mesa.diff (rev 0)
+++ community-x86_64/mesa.diff 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,11 @@
+--- 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: community-x86_64/vtk-type.patch
===================================================================
--- community-x86_64/vtk-type.patch 2015-09-25 10:41:14 UTC (rev 141594)
+++ community-x86_64/vtk-type.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -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
Copied: vtk/repos/community-x86_64/vtk-type.patch (from rev 141594, vtk/trunk/vtk-type.patch)
===================================================================
--- community-x86_64/vtk-type.patch (rev 0)
+++ community-x86_64/vtk-type.patch 2015-09-25 10:41:38 UTC (rev 141595)
@@ -0,0 +1,23 @@
+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