From 7a76ba7d57b70ebd3ac37cfdfe4f5d48a9f9701b Mon Sep 17 00:00:00 2001
From: Christoph Willing
Date: Mon, 11 Feb 2019 18:03:24 +1000
Subject: libraries/VTK: Updated foe version 8.2.0

Signed-off-by: Christoph Willing <chris.willing@linux.com>
---
 libraries/VTK/VTK.SlackBuild | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'libraries/VTK/VTK.SlackBuild')

diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index 25b9811c0a..7a216d4c0f 100644
--- a/libraries/VTK/VTK.SlackBuild
+++ b/libraries/VTK/VTK.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2013,2014 Youjie Zhou <jmpopush@gmail.com>
 # All rights reserved.
-# Copyright 2016-2018 Christoph Willing,  Brisbane Australia
+# Copyright 2016-2019 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@
 #
 
 PRGNAM=VTK
-VERSION=${VERSION:-8.1.2}
-SHORT_VERSION=${SHORT_VERSION:-8.1}
+VERSION=${VERSION:-8.2.0}
+SHORT_VERSION=${SHORT_VERSION:-8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,18 @@ group_views=""   ; [ "${VIEWS:-no}" != "no" ]    && group_views="-DVTK_Group_Vie
 group_web=""     ; [ "${WEB:-no}" != "no" ]      && group_web="-DVTK_Group_Web=true"
 wrap_python=""   ; [ "${PYTHON:-yes}" != "no" ]  && wrap_python="-DVTK_WRAP_PYTHON=true"
 wrap_java=""     ; [ "${JAVA:-no}" != "no" ]     && wrap_java="-DVTK_WRAP_JAVA=true"
-wrap_tcl=""      ; [ "${TCL:-yes}" != "no" ]     && wrap_tcl="-DVTK_WRAP_TCL=true"
+
+if pkg-config --exists jsoncpp ; then jsoncpp="-DVTK_USE_SYSTEM_JSONCPP:BOOL=ON" ; else jsoncpp="" ; fi
+if pkg-config --exists proj ; then proj="-DVTK_USE_SYSTEM_LIBPROJ:BOOL=ON" ; else proj="" ; fi
+
+# TODO: netcdf, hdf5, gl2ps
+#if test -e /usr/include/hdf5.h ; then hdf5="-DVTK_USE_SYSTEM_HDF5:BOOL=ON" ; else hdf5="" ; fi
+hdf5=""
+netcdf=""
+
+# gl2ps 1.4.0 is needed (+ VTK-specific changes)
+#if test -e /usr/include/gl2ps.h ; then gl2ps="-DVTK_USE_SYSTEM_GL2PS:BOOL=ON" ; else gl2ps="" ; fi
+gl2ps=""
 
 
 set -e
@@ -86,24 +97,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch CMakefile first for lib64 issue
-patch -p0 <$CWD/patch-handle-64bit.diff
-
-# -DVTK_CUSTOM_LIBRARY_SUFFIX and -DVTK_INSTALL_INCLUDE_DIR
-#   See https://bugs.archlinux.org/task/43378?project=5&cat[0]=33&string=vtk
-# -DVTK_USE_SYSTEM_*
-#   Use external deps for everything in Slackware, but not SBo (VTK's cmake
-#   tests are broken and unable to use external jsoncpp, proj, netcdf, hdf5 and
-#   gl2ps). That just leaves python-twisted -- use SBo for that, because the
-#   internal twisted overwrites SBo's if it's already installed :O
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=$LIBDIRSUFFIX \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
     -DBUILD_SHARED_LIBS=ON \
     -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
     -DVTK_INSTALL_INCLUDE_DIR:PATH=include/VTK \
@@ -115,17 +115,21 @@ cd build
     $group_web \
     $wrap_python \
     $wrap_java \
-    $wrap_tcl \
     -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
     -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
+    -DVTK_USE_SYSTEM_GLEW:BOOL=ON \
     -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
     -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
-    -DVTK_USE_SYSTEM_OGGTHEORA:BOOL=ON \
+    -DVTK_USE_SYSTEM_OGG:BOOL=ON \
+    -DVTK_USE_SYSTEM_THEORA:BOOL=ON \
     -DVTK_USE_SYSTEM_PNG:BOOL=ON \
     -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
     -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZOPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_TWISTED:BOOL=ON \
+    $jsoncpp \
+    $proj \
+    $gl2ps \
+    $hdf5 \
+    $netcdf \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make
-- 
cgit v1.2.3