diff options
| -rw-r--r-- | .SRCINFO | 42 | ||||
| -rw-r--r-- | PKGBUILD | 70 | ||||
| -rw-r--r-- | scilab-5.5.2-batik-1.8.patch | 98 | ||||
| -rw-r--r-- | scilab-5.5.2-fop-2.0.patch | 38 | ||||
| -rw-r--r-- | scilab-5.5.2-jogl.patch | 520 | ||||
| -rw-r--r-- | scilab-5.5.2-strict-jar.patch | 29 | ||||
| -rw-r--r-- | scilab-5.5.2-xmlgraphics-common-2.0.patch | 91 | ||||
| -rw-r--r-- | scilab-LD_LIBRARY_PATH.patch | 11 | ||||
| -rw-r--r-- | scilab-hdf5-1.8.10.patch (renamed from scilab-5.5.2-hdf5-1.8.10.patch) | 592 | ||||
| -rw-r--r-- | scilab-hdf5-type.patch | 11 | ||||
| -rw-r--r-- | scilab-jogl-2.3.2.patch | 556 | ||||
| -rw-r--r-- | scilab-lucene-6.patch | 11 | ||||
| -rw-r--r-- | scilab-strict-jar.patch | 29 |
13 files changed, 978 insertions, 1120 deletions
@@ -1,26 +1,27 @@ # Generated by mksrcinfo v8 -# Wed Jan 18 16:24:06 UTC 2017 +# Thu Feb 16 13:47:54 UTC 2017 pkgbase = scilab pkgdesc = A scientific software package for numerical computations. - pkgver = 5.5.2 - pkgrel = 14 + pkgver = 6.0.0 + pkgrel = 1 url = https://www.scilab.org arch = i686 arch = x86_64 license = BSD license = custom:CeCILL - makedepends = java-environment=7 + makedepends = java-environment>=8 makedepends = apache-ant makedepends = ocaml makedepends = gcc-fortran depends = suitesparse>=4.4.1 depends = arpack depends = fftw + depends = eigen depends = hdf5 depends = libmatio depends = tk depends = curl - depends = java-runtime=7 + depends = java-runtime>=8 depends = beanshell depends = eclipse-ecj depends = java-flexdock>=1.2.4 @@ -38,24 +39,23 @@ pkgbase = scilab depends = xalan-java depends = docbook-xsl depends = jogl>=2.3.2 + depends = apache-lucene>=6 depends = java-batik>=1.8 depends = java-xmlgraphics-commons>=2.0 - conflicts = scilab-git - conflicts = scilab-bin - source = https://www.scilab.org/download/5.5.2/scilab-5.5.2-src.tar.gz - source = scilab-5.5.2-batik-1.8.patch - source = scilab-5.5.2-fop-2.0.patch - source = scilab-5.5.2-hdf5-1.8.10.patch::http://bugzilla.scilab.org/attachment.cgi?id=4382 - source = scilab-5.5.2-xmlgraphics-common-2.0.patch - source = scilab-5.5.2-strict-jar.patch - source = scilab-5.5.2-jogl.patch - sha256sums = a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e - sha256sums = 4f243e32be0aa2755405e121e7a23a370276c98e00d1b016bd43df56a76782ca - sha256sums = a8e03352cdaa5955414945e3fc8f56a035793869934345eef301cc6124b7ec95 - sha256sums = ed8572b978ef7ad5d22b7f7346af139d771c7397cd0de2220e49621b59521bca - sha256sums = 64de4a044fb7228cae7003e6f86f6f0958ea10049f2fb24a11a07b0087e4ef36 - sha256sums = cda2635f25a56f3c423f7a88791222aae3caad53c086cedc0cfe48011936a5a8 - sha256sums = 1796919522e00f6f0a38677ba1b79498822a9e75a7e7da2c31ebaa935153d92e + source = https://www.scilab.org/download/6.0.0/scilab-6.0.0-src.tar.gz + source = scilab-jogl-2.3.2.patch + source = scilab-LD_LIBRARY_PATH.patch + source = scilab-strict-jar.patch + source = scilab-lucene-6.patch + source = scilab-hdf5-type.patch + source = scilab-hdf5-1.8.10.patch + sha256sums = b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137 + sha256sums = f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc + sha256sums = 37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0 + sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd + sha256sums = ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66 + sha256sums = c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d + sha256sums = 2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0 pkgname = scilab @@ -3,64 +3,58 @@ # Contributor: Victor Dmitriyev <mrvvitek@gmail.com> pkgname=scilab -pkgver=5.5.2 -pkgrel=14 +pkgver=6.0.0 +pkgrel=1 pkgdesc='A scientific software package for numerical computations.' arch=('i686' 'x86_64') url='https://www.scilab.org' license=('BSD' 'custom:CeCILL') -depends=('suitesparse>=4.4.1' 'arpack' 'fftw' +depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen' 'hdf5' 'libmatio' 'tk' 'curl' - 'java-runtime=7' + 'java-runtime>=8' 'beanshell' 'eclipse-ecj' 'java-flexdock>=1.2.4' 'fop-hyph' 'jeuclid-core' 'jgraphx>=2.0.0.1' 'javahelp2' 'saxon-he' 'jlatexmath-fop>=1.0.3' 'jrosetta>=1.0.4' 'jgoodies-looks' 'java-qdox' 'java-skinlf' 'java-testng' 'xalan-java' 'docbook-xsl' - 'jogl>=2.3.2' + 'jogl>=2.3.2' 'apache-lucene>=6' 'java-batik>=1.8' 'java-xmlgraphics-commons>=2.0') -makedepends=('java-environment=7' 'apache-ant' - 'ocaml' 'gcc-fortran' ) -conflicts=('scilab-git' 'scilab-bin') - +makedepends=('java-environment>=8' 'apache-ant' 'ocaml' 'gcc-fortran' ) source=("${url}/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" - "${pkgname}-${pkgver}-batik-1.8.patch" - "${pkgname}-${pkgver}-fop-2.0.patch" - "${pkgname}-${pkgver}-hdf5-1.8.10.patch::http://bugzilla.scilab.org/attachment.cgi?id=4382" - "${pkgname}-${pkgver}-xmlgraphics-common-2.0.patch" - "${pkgname}-${pkgver}-strict-jar.patch" - "${pkgname}-${pkgver}-jogl.patch") -sha256sums=('a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e' - '4f243e32be0aa2755405e121e7a23a370276c98e00d1b016bd43df56a76782ca' - 'a8e03352cdaa5955414945e3fc8f56a035793869934345eef301cc6124b7ec95' - 'ed8572b978ef7ad5d22b7f7346af139d771c7397cd0de2220e49621b59521bca' - '64de4a044fb7228cae7003e6f86f6f0958ea10049f2fb24a11a07b0087e4ef36' - 'cda2635f25a56f3c423f7a88791222aae3caad53c086cedc0cfe48011936a5a8' - '1796919522e00f6f0a38677ba1b79498822a9e75a7e7da2c31ebaa935153d92e') + "${pkgname}-jogl-2.3.2.patch" + "${pkgname}-LD_LIBRARY_PATH.patch" + "${pkgname}-strict-jar.patch" + "${pkgname}-lucene-6.patch" + "${pkgname}-hdf5-type.patch" + "${pkgname}-hdf5-1.8.10.patch") +sha256sums=('b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137' + 'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc' + '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0' + '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd' + 'ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66' + 'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d' + '2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0') prepare(){ cd "${srcdir}/${pkgname}-${pkgver}" - # http://bugzilla.scilab.org/show_bug.cgi?id=13813 - patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-batik-1.8.patch - # http://bugzilla.scilab.org/show_bug.cgi?id=14009 - patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-fop-2.0.patch - # http://bugzilla.scilab.org/show_bug.cgi?id=13724 - patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-xmlgraphics-common-2.0.patch - # http://bugzilla.scilab.org/show_bug.cgi?id=13809 - patch -p1 < "${srcdir}"/${pkgname}-${pkgver}-jogl.patch - # Linked to https://codereview.scilab.org/#/c/18089/ - patch < "${srcdir}"/${pkgname}-${pkgver}-strict-jar.patch # http://bugzilla.scilab.org/show_bug.cgi?id=14539 - patch -p1 < "${srcdir}"/${pkgname}-${pkgver}-hdf5-1.8.10.patch + patch -p1 < "${srcdir}"/${pkgname}-hdf5-1.8.10.patch + # https://codereview.scilab.org/#/c/17530/ + patch -p2 < "${srcdir}"/${pkgname}-jogl-2.3.2.patch + # Linked to: https://codereview.scilab.org/#/c/18089/ + patch < "${srcdir}"/${pkgname}-strict-jar.patch + # Fix to build with lucene >= 6 + patch -p0 < "${srcdir}"/${pkgname}-lucene-6.patch + # Fix hdf5 type + patch -p0 < "${srcdir}"/${pkgname}-hdf5-type.patch + # Fix for LD_LIBRARY_PATH + patch bin/scilab "${srcdir}"/${pkgname}-LD_LIBRARY_PATH.patch } build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Newer version (>7) of java does not work - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - ./configure \ --prefix=/usr \ --with-gcc \ @@ -76,7 +70,7 @@ build() { --enable-build-localization \ --disable-static-system-lib - make all -j1 + make make doc } @@ -95,8 +89,6 @@ package(){ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING-FR" \ - "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-FR" install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING-BSD" \ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD" } diff --git a/scilab-5.5.2-batik-1.8.patch b/scilab-5.5.2-batik-1.8.patch deleted file mode 100644 index aaf4da8845d4..000000000000 --- a/scilab-5.5.2-batik-1.8.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13813 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab to build against (and require) Batik >=1.8, fixing an API change -with SAXSVGDocumentFactory being moved. This is not tested beyond "yes Scilab -still links to Batik to export SVGs," as I'm not sure of a good test case, and -it's awaiting upstream review. - ---- a/scilab/configure -+++ b/scilab/configure -@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5 --$as_echo_n "checking minimal version (1.7) of batik... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8) of batik" >&5 -+$as_echo_n "checking minimal version (1.8) of batik... " >&6; } - saved_ac_java_classpath=$ac_java_classpath - export ac_java_classpath="$BATIK:$ac_java_classpath" - if test "x" == "x"; then -@@ -16614,7 +16614,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.8"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) > 0) { -@@ -16663,7 +16663,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16673,7 +16673,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5 - fi - - else -@@ -16686,7 +16686,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.8"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) != 0) { -@@ -16735,7 +16735,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16745,7 +16745,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5 - fi - - fi ---- a/scilab/configure.ac -+++ b/scilab/configure.ac -@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - BATIK=$PACKAGE_JAR_FILE - fi - AC_SUBST(BATIK) -- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()]) -+ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.8],[Version.getVersion()]) - - # Commons I/O library - AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) ---- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader; - import org.apache.batik.bridge.GVTBuilder; - import org.apache.batik.bridge.UserAgent; - import org.apache.batik.bridge.UserAgentAdapter; --import org.apache.batik.dom.svg.SAXSVGDocumentFactory; -+import org.apache.batik.anim.dom.SAXSVGDocumentFactory; - import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.util.XMLResourceDescriptor; - import org.scilab.forge.jlatexmath.ParseException; diff --git a/scilab-5.5.2-fop-2.0.patch b/scilab-5.5.2-fop-2.0.patch deleted file mode 100644 index 83c6f6ca4826..000000000000 --- a/scilab-5.5.2-fop-2.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure -of a test case, and it's awaiting upstream review. - ---- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter { - String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); - - try { -- FopFactory fopFactory = FopFactory.newInstance(); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - fopFactory.addElementMapping(new JLaTeXMathElementMapping()); - fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler()); -- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - - // Step 3: Construct fop with desired output format - OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); ---- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter { - * @param format the page format - */ - public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) { -- FopFactory fopFactory = FopFactory.newInstance(); - OutputStream out = null; - - try { -- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - userAgent.setProducer(CREATOR); - userAgent.setTitle(title); diff --git a/scilab-5.5.2-jogl.patch b/scilab-5.5.2-jogl.patch deleted file mode 100644 index 44dc5f79b4f6..000000000000 --- a/scilab-5.5.2-jogl.patch +++ /dev/null @@ -1,520 +0,0 @@ -http://bugzilla.scilab.org/show_bug.cgi?id=13809 -Index: scilab-5.5.2/configure -=================================================================== ---- scilab-5.5.2.orig/configure -+++ scilab-5.5.2/configure -@@ -14264,7 +14264,7 @@ $as_echo_n "checking jogl2... " >&6; } - // #line 14264 "configure" - import java.util.regex.Pattern; - --import javax.media.opengl.glu.GLUnurbs; -+import com.jogamp.opengl.glu.GLUnurbs; - - public class conftest { - public static void main(String[] argv) { -@@ -14350,10 +14350,10 @@ $as_echo "$jar_resolved" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - if test "" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5 --$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&5 -+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&2;} - else -- as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" "$LINENO" 5 -+ as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" "$LINENO" 5 - fi - fi - -Index: scilab-5.5.2/configure.ac -=================================================================== ---- scilab-5.5.2.orig/configure.ac -+++ scilab-5.5.2/configure.ac -@@ -912,7 +912,7 @@ if test "$with_javasci" != no -o "$with_ - AC_SUBST(SKINLF) - - # JOGL 2 -- AC_JAVA_CHECK_PACKAGE([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) -+ AC_JAVA_CHECK_PACKAGE([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) - JOGL2=$PACKAGE_JAR_FILE - AC_SUBST(JOGL2) - -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -@@ -84,10 +84,10 @@ import java.util.Map; - import java.util.Set; - import java.util.UUID; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; - import javax.swing.JComponent; - import javax.swing.JSeparator; - import javax.swing.SwingUtilities; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -@@ -20,7 +20,7 @@ import java.awt.Cursor; - import java.awt.Font; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.canvas.Canvas; - import org.scilab.modules.gui.canvas.ScilabCanvas; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -@@ -32,8 +32,8 @@ import java.awt.event.MouseListener; - import java.awt.event.MouseMotionListener; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; --import javax.media.opengl.GLAutoDrawable; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLAutoDrawable; - import javax.swing.JPanel; - - import org.scilab.forge.scirenderer.Canvas; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -@@ -19,12 +19,12 @@ import java.awt.HeadlessException; - import java.util.Calendar; - import java.util.StringTokenizer; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLException; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; --import javax.media.opengl.awt.GLJPanel; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLException; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; -+import com.jogamp.opengl.awt.GLJPanel; - - import org.scilab.modules.action_binding.InterpreterManagement; - import org.scilab.modules.commons.OS; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.dockable.Dockable; - -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.ScilabBridge; - import org.scilab.modules.gui.dockable.ScilabDockable; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; - import org.scilab.modules.gui.utils.Position; -Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -=================================================================== ---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas; - import org.scilab.modules.gui.utils.Position; - import org.scilab.modules.gui.utils.Size; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - import java.awt.image.BufferedImage; - - /** -Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -+++ scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tran - import org.scilab.forge.scirenderer.tranformations.TransformationFactory; - import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; - --import javax.media.opengl.awt.GLCanvas; --import javax.media.opengl.awt.GLJPanel; -+import com.jogamp.opengl.awt.GLCanvas; -+import com.jogamp.opengl.awt.GLJPanel; - import javax.swing.*; - import java.awt.*; - -Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -+++ scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -@@ -15,7 +15,7 @@ import com.jogamp.opengl.util.Animator; - import org.scilab.forge.scirenderer.Canvas; - import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; - --import javax.media.opengl.awt.GLJPanel; -+import com.jogamp.opengl.awt.GLJPanel; - import javax.swing.JFrame; - import javax.swing.JPanel; - import java.awt.BorderLayout; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage; - import java.lang.reflect.InvocationTargetException; - import java.util.concurrent.Semaphore; - --import javax.media.opengl.DebugGL2; --import javax.media.opengl.GL2; --import javax.media.opengl.GLAutoDrawable; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLContext; --import javax.media.opengl.GLDrawableFactory; --import javax.media.opengl.GLEventListener; --import javax.media.opengl.GLException; --import javax.media.opengl.GLOffscreenAutoDrawable; --import javax.media.opengl.GLProfile; -+import com.jogamp.opengl.DebugGL2; -+import com.jogamp.opengl.GL2; -+import com.jogamp.opengl.GLAutoDrawable; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLContext; -+import com.jogamp.opengl.GLDrawableFactory; -+import com.jogamp.opengl.GLEventListener; -+import com.jogamp.opengl.GLException; -+import com.jogamp.opengl.GLOffscreenAutoDrawable; -+import com.jogamp.opengl.GLProfile; - import javax.swing.SwingUtilities; - - import org.scilab.forge.scirenderer.Canvas; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp - - import org.scilab.forge.scirenderer.Canvas; - --import javax.media.opengl.GLAutoDrawable; -+import com.jogamp.opengl.GLAutoDrawable; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -@@ -11,7 +11,7 @@ - - package org.scilab.forge.scirenderer.implementation.jogl; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * This class store current OpenGl context capacity. -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tran - import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; - import org.scilab.forge.scirenderer.tranformations.Vector3d; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -@@ -11,8 +11,8 @@ - - package org.scilab.forge.scirenderer.implementation.jogl; - --import javax.media.opengl.GL; --import javax.media.opengl.glu.GLU; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.glu.GLU; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buff - import org.scilab.forge.scirenderer.buffers.ElementsBuffer; - import org.scilab.forge.scirenderer.buffers.IndicesBuffer; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - import java.util.Collection; - import java.util.HashSet; - import java.util.Set; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp - - import org.scilab.forge.scirenderer.buffers.DataBuffer; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - import java.nio.Buffer; - - /** -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp - - import org.scilab.forge.scirenderer.buffers.ElementsBuffer; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - import java.nio.Buffer; - import java.nio.FloatBuffer; - -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp - - import org.scilab.forge.scirenderer.buffers.IndicesBuffer; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - import java.nio.Buffer; - import java.nio.IntBuffer; - import java.util.Collection; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clip - import org.scilab.forge.scirenderer.clipping.ClippingPlane; - import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tran - import org.scilab.forge.scirenderer.tranformations.TransformationFactory; - import org.scilab.forge.scirenderer.tranformations.Vector4d; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.text - import org.scilab.forge.scirenderer.lightning.LightManager; - import org.scilab.forge.scirenderer.shapes.appearance.Material; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - import java.nio.FloatBuffer; - import java.nio.IntBuffer; - -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -@@ -11,7 +11,7 @@ - - package org.scilab.forge.scirenderer.implementation.jogl.lightning; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; - import org.scilab.forge.scirenderer.lightning.Light; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.ligh - import org.scilab.forge.scirenderer.lightning.LightManager; - import org.scilab.forge.scirenderer.shapes.appearance.Material; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * JoGL implementation of {@link LightManager} -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -@@ -11,7 +11,7 @@ - - package org.scilab.forge.scirenderer.implementation.jogl.picking; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.impl - import org.scilab.forge.scirenderer.picking.PickingTools; - import org.scilab.forge.scirenderer.tranformations.Vector3d; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - import java.awt.Point; - import java.nio.FloatBuffer; - -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Draw - import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; - import org.scilab.forge.scirenderer.renderer.Renderer; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * @author Pierre Lando -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.impl - import org.scilab.forge.scirenderer.renderer.Renderer; - import org.scilab.forge.scirenderer.renderer.RendererManager; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - import java.util.HashSet; - import java.util.Set; - import java.util.Stack; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tran - import org.scilab.forge.scirenderer.tranformations.Vector3d; - - --import javax.media.opengl.GL; --import javax.media.opengl.GL2; --import javax.media.opengl.GL2ES1; --import javax.media.opengl.GL2GL3; --import javax.media.opengl.GLProfile; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GL2; -+import com.jogamp.opengl.GL2ES1; -+import com.jogamp.opengl.GL2GL3; -+import com.jogamp.opengl.GLProfile; - import java.awt.Dimension; - import java.nio.ByteBuffer; - import java.nio.FloatBuffer; -Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -=================================================================== ---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.imp - import org.scilab.forge.scirenderer.shapes.appearance.Appearance; - import org.scilab.forge.scirenderer.shapes.appearance.Color; - --import javax.media.opengl.GL2; -+import com.jogamp.opengl.GL2; - - /** - * - -Index: scilab-5.5.2/configure -=================================================================== ---- scilab-5.5.2.orig/configure -+++ scilab-5.5.2/configure -@@ -14649,7 +14649,7 @@ $as_echo_n "checking gluegen2-rt... " >& - // #line 14649 "configure" - import java.util.regex.Pattern; - --import jogamp.common.os.MachineDescriptionRuntime; -+import jogamp.common.os.MachineDataInfoRuntime; - - public class conftest { - public static void main(String[] argv) { -@@ -14735,10 +14735,10 @@ $as_echo "$jar_resolved" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - if test "" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&5 --$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDataInfoRuntime)" >&5 -+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDataInfoRuntime)" >&2;} - else -- as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" "$LINENO" 5 -+ as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDataInfoRuntime)" "$LINENO" 5 - fi - fi - -Index: scilab-5.5.2/configure.ac -=================================================================== ---- scilab-5.5.2.orig/configure.ac -+++ scilab-5.5.2/configure.ac -@@ -943,7 +943,7 @@ interface for JOGL2 - or libGL (OpenGL l - fi - - # JoGL Native <=> Java connector -- AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering]) -+ AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[jogamp.common.os.MachineDataInfoRuntime],[Scilab 3D rendering]) - GLUEGEN2_RT=$PACKAGE_JAR_FILE - AC_SUBST(GLUEGEN2_RT) -
\ No newline at end of file diff --git a/scilab-5.5.2-strict-jar.patch b/scilab-5.5.2-strict-jar.patch deleted file mode 100644 index 86aa4ac3af2e..000000000000 --- a/scilab-5.5.2-strict-jar.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure 2015-10-14 21:38:41.696745994 +0200 -+++ configure.new 2015-10-14 22:12:15.437348019 +0200 -@@ -15666,7 +15666,7 @@ - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do -+ for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar"; do - - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` -@@ -16880,7 +16880,7 @@ - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do -+ for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" ; do - - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` -@@ -17352,7 +17352,7 @@ - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do -+ for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" ; do - - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` diff --git a/scilab-5.5.2-xmlgraphics-common-2.0.patch b/scilab-5.5.2-xmlgraphics-common-2.0.patch deleted file mode 100644 index c12df968fe93..000000000000 --- a/scilab-5.5.2-xmlgraphics-common-2.0.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0. This is not -tested, as I'm not sure of a test case, and a similar patch (where the -super.processShape calls are passed cached=true) is already awaiting upstream -review. - ---- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -@@ -857,7 +857,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -880,10 +880,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -891,7 +891,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -899,7 +899,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - }; - g2d.setGraphicContext(new GraphicContext()); -@@ -1029,7 +1029,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -1052,10 +1052,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -1063,7 +1063,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -1071,7 +1071,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - }; diff --git a/scilab-LD_LIBRARY_PATH.patch b/scilab-LD_LIBRARY_PATH.patch new file mode 100644 index 000000000000..222dff3b8806 --- /dev/null +++ b/scilab-LD_LIBRARY_PATH.patch @@ -0,0 +1,11 @@ +--- bin/scilab 2016-08-09 15:08:31.708445393 +0200 ++++ bin/scilab 2016-08-09 15:10:30.285575525 +0200 +@@ -808,7 +808,7 @@ + if test -d $SCI/lib/thirdparty; then + SCILIB=$SCI/lib/thirdparty:$SCILIB; + fi +-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} ++LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:/usr/lib/scilab + + case $OS in + *darwin* | *Darwin*) # MacOS X diff --git a/scilab-5.5.2-hdf5-1.8.10.patch b/scilab-hdf5-1.8.10.patch index ac51e90895d0..7fbb0339fe75 100644 --- a/scilab-5.5.2-hdf5-1.8.10.patch +++ b/scilab-hdf5-1.8.10.patch @@ -1,284 +1,308 @@ -Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
-@@ -716,7 +716,11 @@ int readCommonPolyMatrix(int _iDatasetId
- /*
- * Open the referenced object, get its name and type.
- */
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
-+ obj = H5Rdereference(_iDatasetId,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ H5R_OBJECT, &pData[i]);
- if (_iComplex)
- {
- status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -950,7 +954,11 @@ int readCommonSparseComplexMatrix(int _i
- }
-
- //read Row data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[0]);
- status = readInteger32Matrix(obj, _piNbItemRow);
- if (status < 0)
- {
-@@ -958,7 +966,11 @@ int readCommonSparseComplexMatrix(int _i
- }
-
- //read cols data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[1]);
- status = readInteger32Matrix(obj, _piColPos);
- if (status < 0)
- {
-@@ -966,7 +978,11 @@ int readCommonSparseComplexMatrix(int _i
- }
-
- //read sparse data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[2]);
-
- if (_iComplex)
- {
-@@ -1017,7 +1033,11 @@ int readBooleanSparseMatrix(int _iDatase
- }
-
- //read Row data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[0]);
- status = readInteger32Matrix(obj, _piNbItemRow);
- if (status < 0)
- {
-@@ -1027,7 +1047,11 @@ int readBooleanSparseMatrix(int _iDatase
- if (_iNbItem != 0)
- {
- //read cols data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+ obj = H5Rdereference(_iDatasetId,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ H5R_OBJECT, &pRef[1]);
- status = readInteger32Matrix(obj, _piColPos);
- if (status < 0)
- {
-@@ -1132,7 +1156,11 @@ int getListItemDataset(int _iDatasetId,
- {
- hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
-
-- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
-+ *_piItemDataset = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &poRef);
-
- if (*_piItemDataset == 0)
- {
-Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-@@ -471,7 +471,11 @@ int readDoubleMatrix_v1(int _iDatasetId,
- }
-
- //Open the referenced object, get its name and type.
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref);
-+ obj = H5Rdereference(_iDatasetId,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ H5R_OBJECT, &Ref);
- readDouble_v1(obj, _iRows, _iCols, _pdblData);
- }
-
-@@ -498,14 +502,22 @@ int readDoubleComplexMatrix_v1(int _iDat
- }
-
- //Open the referenced object, get its name and type.
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[0]);
- status = readDouble_v1(obj, _iRows, _iCols, _pdblReal);
- if (status < 0)
- {
- return -1;
- }
-
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[1]);
- status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
- if (status < 0)
- {
-@@ -831,7 +843,11 @@ int readCommonPolyMatrix_v1(int _iDatase
- /*
- * Open the referenced object, get its name and type.
- */
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
-+ obj = H5Rdereference(_iDatasetId,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ H5R_OBJECT, &pData[i]);
- if (_iComplex)
- {
- status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -1066,7 +1082,11 @@ int readCommonSparseComplexMatrix_v1(int
- }
-
- //read Row data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[0]);
- status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
- if (status < 0)
- {
-@@ -1074,7 +1094,11 @@ int readCommonSparseComplexMatrix_v1(int
- }
-
- //read cols data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[1]);
- status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
- if (status < 0)
- {
-@@ -1082,7 +1106,11 @@ int readCommonSparseComplexMatrix_v1(int
- }
-
- //read sparse data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[2]);
-
- if (_iComplex)
- {
-@@ -1128,7 +1156,11 @@ int readBooleanSparseMatrix_v1(int _iDat
- }
-
- //read Row data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[0]);
- status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
- if (status < 0)
- {
-@@ -1136,7 +1168,11 @@ int readBooleanSparseMatrix_v1(int _iDat
- }
-
- //read cols data
-- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+ obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &pRef[1]);
- status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
- if (status < 0)
- {
-@@ -1235,7 +1271,11 @@ int getListItemDataset_v1(int _iDatasetI
- {
- hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
-
-- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
-+ *_piItemDataset = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ H5R_OBJECT, &poRef);
-
- if (*_piItemDataset == 0)
- {
-Index: scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp
-+++ scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
-@@ -39,7 +39,11 @@ const char ** H5ReferenceData::getRefere
- for (int i = 0; i < totalSize; i++)
- {
- void * ref = &(((void **)cdata)[i]);
-- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+ hid_t obj = H5Rdereference(file,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
- H5O_info_t info;
- H5Oget_info(obj, &info);
- H5Oclose(obj);
-@@ -81,7 +85,11 @@ H5Object & H5ReferenceData::getData(cons
-
- file = getFile().getH5Id();
- ref = &(((void **)cdata)[0]);
-- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+ obj = H5Rdereference(file,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
- if (obj < 0)
- {
- throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
-@@ -123,7 +131,11 @@ H5Object ** H5ReferenceData::getReferenc
- for (int i = 0; i < totalSize; i++)
- {
- void * ref = &(((void **)cdata)[i]);
-- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+ hid_t obj = H5Rdereference(file,
-+ #if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+ #endif
-+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
- objs[i] = &H5Object::getObject(getParent(), obj);
- }
-
-@@ -178,7 +190,11 @@ void H5ReferenceData::printData(std::ost
- char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
- void ** ref = &(((void **)cdata)[0]);
- hid_t file = getFile().getH5Id();
-- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+ hid_t obj = H5Rdereference(file,
-+#if H5_VERSION_GE(1,10,0)
-+ H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
- if (obj < 0)
- {
- os << "NULL";
\ No newline at end of file +--- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100 ++++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100 +@@ -42,7 +42,11 @@ + for (int i = 0; i < totalSize; i++) + { + void * ref = &(((void **)cdata)[i]); +- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); ++ hid_t obj = H5Rdereference(file, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + H5O_info_t info; + H5Oget_info(obj, &info); + H5Oclose(obj); +@@ -84,7 +88,11 @@ + + file = getFile().getH5Id(); + ref = &(((void **)cdata)[0]); +- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); ++ obj = H5Rdereference(file, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + if (obj < 0) + { + throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position.")); +@@ -126,7 +134,11 @@ + for (int i = 0; i < totalSize; i++) + { + void * ref = &(((void **)cdata)[i]); +- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); ++ hid_t obj = H5Rdereference(file, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + objs[i] = &H5Object::getObject(getParent(), obj); + } + +@@ -181,7 +193,11 @@ + char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize); + void ** ref = &(((void **)cdata)[0]); + hid_t file = getFile().getH5Id(); +- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); ++ hid_t obj = H5Rdereference(file, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + if (obj < 0) + { + os << "NULL"; +--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100 ++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100 +@@ -474,7 +474,11 @@ + } + + //Open the referenced object, get its name and type. +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref); ++ obj = H5Rdereference(_iDatasetId, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ H5R_OBJECT, &Ref); + readDouble_v1(obj, _iRows, _iCols, _pdblData); + } + +@@ -501,14 +505,22 @@ + } + + //Open the referenced object, get its name and type. +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[0]); + status = readDouble_v1(obj, _iRows, _iCols, _pdblReal); + if (status < 0) + { + return -1; + } + +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[1]); + status = readDouble_v1(obj, _iRows, _iCols, _pdblImg); + if (status < 0) + { +@@ -834,7 +846,11 @@ + /* + * Open the referenced object, get its name and type. + */ +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); ++ obj = H5Rdereference(_iDatasetId, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ H5R_OBJECT, &pData[i]); + if (_iComplex) + { + status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); +@@ -1069,7 +1085,11 @@ + } + + //read Row data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[0]); + status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); + if (status < 0) + { +@@ -1077,7 +1097,11 @@ + } + + //read cols data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[1]); + status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); + if (status < 0) + { +@@ -1085,7 +1109,11 @@ + } + + //read sparse data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[2]); + + if (_iComplex) + { +@@ -1131,7 +1159,11 @@ + } + + //read Row data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[0]); + status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); + if (status < 0) + { +@@ -1139,7 +1171,11 @@ + } + + //read cols data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[1]); + status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); + if (status < 0) + { +@@ -1234,7 +1270,11 @@ + { + hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; + +- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); ++ *_piItemDataset = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &poRef); + + if (*_piItemDataset == 0) + { +--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100 ++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100 +@@ -742,7 +742,11 @@ + /* + * Open the referenced object, get its name and type. + */ +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); ++ obj = H5Rdereference(_iDatasetId, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ H5R_OBJECT, &pData[i]); + if (_iComplex) + { + status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); +@@ -976,7 +980,11 @@ + } + + //read Row data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[0]); + status = readInteger32Matrix(obj, _piNbItemRow); + if (status < 0) + { +@@ -984,7 +992,11 @@ + } + + //read cols data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[1]); + status = readInteger32Matrix(obj, _piColPos); + if (status < 0) + { +@@ -992,7 +1004,11 @@ + } + + //read sparse data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[2]); + + if (_iComplex) + { +@@ -1043,7 +1059,11 @@ + } + + //read Row data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); ++ obj = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &pRef[0]); + status = readInteger32Matrix(obj, _piNbItemRow); + if (status < 0) + { +@@ -1053,7 +1073,11 @@ + if (_iNbItem != 0) + { + //read cols data +- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); ++ obj = H5Rdereference(_iDatasetId, ++ #if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++ #endif ++ H5R_OBJECT, &pRef[1]); + status = readInteger32Matrix(obj, _piColPos); + if (status < 0) + { +@@ -1154,7 +1178,11 @@ + { + hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; + +- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); ++ *_piItemDataset = H5Rdereference(_iDatasetId, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &poRef); + + if (*_piItemDataset == 0) + { +--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-14 12:40:34.000000000 +0100 ++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-15 20:11:46.775525827 +0100 +@@ -648,7 +648,11 @@ + //import field + for (int j = 0; j < refcount; ++j) + { +- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); ++ int data = H5Rdereference(refs, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &vrefs[j]); + if (data < 0) + { + freeStringMatrix(dfield, fields.data()); +--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-14 12:40:34.000000000 +0100 ++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-15 20:11:36.838833848 +0100 +@@ -735,7 +735,11 @@ + //import field + for (int j = 0; j < refcount; ++j) + { +- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); ++ int data = H5Rdereference(refs, ++#if H5_VERSION_GE(1,10,0) ++ H5P_DATASET_ACCESS_DEFAULT, ++#endif ++ H5R_OBJECT, &vrefs[j]); + if (data < 0) + { + return false; diff --git a/scilab-hdf5-type.patch b/scilab-hdf5-type.patch new file mode 100644 index 000000000000..d2210b95ef0a --- /dev/null +++ b/scilab-hdf5-type.patch @@ -0,0 +1,11 @@ +--- modules/hdf5/src/c/h5_writeDataToFile.c 2017-02-15 19:49:05.972121123 +0100 ++++ modules/hdf5/src/c/h5_writeDataToFile.c.new 2017-02-15 19:42:50.787848227 +0100 +@@ -2166,7 +2166,7 @@ + return dset; + } + +-hid_t writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) ++int writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) + { + hid_t space = 0; + hid_t dset = 0; diff --git a/scilab-jogl-2.3.2.patch b/scilab-jogl-2.3.2.patch new file mode 100644 index 000000000000..822656ba342e --- /dev/null +++ b/scilab-jogl-2.3.2.patch @@ -0,0 +1,556 @@ +commit db79126ed25fc254e83f8a96b164cb2dbf0d6204 +Author: Clément DAVID <clement.david@scilab-enterprises.com> +Date: Wed Dec 2 15:09:07 2015 +0100 + + Update to JoGL 2.3.2 + + Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df + +diff --git a/scilab/configure b/scilab/configure +index fd385a8..51e5ff2 100755 +--- a/scilab/configure ++++ b/scilab/configure +@@ -15265,7 +15265,7 @@ EOF + + CLASSPATH=$ac_java_classpath + export CLASSPATH +- cmd="$JAVA conftestSharedChecker jogl2 javax.media.opengl.glu.GLUnurbs $jar_resolved " ++ cmd="$JAVA conftestSharedChecker jogl2 jogamp.opengl.x11.glx.GLX $jar_resolved " + if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then + PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output); + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5 +@@ -15277,10 +15277,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + if test "" = "yes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5 +-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&5 ++$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&2;} + else +- as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" "$LINENO" 5 ++ as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" "$LINENO" 5 + fi + fi + if test -f conftestSharedChecker.java.output; then +@@ -15291,8 +15291,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used + + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (Specification-Version 2.2) of jogl2" >&5 +-$as_echo_n "checking minimal version (Specification-Version 2.2) of jogl2... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (Specification-Version 2.3) of jogl2" >&5 ++$as_echo_n "checking minimal version (Specification-Version 2.3) of jogl2... " >&6; } + export JARFILE=$JOGL2; + if test "x" == "x"; then + +@@ -15305,7 +15305,7 @@ import java.util.jar.JarFile; + + public class conftest { + public static void main(String[] argv) { +- String minVersion="2.2"; ++ String minVersion="2.3"; + try { + String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version"); + System.out.println(version); +@@ -15358,7 +15358,7 @@ EOF + STDOUT=`cat conftest.java.output` + fi + echo "configure: CLASSPATH was $CLASSPATH" >&5 +- as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5 ++ as_fn_error $? "Wrong version of jogl2. Expected at least 2.3. Found $STDOUT" "$LINENO" 5 + fi + fi + if test -f conftest.java.output; then +@@ -15368,7 +15368,7 @@ EOF + echo "configure: failed program was:" >&5 + cat conftest.java >&5 + echo "configure: CLASSPATH was $CLASSPATH" >&5 +- as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5 ++ as_fn_error $? "Wrong version of jogl2. Expected at least 2.3. Found $STDOUT" "$LINENO" 5 + fi + + else +@@ -15382,7 +15382,7 @@ import java.util.jar.JarFile; + + public class conftest { + public static void main(String[] argv) { +- String minVersion="2.2"; ++ String minVersion="2.3"; + try { + String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version"); + System.out.println("Specification-Version" + ": " + version); +@@ -15752,7 +15752,7 @@ EOF + + CLASSPATH=$ac_java_classpath + export CLASSPATH +- cmd="$JAVA conftestSharedChecker gluegen2-rt jogamp.common.os.MachineDescriptionRuntime $jar_resolved " ++ cmd="$JAVA conftestSharedChecker gluegen2-rt com.jogamp.common.os.Platform $jar_resolved " + if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then + PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output); + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5 +@@ -15764,10 +15764,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + if test "" = "yes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&5 +-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&5 ++$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&2;} + else +- as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" "$LINENO" 5 ++ as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" "$LINENO" 5 + fi + fi + if test -f conftestSharedChecker.java.output; then +diff --git a/scilab/configure.ac b/scilab/configure.ac +index 6404101..0a80deb 100644 +--- a/scilab/configure.ac ++++ b/scilab/configure.ac +@@ -940,11 +940,11 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no + AC_SUBST(SKINLF) + + # JOGL 2 +- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) ++ AC_JAVA_CHECK_JAR([jogl2],[jogamp.opengl.x11.glx.GLX],[Scilab 3D rendering - Version 2.3]) + JOGL2=$PACKAGE_JAR_FILE + AC_SUBST(JOGL2) + +- AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.2],[Specification-Version]) ++ AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.3],[Specification-Version]) + + if test "$MACOSX" = 1; then + echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" +@@ -971,7 +971,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version + fi + + # JoGL Native <=> Java connector +- AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering]) ++ AC_JAVA_CHECK_JAR([gluegen2-rt],[com.jogamp.common.os.Platform],[Scilab 3D rendering]) + GLUEGEN2_RT=$PACKAGE_JAR_FILE + AC_SUBST(GLUEGEN2_RT) + +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +index 18593ca..892843a 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +@@ -87,10 +87,10 @@ import java.util.Map; + import java.util.Set; + import java.util.UUID; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; + import javax.swing.JComponent; + import javax.swing.JSeparator; + import javax.swing.SwingUtilities; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +index 112a904..d1a2438 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +@@ -23,7 +23,7 @@ import java.awt.Cursor; + import java.awt.Font; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.canvas.Canvas; + import org.scilab.modules.gui.canvas.ScilabCanvas; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +index 477fa3f..9e969b4 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +@@ -35,8 +35,8 @@ import java.awt.event.MouseListener; + import java.awt.event.MouseMotionListener; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLAutoDrawable; + import javax.swing.JPanel; + + import org.scilab.forge.scirenderer.Canvas; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +index 76e976a..31bc493 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +@@ -22,12 +22,12 @@ import java.awt.HeadlessException; + import java.util.Calendar; + import java.util.StringTokenizer; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; ++import com.jogamp.opengl.awt.GLJPanel; + + import org.scilab.modules.action_binding.InterpreterManagement; + import org.scilab.modules.commons.OS; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +index 03e7b5b..c84b257 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.dockable.Dockable; + +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +index 6fb2ef9..ce0f1a9 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +@@ -19,7 +19,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.ScilabBridge; + import org.scilab.modules.gui.dockable.ScilabDockable; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +index 2d7e304..56c4ee4 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; + import org.scilab.modules.gui.utils.Position; +diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +index 307486a..91a40b0 100644 +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +@@ -18,7 +18,7 @@ package org.scilab.modules.gui.canvas; + import org.scilab.modules.gui.utils.Position; + import org.scilab.modules.gui.utils.Size; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.awt.image.BufferedImage; + + /** +diff --git a/scilab/modules/scirenderer/scirenderer-libs.properties b/scilab/modules/scirenderer/scirenderer-libs.properties +index 4d1636d..0ea2197 100644 +--- a/scilab/modules/scirenderer/scirenderer-libs.properties ++++ b/scilab/modules/scirenderer/scirenderer-libs.properties +@@ -1,7 +1,7 @@ + ; Define all libs needed by scirenderer + + ; Uncomment this line and declare path to jogl2.jar gluegen2-rt.jar jlatexmath.jar and native libraries +-jogl2.jar = /usr/share/java/jogl2.jar +-gluegen2.jar = /usr/share/java/gluegen2-rt.jar ++jogl2.jar = /usr/lib/java/jogl2.jar ++gluegen2.jar = /usr/lib/java/gluegen2-rt.jar + jlatexmath.jar = /usr/share/java/jlatexmath.jar + jni.path = /usr/lib/jni +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +index 011f09a..590ebf6 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +@@ -19,16 +19,16 @@ import java.awt.image.BufferedImage; + import java.lang.reflect.InvocationTargetException; + import java.util.concurrent.Semaphore; + +-import javax.media.opengl.DebugGL2; +-import javax.media.opengl.GL2; +-import javax.media.opengl.GLAutoDrawable; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLContext; +-import javax.media.opengl.GLDrawableFactory; +-import javax.media.opengl.GLEventListener; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLOffscreenAutoDrawable; +-import javax.media.opengl.GLProfile; ++import com.jogamp.opengl.DebugGL2; ++import com.jogamp.opengl.GL2; ++import com.jogamp.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLContext; ++import com.jogamp.opengl.GLDrawableFactory; ++import com.jogamp.opengl.GLEventListener; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLOffscreenAutoDrawable; ++import com.jogamp.opengl.GLProfile; + import javax.swing.SwingUtilities; + + import org.scilab.forge.scirenderer.Canvas; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +index 4fec356..6de9267 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; + + import org.scilab.forge.scirenderer.Canvas; + +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GLAutoDrawable; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +index 4597be3..4ed3220 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +@@ -14,7 +14,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * This class store current OpenGl context capacity. +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +index 6a78491..ced3389 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +@@ -33,7 +33,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerImpl; + import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; + import org.scilab.forge.scirenderer.tranformations.Vector3d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +index 429e1a3..c26d5a2 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +@@ -14,8 +14,8 @@ + + package org.scilab.forge.scirenderer.implementation.jogl; + +-import javax.media.opengl.GL; +-import javax.media.opengl.glu.GLU; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.glu.GLU; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +index d5f1f06..99e6854 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer; + import org.scilab.forge.scirenderer.buffers.ElementsBuffer; + import org.scilab.forge.scirenderer.buffers.IndicesBuffer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.util.Collection; + import java.util.HashSet; + import java.util.Set; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +index 25d3a3e..b56c9d7 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers; + + import org.scilab.forge.scirenderer.buffers.DataBuffer; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.nio.Buffer; + + /** +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +index d5d53e3..2d96bec 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers; + + import org.scilab.forge.scirenderer.buffers.ElementsBuffer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.nio.Buffer; + import java.nio.FloatBuffer; + +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +index 2a14656..f7f019f 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers; + + import org.scilab.forge.scirenderer.buffers.IndicesBuffer; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.nio.Buffer; + import java.nio.IntBuffer; + import java.util.Collection; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +index 22d28b2..57885f0 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingManager; + import org.scilab.forge.scirenderer.clipping.ClippingPlane; + import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +index cf3ed8b..a5a5770 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tranformations.Transformation; + import org.scilab.forge.scirenderer.tranformations.TransformationFactory; + import org.scilab.forge.scirenderer.tranformations.Vector4d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +index 5008513..786fe41 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +@@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.texture.Texture; + import org.scilab.forge.scirenderer.lightning.LightManager; + import org.scilab.forge.scirenderer.shapes.appearance.Material; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.nio.FloatBuffer; + import java.nio.IntBuffer; + +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +index f06809e..9e89b7c 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +@@ -14,7 +14,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl.lightning; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; + import org.scilab.forge.scirenderer.lightning.Light; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +index 0c8ae45..42d1e32 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.lightning.Light; + import org.scilab.forge.scirenderer.lightning.LightManager; + import org.scilab.forge.scirenderer.shapes.appearance.Material; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * JoGL implementation of {@link LightManager} +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +index 898d1ec..f74bcda 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +@@ -14,7 +14,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl.picking; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +index f9fe5a8..9ac3537 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + import org.scilab.forge.scirenderer.picking.PickingTools; + import org.scilab.forge.scirenderer.tranformations.Vector3d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.awt.Point; + import java.nio.FloatBuffer; + +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +index 3f4b47d..9f9f856 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Drawer; + import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + import org.scilab.forge.scirenderer.renderer.Renderer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +index 4b4dd17..440750f 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + import org.scilab.forge.scirenderer.renderer.Renderer; + import org.scilab.forge.scirenderer.renderer.RendererManager; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.util.HashSet; + import java.util.Set; + import java.util.Stack; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +index ba3eb4f..14649cc 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +@@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManager; + import org.scilab.forge.scirenderer.tranformations.Vector3d; + + +-import javax.media.opengl.GL; +-import javax.media.opengl.GL2; +-import javax.media.opengl.GL2ES1; +-import javax.media.opengl.GL2GL3; +-import javax.media.opengl.GLProfile; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GL2; ++import com.jogamp.opengl.GL2ES1; ++import com.jogamp.opengl.GL2GL3; ++import com.jogamp.opengl.GLProfile; + import java.awt.Dimension; + import java.nio.ByteBuffer; + import java.nio.FloatBuffer; +diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +index 1d799e9..8a493fb 100644 +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +@@ -17,7 +17,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.utils; + import org.scilab.forge.scirenderer.shapes.appearance.Appearance; + import org.scilab.forge.scirenderer.shapes.appearance.Color; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * diff --git a/scilab-lucene-6.patch b/scilab-lucene-6.patch new file mode 100644 index 000000000000..7054a6876c91 --- /dev/null +++ b/scilab-lucene-6.patch @@ -0,0 +1,11 @@ +--- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java 2017-02-15 19:48:09.065311738 +0100 ++++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java.new 2017-02-15 19:43:03.057878902 +0100 +@@ -52,7 +52,7 @@ + */ + public List<Document> search(String str) { + List<Document> found = new ArrayList<>(); +- try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) { ++ try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true, true)) { + IndexSearcher searcher = new IndexSearcher(reader); + + StandardQueryParser queryParserHelper = new StandardQueryParser(); diff --git a/scilab-strict-jar.patch b/scilab-strict-jar.patch new file mode 100644 index 000000000000..805dd8d4ee49 --- /dev/null +++ b/scilab-strict-jar.patch @@ -0,0 +1,29 @@ +--- configure.old 2016-04-24 14:32:13.301199078 +0200 ++++ configure 2016-04-24 14:34:47.821731712 +0200 +@@ -17159,7 +17159,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' -or -name 'fop*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -19139,7 +19139,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' -or -name 'xmlgraphics-commons*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -20019,7 +20019,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' -or -name 'commons-logging*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + |