diff options
-rw-r--r-- | .SRCINFO | 41 | ||||
-rw-r--r-- | PKGBUILD | 70 | ||||
-rw-r--r-- | find-libxml2.patch | 42 | ||||
-rw-r--r-- | gcc6.patch | 21 | ||||
-rw-r--r-- | remove-vtkxdmf3.patch | 40 |
5 files changed, 76 insertions, 138 deletions
@@ -1,14 +1,18 @@ # Generated by mksrcinfo v8 -# Sat Apr 9 12:41:40 UTC 2016 +# Sun May 15 18:04:52 UTC 2016 pkgbase = vtk-qt4 pkgdesc = A software system for 3D computer graphics, image processing, and visualization. Linked against QT4 - pkgver = 6.3.0 - pkgrel = 3 + pkgver = 7.0.0 + pkgrel = 1 url = http://www.vtk.org/ arch = i686 arch = x86_64 license = BSD makedepends = boost + makedepends = ffmpeg + makedepends = qtwebkit + makedepends = lesstif + makedepends = jsoncpp makedepends = cmake makedepends = ninja makedepends = java-environment @@ -26,10 +30,7 @@ pkgbase = vtk-qt4 makedepends = mariadb makedepends = glew depends = boost-libs - depends = ffmpeg - depends = qtwebkit - depends = lesstif - depends = jsoncpp + depends = gcc-libs depends = gl2ps optdepends = python2: python bindings optdepends = java-runtime: java bindings @@ -43,26 +44,24 @@ pkgbase = vtk-qt4 optdepends = python2-mpi4py: OpenMPI python support optdepends = unixodbc optdepends = glew - optdepends = gl2ps optdepends = gdal optdepends = mariadb - provides = vtk=6.3.0 - conflicts = vtk + optdepends = jsoncpp + optdepends = ffmpeg + optdepends = qtwebkit 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 = remove-vtkxdmf3.patch - source = find-libxml2.patch + source = http://www.vtk.org/files/release/7.0/VTK-7.0.0.tar.gz + source = http://www.vtk.org/files/release/7.0/VTKData-7.0.0.tar.gz + source = http://www.vtk.org/files/release/7.0/VTKLargeData-7.0.0.tar.gz source = gdal2.patch source = ffmpeg3.patch - sha1sums = 452efab1eedf6202f2d9a3362b5f69adfc44edda - sha1sums = 424b138c079a688cd8c52c43d12b54e2f2b06acf - sha1sums = 622a2bd314262961c6d96f2686f96224e8e31de3 - sha1sums = f8c9270941707a296ff5e0ea3c73a1f0407c6f9b - sha1sums = baa807e4495219b3104b6245ca79b8f33ff299db + source = gcc6.patch + sha1sums = 7719fac36b36965eaf5076542166ba49bbe7afbb + sha1sums = 1bbaa642a3e3676a58a08c956df73645326c2859 + sha1sums = 8d16a1fba15e4eb95c03fe97937488ddcdd7fbd0 sha1sums = c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e - sha1sums = a78177f8dd6dedd9ad189fa12730ec53c7d02508 + sha1sums = 3ffab6d117dee93bfa1d84305aa8bb8781c2284d + sha1sums = 0c6684c51240c9c52b809694ce41c1308e947bae pkgname = vtk-qt4 @@ -4,17 +4,15 @@ # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=vtk-qt4 -pkgver=6.3.0 -_majorver=6.3 -pkgrel=3 +pkgver=7.0.0 +_majorver=7.0 +pkgrel=1 pkgdesc='A software system for 3D computer graphics, image processing, and visualization. Linked against QT4' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') -provides=(vtk=6.3.0) -conflicts=(vtk) -depends=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'jsoncpp' 'gl2ps') -makedepends=('boost' 'cmake' 'ninja' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' ) +depends=('boost-libs' 'gcc-libs' 'gl2ps') +makedepends=('boost' 'ffmpeg' 'qtwebkit' 'lesstif' 'jsoncpp' 'cmake' 'ninja' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' ) optdepends=('python2: python bindings' 'java-runtime: java bindings' 'tk: tcl bindings' @@ -27,33 +25,33 @@ optdepends=('python2: python bindings' 'python2-mpi4py: OpenMPI python support' 'unixodbc' 'glew' - 'gl2ps' 'gdal' - 'mariadb') + 'mariadb' + 'jsoncpp' + 'ffmpeg' + 'qtwebkit') 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" - remove-vtkxdmf3.patch - find-libxml2.patch gdal2.patch - ffmpeg3.patch) + ffmpeg3.patch + gcc6.patch) + options=(staticlibs) -sha1sums=('452efab1eedf6202f2d9a3362b5f69adfc44edda' - '424b138c079a688cd8c52c43d12b54e2f2b06acf' - '622a2bd314262961c6d96f2686f96224e8e31de3' - 'f8c9270941707a296ff5e0ea3c73a1f0407c6f9b' - 'baa807e4495219b3104b6245ca79b8f33ff299db' +sha1sums=('7719fac36b36965eaf5076542166ba49bbe7afbb' + '1bbaa642a3e3676a58a08c956df73645326c2859' + '8d16a1fba15e4eb95c03fe97937488ddcdd7fbd0' 'c60610e7c8cf0ad93d7c02cbf8a20fc415f59b3e' - 'a78177f8dd6dedd9ad189fa12730ec53c7d02508') + '3ffab6d117dee93bfa1d84305aa8bb8781c2284d' + '0c6684c51240c9c52b809694ce41c1308e947bae') prepare() { cd "${srcdir}"/VTK-$pkgver # fix compilation errors: - 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.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|" \ @@ -72,9 +70,9 @@ build() { # flags to enable using system libs local cmake_system_flags="" - # TODO: try to use system provided XDMF2, XDMF3, LIBPROJ4 NETCDF + # TODO: try to use system provided XDMF2, XDMF3, LIBPROJ4 NETCDF and HDF5 # VTK fails to compile with recent netcdf-cxx package, VTK should be ported to the latest API - 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 @@ -85,25 +83,27 @@ build() { -Wno-dev \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/opt/${pkgname} \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DDOCUMENTATION_HTML_HELP:BOOL=ON \ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=OFF \ -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ -DVTK_BUILD_ALL_MODULES:BOOL=ON \ -DVTK_USE_LARGE_DATA:BOOL=ON \ + -DVTK_USE_SYSTEM_HDF5:BOOL=OFF \ -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 \ + -DVTK_INSTALL_INCLUDE_DIR:PATH=include \ ${cmake_system_flags} \ ${cmake_system_python_flags} \ -DCMAKE_BUILD_TYPE=Release \ "${srcdir}/VTK-$pkgver" \ + "${srcdir}/VTK-$pkgver" \ -GNinja ninja @@ -114,20 +114,20 @@ package() { 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" + mkdir -p "$pkgdir/etc/ld.so.conf.d/" + printf "%s\n" "/opt/${pkgname}/lib" > "$pkgdir/etc/ld.so.conf.d/$pkgname.conf" # 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 -dv "${pkgdir}/opt/${pkgname}/share/java/vtk" + mv -v "${pkgdir}/opt/${pkgname}/lib/vtk.jar" "${pkgdir}/opt/${pkgname}/share/java/vtk" + rm -rf "${pkgdir}/opt/${pkgname}/lib/vtk-${_majorver}/java" + # Install license install -dv "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}" - + install -m644 "${srcdir}/VTK-${pkgver}/Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}" + # Fix path of QtDesigner plugin - install -dv "${pkgdir}/usr/lib/qt4" - mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins + install -dv "${pkgdir}/opt/${pkgname}/lib/qt4" + mv "${pkgdir}"/opt/${pkgname}/plugins "${pkgdir}"/opt/${pkgname}/lib/qt4/plugins } diff --git a/find-libxml2.patch b/find-libxml2.patch deleted file mode 100644 index a382a0fdb757..000000000000 --- a/find-libxml2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6216f98a7124e12a2c1cefd113347f94b51f3c51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com> -Date: Thu, 18 Jun 2015 13:30:30 +0200 -Subject: [PATCH] clarify logic for finding libxml2 in xdmf3 - ---- - ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -index 241fa0a..15955b7 100644 ---- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -+++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -@@ -93,18 +93,17 @@ if(HDF5_FOUND) - endif() - - --set(LIBXML2_LIBRARIES ${vtklibxml2_LIBRARIES}) --set(LIBXML2_INCLUDE_DIR ${vtklibxml2_INCLUDE_DIRS}) --set(LIBXML2_FOUND TRUE) --find_package(LibXml2 REQUIRED) --if(LIBXML2_FOUND) -- include_directories(${LIBXML2_INCLUDE_DIR}) -- get_filename_component(LIBXML2_ROOT "${LIBXML2_INCLUDE_DIR}/../" REALPATH) -- set(LIBXML2_BINARY_DIRS ${LIBXML2_ROOT}/bin) -- set(LIBXML2_BINARY_DIRS ${LIBXML2_BINARY_DIRS} PARENT_SCOPE) -- set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${LIBXML2_LIBRARIES}) -- set(XDMF_BINARIES ${XDMF_BINARIES} ${LIBXML2_BINARY_DIRS}) -+find_package(LibXml2) -+if(NOT LIBXML2_FOUND) -+ set(LIBXML2_LIBRARIES ${vtklibxml2_LIBRARIES}) -+ set(LIBXML2_INCLUDE_DIR ${vtklibxml2_INCLUDE_DIRS}) - endif() -+include_directories(${LIBXML2_INCLUDE_DIR}) -+get_filename_component(LIBXML2_ROOT "${LIBXML2_INCLUDE_DIR}/../" REALPATH) -+set(LIBXML2_BINARY_DIRS ${LIBXML2_ROOT}/bin) -+set(LIBXML2_BINARY_DIRS ${LIBXML2_BINARY_DIRS} PARENT_SCOPE) -+set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${LIBXML2_LIBRARIES}) -+set(XDMF_BINARIES ${XDMF_BINARIES} ${LIBXML2_BINARY_DIRS}) - - # Perform compile-time checks and generate XdmfCoreConfig.hpp - diff --git a/gcc6.patch b/gcc6.patch new file mode 100644 index 000000000000..b8544cc186a7 --- /dev/null +++ b/gcc6.patch @@ -0,0 +1,21 @@ ++++ 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"
\ No newline at end of file diff --git a/remove-vtkxdmf3.patch b/remove-vtkxdmf3.patch deleted file mode 100644 index 9f49f77e9098..000000000000 --- a/remove-vtkxdmf3.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a98527dfe9ce23beebf386fab07caef99b911ede Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com> -Date: Thu, 18 Jun 2015 13:25:14 +0200 -Subject: [PATCH] remove superfluous vtkxdmf3_LINK_DEPENDS from Xdmf3 link line - -This caused VTK-compiled HDF5 and LibXML2 libraries to appear on the link line -even if VTK_USE_SYSTEM_{HDF5,LIBXML2} was on, immediately resulting in a link -error of the type -``` -/usr/bin/ld: cannot find -lvtkhdf5 -/usr/bin/ld: cannot find -lvtklibxml2 -``` -This commit fixes things by simply removing vtkxdmf3_LINK_DEPENDS from the link -line. The dependencies are already taken care of. ---- - ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -index ff045a6..241fa0a 100644 ---- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -+++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -@@ -8,7 +8,7 @@ include(CheckCXXSourceCompiles) - include(SetUpVersion) - include(TestBigEndian) - --if(VERSION_CONTROL_AUTOUPDATE OR -+if(VERSION_CONTROL_AUTOUPDATE OR - NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/XdmfVersion.hpp) - VersionCreate("Xdmf" "2" "XDMFCORE_EXPORT" "XdmfCore.hpp") - endif() -@@ -154,7 +154,7 @@ set(XdmfCoreSources - add_library(XdmfCore ${LIBTYPE} ${XdmfCoreSources}) - link_directories(${XDMF_LIBRARY_DIRS}) - --target_link_libraries(XdmfCore ${XDMF_LIBRARIES} ${vtkxdmf3_LINK_DEPENDS}) -+target_link_libraries(XdmfCore ${XDMF_LIBRARIES}) - vtk_target_install(XdmfCore) - - if(WIN32) |