Description: adapt to libjogl2-java 2.3.2 API

 New path for javax.media.opengl: com.jogamp.opengl.

Author: Gilles Filippini <pini@debian.org>

Forwarded: http://bugzilla.scilab.org/show_bug.cgi?id=13809

--- scilab.orig/scilab/configure.ac

+++ scilab/scilab/configure.ac

@@ -952,7 +952,7 @@

                 AC_SUBST(SKINLF)

                 # JOGL 2

-                AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2])

+                AC_JAVA_CHECK_JAR([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2])

                 JOGL2=$PACKAGE_JAR_FILE

                 AC_SUBST(JOGL2)

@@ -981,7 +981,7 @@

                 fi

                 # JoGL Native <=> Java connector

-                AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering])

+                AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDataInfoRuntime],[Scilab 3D rendering])

                 GLUEGEN2_RT=$PACKAGE_JAR_FILE

                 AC_SUBST(GLUEGEN2_RT)

--- scilab.orig/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java

+++ scilab/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java

@@ -13,8 +13,8 @@

 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.*;

--- scilab.orig/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java

+++ scilab/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java

@@ -18,7 +18,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java

@@ -20,17 +20,17 @@

 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.awt.GLJPanel;

-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.awt.GLJPanel;

+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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java

@@ -16,7 +16,7 @@

 import org.scilab.forge.scirenderer.Canvas;

-import javax.media.opengl.GLAutoDrawable;

+import com.jogamp.opengl.GLAutoDrawable;

 /**

  * @author Pierre Lando

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java

+++ scilab/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.

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java

@@ -34,7 +34,7 @@

 import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener;

 import org.scilab.forge.scirenderer.tranformations.Vector3d;

-import javax.media.opengl.GL2;

+import com.jogamp.opengl.GL2;

 /**

  *

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java

+++ scilab/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

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java

@@ -19,7 +19,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java

@@ -16,7 +16,7 @@

 import org.scilab.forge.scirenderer.buffers.DataBuffer;

-import javax.media.opengl.GL;

+import com.jogamp.opengl.GL;

 import java.nio.Buffer;

 /**

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java

@@ -16,7 +16,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java

@@ -16,7 +16,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java

@@ -18,7 +18,7 @@

 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

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java

@@ -20,7 +20,7 @@

 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

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java

@@ -26,7 +26,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java

+++ scilab/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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java

@@ -20,7 +20,7 @@

 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}

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java

+++ scilab/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

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java

@@ -19,7 +19,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java

@@ -18,7 +18,7 @@

 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

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java

@@ -18,7 +18,7 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java

@@ -32,11 +32,11 @@

 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;

--- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java

+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java

@@ -17,7 +17,7 @@

 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;

 /**

  *

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java

@@ -88,10 +88,10 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java

@@ -23,7 +23,7 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java

@@ -35,8 +35,8 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java

@@ -22,12 +22,12 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java

@@ -17,7 +17,7 @@

 import java.awt.image.BufferedImage;

-import javax.media.opengl.GL;

+import com.jogamp.opengl.GL;

 import org.scilab.modules.gui.dockable.Dockable;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java

@@ -19,7 +19,7 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java

@@ -17,7 +17,7 @@

 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;

--- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java

+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java

@@ -18,7 +18,7 @@

 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;

 /**