summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'libraries')
-rw-r--r--libraries/VTK/README4
-rw-r--r--libraries/VTK/VTK.SlackBuild10
2 files changed, 9 insertions, 5 deletions
diff --git a/libraries/VTK/README b/libraries/VTK/README
index 12fc4ea2de..30fe0149da 100644
--- a/libraries/VTK/README
+++ b/libraries/VTK/README
@@ -33,3 +33,7 @@ QT=yes|no (default: yes)
VTK is an optional dependency for the opencv SlackBuild. However since VTK-8.2.0,
it is not suitable as an optional dependency for opencv-legacy. The last suitable
version of VTK for building opencv-legacy is VTK-8.1.2.
+
+Due to unmet build requirements (in particular, required cmake version),
+8.2.0 is the last version of VTK which is suitable for Slackware 14.2.
+
diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index e9167ae916..4f23ed37ab 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-2019 Christoph Willing, Brisbane Australia
+# Copyright 2016-2020 Christoph Willing, Brisbane Australia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,13 +27,13 @@
PRGNAM=VTK
VERSION=${VERSION:-8.2.0}
-SHORT_VERSION=${SHORT_VERSION:-8.2}
+SHORT_VERSION=${SHORT_VERSION:-$(echo $VERSION | sed -e 's/\.[0-9]*//2g')}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"