[scilab] 10/16: Import Debian changes 5.5.2-2
Julien Puydt
julien.puydt at laposte.net
Wed Nov 15 16:00:22 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 c051ab9ce5e54328c2b6d30d6886089550fb3adf
Author: Gilles Filippini <pini at debian.org>
Date: Fri Oct 30 00:26:29 2015 +0100
Import Debian changes 5.5.2-2
scilab (5.5.2-2) unstable; urgency=medium
* Team upload.
* Build against gluegen2 and libjogl2-java 2.3.2 (closes: #791990,
#798652):
- New patch libjogl2-java-2.3.2.diff to adapt to jogamp 2.3.2
- Bump the versioned build-depends and depends on libjogl2-java
>= 2.3.2
- Complete patch jvm-archdir-ppc64le.diff to fix bin/scilab.
* Refresh patch aarch64-detection.patch.
---
debian/changelog | 13 +
debian/control | 4 +-
debian/patches/aarch64-detection.patch | 4 +-
debian/patches/jvm-archdir-ppc64le.diff | 32 ++-
debian/patches/libjogl2-java-2.3.2.diff | 467 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 509 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5f9d7bc..275792c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+scilab (5.5.2-2) unstable; urgency=medium
+
+ * Team upload.
+ * Build against gluegen2 and libjogl2-java 2.3.2 (closes: #791990,
+ #798652):
+ - New patch libjogl2-java-2.3.2.diff to adapt to jogamp 2.3.2
+ - Bump the versioned build-depends and depends on libjogl2-java
+ >= 2.3.2
+ - Complete patch jvm-archdir-ppc64le.diff to fix bin/scilab.
+ * Refresh patch aarch64-detection.patch.
+
+ -- Gilles Filippini <pini at debian.org> Fri, 30 Oct 2015 00:26:29 +0100
+
scilab (5.5.2-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index c6ae183..203244a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev,
libarpack2-dev (>= 3.0),
# Java deps
- libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.2.4), libgl1-mesa-dev,
+ libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.3.2), libgl1-mesa-dev,
libjrosetta-java (>= 1.0.1), ant, libjgoodies-looks-java,
libskinlf-java,
# graphic
@@ -154,7 +154,7 @@ Description: Scientific software package for numerical computations (minimal bin
Package: scilab-full-bin
Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
- libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.0-rc8), libjrosetta-java (>= 1.0.1),
+ libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.3.2), libjrosetta-java (>= 1.0.1),
libjlatexmath-java (>= 1.0.2), libjlatexmath-fop-java (>= 1.0.2),
libjeuclid-core-java, libbatik-java (>= 1.7), default-jre, bwidget,
fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
diff --git a/debian/patches/aarch64-detection.patch b/debian/patches/aarch64-detection.patch
index 316691c..696a29e 100644
--- a/debian/patches/aarch64-detection.patch
+++ b/debian/patches/aarch64-detection.patch
@@ -1,9 +1,11 @@
Description: Fix Aarch64 detection
Author: Martin Michlmayr <tbm at cyrius.com>
+Index: scilab-5.5.2/bin/scilab
+===================================================================
--- scilab-5.5.2.orig/bin/scilab
+++ scilab-5.5.2/bin/scilab
-@@ -540,6 +540,9 @@ detect_java_vm() {
+@@ -543,6 +543,9 @@ detect_java_vm() {
armv*)
proc="arm"
;;
diff --git a/debian/patches/jvm-archdir-ppc64le.diff b/debian/patches/jvm-archdir-ppc64le.diff
index d7fab9f..55fb83a 100644
--- a/debian/patches/jvm-archdir-ppc64le.diff
+++ b/debian/patches/jvm-archdir-ppc64le.diff
@@ -1,20 +1,34 @@
-Index: b/m4/java.m4
+Index: scilab-5.5.2/m4/java.m4
===================================================================
---- a/m4/java.m4
-+++ b/m4/java.m4
-@@ -481,7 +481,14 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+--- scilab-5.5.2.orig/m4/java.m4
++++ scilab-5.5.2/m4/java.m4
+@@ -481,7 +481,10 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
powerpc)
machine=ppc
;;
- ppc64|ppc64le)
+ ppc64le)
-+ if test -d $ac_java_jvm_dir/jre/lib/ppc64le/server; then
-+ machine=ppc64le
-+ else
-+ machine=ppc64le
-+ fi
++ machine=ppc64le
+ ;;
+ ppc64)
machine=ppc64
;;
armv*)
+Index: scilab-5.5.2/bin/scilab
+===================================================================
+--- scilab-5.5.2.orig/bin/scilab
++++ scilab-5.5.2/bin/scilab
+@@ -528,9 +528,12 @@ detect_java_vm() {
+ "ppc"|"powerpc")
+ proc="ppc"
+ ;;
+- "ppc64"|"ppc64el")
++ "ppc64")
+ proc="ppc64"
+ ;;
++ "ppc64le")
++ proc="ppc64le"
++ ;;
+ "s390")
+ proc="s390"
+ ;;
diff --git a/debian/patches/libjogl2-java-2.3.2.diff b/debian/patches/libjogl2-java-2.3.2.diff
new file mode 100644
index 0000000..ae496cb
--- /dev/null
+++ b/debian/patches/libjogl2-java-2.3.2.diff
@@ -0,0 +1,467 @@
+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_
+ 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.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)
+
diff --git a/debian/patches/series b/debian/patches/series
index b53e2ce..f653c21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ fop-2.0.diff
batik-1.8.diff
jvm-archdir-ppc64le.diff
aarch64-detection.patch
+libjogl2-java-2.3.2.diff
--
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