summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Sergey Kvachonok <ravenexp@gmail.com> 2017-06-05 10:32:13 +0300
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-05 10:48:20 +0200
commitf49472eacb21430e88b7efdd5683b65569e9faef (patch)
treec843d75b7779a60e4e9b1dda1265dcbff5e26b9d
parent27238b3ac14492276ec7acef112dca6cde951024 (diff)
downloadscientific-f49472eacb21430e88b7efdd5683b65569e9faef.tar.gz
scientific-f49472eacb21430e88b7efdd5683b65569e9faef.tar.xz
octave: Bump to 4.2.1
Change-Id: I7c1eec7d31a23eee56b571f782b35b6ed7c31482 Reviewed-on: https://galileo.mailstation.de/gerrit/9213 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/sci-apps/octave/octave-4.2.1.exheres-0 (renamed from packages/sci-apps/octave/octave-4.0.3.exheres-0)0
-rw-r--r--packages/sci-apps/octave/octave.exlib23
2 files changed, 17 insertions, 6 deletions
diff --git a/packages/sci-apps/octave/octave-4.0.3.exheres-0 b/packages/sci-apps/octave/octave-4.2.1.exheres-0
index d610558..d610558 100644
--- a/packages/sci-apps/octave/octave-4.0.3.exheres-0
+++ b/packages/sci-apps/octave/octave-4.2.1.exheres-0
diff --git a/packages/sci-apps/octave/octave.exlib b/packages/sci-apps/octave/octave.exlib
index 4f2a627..a5eb126 100644
--- a/packages/sci-apps/octave/octave.exlib
+++ b/packages/sci-apps/octave/octave.exlib
@@ -2,7 +2,8 @@
# Copyright 2009 Ingmar Vanhassel
# Distributed under the terms of the GNU General Public License v2
-require freedesktop-desktop gnu [ suffix=tar.xz ]
+require freedesktop-desktop gnu [ suffix=tar.gz ]
+require option-renames [ renames=[ 'qt4 gui' ] ]
export_exlib_phases src_prepare src_configure src_install
@@ -28,8 +29,10 @@ MYOPTIONS="
curl
opengl [[ description = [ native graphics ] ]]
openmp
+ portaudio
+ sndfile
( graphicsmagick imagemagick ) [[ number-selected = at-most-one ]]
- qt4 [[ requires = [ opengl ] ]]
+ gui [[ requires = [ opengl ] ]]
"
DEPENDENCIES="
@@ -46,7 +49,6 @@ DEPENDENCIES="
sci-libs/hdf5
sci-libs/qrupdate
sys-libs/libgfortran:*
- x11-libs/libX11
virtual/blas
virtual/lapack
curl? ( net-misc/curl )
@@ -56,12 +58,15 @@ DEPENDENCIES="
x11-dri/glu
x11-dri/mesa
x11-libs/fltk
+ x11-libs/libX11
x11-libs/libXft
)
openmp? ( sys-libs/libgomp:* )
graphicsmagick? ( media-gfx/GraphicsMagick )
imagemagick? ( media-gfx/ImageMagick )
- qt4? ( x11-libs/qt:4[opengl] )
+ gui? ( x11-libs/qtbase:5[gui] )
+ portaudio? ( media-libs/portaudio )
+ sndfile? ( media-libs/libsndfile )
suggestion:
opengl? ( x11-libs/gl2ps )
"
@@ -94,17 +99,23 @@ octave_src_configure() {
--without-qhull
$(option_enable openmp)
- $(option_enable qt4 gui)
$(option_with curl)
+ $(option_with gui qt 5)
$(option_with opengl)
+ $(option_with opengl x)
+ $(option_with opengl fltk)
+ $(option_with portaudio)
+ $(option_with sndfile)
)
+
if option graphicsmagick; then
myconf+=( --with-magick=GraphicsMagick )
elif option imagemagick; then
myconf+=( --with-magick=ImageMagick )
else
- myconf+=( --with-magick=does-not-exist )
+ myconf+=( --without-magick )
fi
+
econf "${myconf[@]}"
}