| 1 |
commit: 28029266d0cb9ea75efe44f1369f64438044df49 |
| 2 |
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 31 04:29:31 2013 +0000 |
| 4 |
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Oct 31 04:29:31 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=28029266 |
| 7 |
|
| 8 |
sci-mathematics/scilab fix access violation |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/scilab-5.5.0_beta1-accessviolation.patch | 21 +++++++++++++++++++++ |
| 12 |
sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 3 ++- |
| 13 |
2 files changed, 23 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
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 |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..39b4302 |
| 18 |
--- /dev/null |
| 19 |
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch |
| 20 |
@@ -0,0 +1,21 @@ |
| 21 |
+--- bin/scilab.orig 2013-10-28 01:08:06.623143085 -0400 |
| 22 |
++++ bin/scilab 2013-10-30 22:57:00.781289235 -0400 |
| 23 |
+@@ -650,11 +650,13 @@ |
| 24 |
+ # libEGL may be partially supported by the closed-source NVIDIA driver. |
| 25 |
+ # Until they release an EGL driver, we force the egl_glx driver. |
| 26 |
+ # http://bugzilla.scilab.org/show_bug.cgi?id=12940 |
| 27 |
+-if test -x /usr/bin/glxinfo; then |
| 28 |
+- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") |
| 29 |
+- if test ! -z "$NVIDIA_GLX_VENDOR"; then |
| 30 |
+- EGL_DRIVER=egl_glx |
| 31 |
+- export EGL_DRIVER |
| 32 |
++if test $SCILAB_MODE != "nw"; then |
| 33 |
++ if test -x /usr/bin/glxinfo; then |
| 34 |
++ NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") |
| 35 |
++ if test ! -z "$NVIDIA_GLX_VENDOR"; then |
| 36 |
++ EGL_DRIVER=egl_glx |
| 37 |
++ export EGL_DRIVER |
| 38 |
++ fi |
| 39 |
+ fi |
| 40 |
+ fi |
| 41 |
+ |
| 42 |
|
| 43 |
diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild |
| 44 |
index eba79fa..8816f26 100644 |
| 45 |
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild |
| 46 |
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild |
| 47 |
@@ -122,7 +122,8 @@ src_prepare() { |
| 48 |
"${FILESDIR}/${P}-gluegen.patch" \ |
| 49 |
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \ |
| 50 |
"${FILESDIR}/${P}-disable-static-systemlib.patch" \ |
| 51 |
- "${FILESDIR}/${P}-always-use-dynamic-stack.patch" |
| 52 |
+ "${FILESDIR}/${P}-always-use-dynamic-stack.patch" \ |
| 53 |
+ "${FILESDIR}/${P}-accessviolation.patch" |
| 54 |
|
| 55 |
append-ldflags $(no-as-needed) |
Archives