diff options
Diffstat (limited to 'academic/octave/octave.SlackBuild')
| -rw-r--r-- | academic/octave/octave.SlackBuild | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 273f2b4728..ad2f4c5728 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for octave -# Copyright 2012-2018 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2019 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=octave -VERSION=${VERSION:-4.2.2} +VERSION=${VERSION:-4.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,7 +37,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="AUTHORS BUGS CITATION COPYING ChangeLog INSTALL* NEWS README" @@ -59,9 +59,26 @@ else LIBDIRSUFFIX="" fi -# TODO: ImageMagick 6.8.6-10 from Slackware 14.1 is not compatible. -# Newer versions might work, so try offering that alternative again later. -# http://savannah.gnu.org/bugs/?49653 +# Use GraphicsMagick by default. Fall back on ImageMagick from the full +# Slackware install if it's not present. Requires a patch for this bug: +# https://savannah.gnu.org/bugs/?49653 +# +# GraphicsMagick is default due to the fact that the Octave devs mainly test +# with that, and went several releases before noticing ImageMagick was broken. +# If ImageMagick doesn't work, install GraphicsMagick, or set MAGICK="". +MAGICK=${MAGICK-GraphicsMagick} +if [ -n "$MAGICK" ] && ! pkg-config --exists $MAGICK; then + MAGICK=ImageMagick +fi +if [ -n "$MAGICK" ]; then + MAGICK="--with-magick=$MAGICK" +fi + +# Allow forcing a particular version of Qt. Set QT=4 or QT=5. +# If unset, Octave will decide, and it prefers version 5. +if [ -n "$QT" ]; then + QT="--with-qt=$QT" +fi set -e @@ -74,6 +91,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . +patch -p1 < $CWD/patches/imagemagick.diff patch -p1 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif @@ -96,6 +114,9 @@ find . -name stamp-vti -exec touch {} + --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ + --with-openssl=auto \ + ${MAGICK} \ + ${QT} \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |