[scilab] 16/29: Refresh patch for the jogl2 api
Julien Puydt
julien.puydt at laposte.net
Wed Nov 22 17:19:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository scilab.
commit 8e9f1c2612ad63642207afaac26d2934efd5136c
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Nov 15 20:38:15 2017 +0100
Refresh patch for the jogl2 api
---
debian/changelog | 1 +
debian/patches/libjogl2-java-2.3.2.diff | 276 ++++++++++++--------------------
2 files changed, 107 insertions(+), 170 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 151822e..f91ac32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
- Drop patch to adapt the fop api to 2.0 : we have 2.2.
- Drop patch to adapt the batik api to 1.8 : we have 1.9.
- Refresh patch to add the ppc64el arch.
+ - Refresh patch for the jogl2 api.
-- Julien Puydt <julien.puydt at laposte.net> Tue, 14 Nov 2017 16:46:25 +0100
diff --git a/debian/patches/libjogl2-java-2.3.2.diff b/debian/patches/libjogl2-java-2.3.2.diff
index ae496cb..98c4c16 100644
--- a/debian/patches/libjogl2-java-2.3.2.diff
+++ b/debian/patches/libjogl2-java-2.3.2.diff
@@ -1,24 +1,31 @@
Description: adapt to libjogl2-java 2.3.2 API
New path for javax.media.opengl: com.jogamp.opengl.
Author: Gilles Filippini <pini at debian.org>
-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_
+Forwarded: no
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -940,7 +940,7 @@
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])
+- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0])
++ AC_JAVA_CHECK_JAR([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;
+@@ -971,7 +971,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)
+
+--- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+@@ -87,10 +87,10 @@
import java.util.Set;
import java.util.UUID;
@@ -33,11 +40,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+@@ -23,7 +23,7 @@
import java.awt.Font;
import java.awt.image.BufferedImage;
@@ -46,11 +51,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBri
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
++++ b/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;
@@ -61,11 +64,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/Sw
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+@@ -22,12 +22,12 @@
import java.util.Calendar;
import java.util.StringTokenizer;
@@ -84,11 +85,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/Sw
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+@@ -17,7 +17,7 @@
import java.awt.image.BufferedImage;
@@ -97,11 +96,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.ja
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+@@ -19,7 +19,7 @@
import java.awt.image.BufferedImage;
@@ -110,11 +107,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCan
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
++++ b/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+@@ -17,7 +17,7 @@
import java.awt.image.BufferedImage;
@@ -123,11 +118,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCan
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;
+--- a/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
++++ b/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;
@@ -136,11 +129,9 @@ Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCan
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
+--- a/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
++++ b/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;
@@ -151,11 +142,9 @@ Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/ex
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;
+--- a/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
++++ b/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;
@@ -164,11 +153,9 @@ Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/ex
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;
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+@@ -19,16 +19,16 @@
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.Semaphore;
@@ -195,11 +182,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+@@ -16,7 +16,7 @@
import org.scilab.forge.scirenderer.Canvas;
@@ -208,11 +193,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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 @@
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -221,11 +204,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* 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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
++++ b/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;
@@ -234,11 +215,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
*
-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 @@
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+@@ -14,8 +14,8 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -249,11 +228,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
++++ b/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;
@@ -262,11 +239,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+@@ -16,7 +16,7 @@
import org.scilab.forge.scirenderer.buffers.DataBuffer;
@@ -275,11 +250,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+@@ -16,7 +16,7 @@
import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
@@ -288,11 +261,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+@@ -16,7 +16,7 @@
import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
@@ -301,11 +272,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
++++ b/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;
@@ -314,11 +283,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
++++ b/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;
@@ -327,11 +294,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
++++ b/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;
@@ -340,11 +305,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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 @@
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.lightning;
@@ -353,11 +316,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
++++ b/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;
@@ -366,11 +327,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* 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 @@
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.picking;
@@ -379,11 +338,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
++++ b/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;
@@ -392,11 +349,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
++++ b/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;
@@ -405,11 +360,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
++++ b/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;
@@ -418,11 +371,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
++++ b/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+@@ -32,11 +32,11 @@
import org.scilab.forge.scirenderer.tranformations.Vector3d;
@@ -439,11 +390,9 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
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
+--- a/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
++++ b/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;
@@ -452,16 +401,3 @@ Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
*
-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)
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git
More information about the debian-science-commits
mailing list