From 5c9469e88f20f765f744d89c2787a8ca700626d0 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sun, 9 Oct 2011 00:44:49 -0300 Subject: academic/octave: Updated for version 3.4.2. Signed-off-by: Niels Horn --- academic/octave/octave.SlackBuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'academic/octave/octave.SlackBuild') diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 744a8dc5ea..57f1ecbfb7 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -4,7 +4,7 @@ # Written by Kyle Guinn PRGNAM="octave" -VERSION=${VERSION:-3.4.0} +VERSION=${VERSION:-3.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -18,10 +18,10 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README*" +DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -37,6 +37,13 @@ else LIBDIRSUFFIX="" fi +# Default to use ImageMagick (shipped with Slackware) instead of +# GraphicsMagick so that octave will have at least some sort of image +# reading capabilities. ImageMagick limits images to 16bpp, but if you're +# running a multilib environment, it might be easier to accept this limit +# rather than to compile GraphicsMagick. (thanks to Joni Martikainen) +WITH_MAGICK=${WITH_MAGICK:-ImageMagick} # alternatively, "GraphicsMagick" + set -e rm -rf $PKG @@ -76,6 +83,7 @@ FFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --enable-strict-warning-flags \ + --with-magick=$WITH_MAGICK \ --with-amd-includedir=/usr/include/amd \ --build=$ARCH-slackware-linux -- cgit v1.2.3