diff options
| author |   Guillaume Horel <guillaume.horel@gmail.com> | 2013-10-31 00:29:31 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2013-10-31 00:29:31 -0400 |
| commit | 28029266d0cb9ea75efe44f1369f64438044df49 (patch) | |
| tree | 792e89a471cad9a948b20e4430e42f2dc435a00b /sci-mathematics | |
| parent | sci-mathematics/scilab small fixes to beta version (diff) | |
| download | sci-28029266d0cb9ea75efe44f1369f64438044df49.tar.gz sci-28029266d0cb9ea75efe44f1369f64438044df49.tar.bz2 sci-28029266d0cb9ea75efe44f1369f64438044df49.zip | |
sci-mathematics/scilab fix access violation
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch | 21 | ||||
| -rw-r--r-- | sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch new file mode 100644 index 000000000..39b4302a8 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch @@ -0,0 +1,21 @@ +--- bin/scilab.orig 2013-10-28 01:08:06.623143085 -0400 ++++ bin/scilab 2013-10-30 22:57:00.781289235 -0400 +@@ -650,11 +650,13 @@ + # libEGL may be partially supported by the closed-source NVIDIA driver. + # Until they release an EGL driver, we force the egl_glx driver. + # http://bugzilla.scilab.org/show_bug.cgi?id=12940 +-if test -x /usr/bin/glxinfo; then +- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") +- if test ! -z "$NVIDIA_GLX_VENDOR"; then +- EGL_DRIVER=egl_glx +- export EGL_DRIVER ++if test $SCILAB_MODE != "nw"; then ++ if test -x /usr/bin/glxinfo; then ++ NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") ++ if test ! -z "$NVIDIA_GLX_VENDOR"; then ++ EGL_DRIVER=egl_glx ++ export EGL_DRIVER ++ fi + fi + fi + diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild index eba79faff..8816f2681 100644 --- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild +++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild @@ -122,7 +122,8 @@ src_prepare() { "${FILESDIR}/${P}-gluegen.patch" \ "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \ "${FILESDIR}/${P}-disable-static-systemlib.patch" \ - "${FILESDIR}/${P}-always-use-dynamic-stack.patch" + "${FILESDIR}/${P}-always-use-dynamic-stack.patch" \ + "${FILESDIR}/${P}-accessviolation.patch" append-ldflags $(no-as-needed) |