From 7d7a6ca0f6405c45677903eecefac48f9d07e371 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Tue, 29 Mar 2022 07:55:46 +1000 Subject: libraries/VTK: Fix MPI option Signed-off-by: Christoph Willing Signed-off-by: Willy Sudiarto Raharjo --- libraries/VTK/README | 2 +- libraries/VTK/VTK.SlackBuild | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'libraries/VTK') diff --git a/libraries/VTK/README b/libraries/VTK/README index b4cd45f715..8ebffefc04 100644 --- a/libraries/VTK/README +++ b/libraries/VTK/README @@ -21,7 +21,7 @@ IMAGING=yes|no (default: no) MPI=yes|no (default: no), requires openmpi TK=yes|no (default: yes) VIEWS=yes|no (default: no) -WEB=yes|no (default: no), requires python-twisted +WEB=yes|no (default: no), requires python3-twisted JAVA=yes|no (default: no), requires jdk PYTHON=yes|no (default: yes) QT=yes|no (default: yes) diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild index a08df4c539..7b0674e035 100644 --- a/libraries/VTK/VTK.SlackBuild +++ b/libraries/VTK/VTK.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2013,2014 Youjie Zhou # All rights reserved. -# Copyright 2016-2021 Christoph Willing, Brisbane Australia +# Copyright 2016-2022 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=VTK VERSION=${VERSION:-9.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -70,7 +67,7 @@ fi # configure VTK features # (defaults suitable for OpenCASCADE, it's the only SBo package that depends on VTK) group_imaging="" ; [ "${IMAGING:-yes}" != "no" ] && group_imaging="-DVTK_GROUP_ENABLE_Imaging=YES" -group_mpi="" ; [ "${MPI:-no}" != "no" ] && group_mpi="-DVTK_GROUP_ENABLE_MPI=YES" +group_mpi="" ; [ "${MPI:-no}" != "no" ] && group_mpi="-DVTK_GROUP_ENABLE_MPI=YES -DVTK_USE_MPI=yes" group_qt="" ; [ "${QT:-yes}" != "no" ] && group_qt="-DVTK_GROUP_ENABLE_Qt=YES" group_views="" ; [ "${VIEWS:-no}" != "no" ] && group_views="-DVTK_GROUP_ENABLE_Views=YES" group_web="" ; [ "${WEB:-no}" != "no" ] && group_web="-DVTK_GROUP_ENABLE_Web=YES" @@ -139,16 +136,6 @@ cd build $wrap_java \ $wrap_python \ $python_version \ - -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_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 \ $jsoncpp \ $proj \ $gl2ps \ -- cgit v1.2.3-65-gdbad