[scilab] 02/16: Import Debian changes 5.5.1-3
Julien Puydt
julien.puydt at laposte.net
Wed Nov 15 16:00:20 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 074fa732554536ac302089cb190c3609d39f499a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Thu Nov 6 10:54:21 2014 +0100
Import Debian changes 5.5.1-3
scilab (5.5.1-3) unstable; urgency=medium
* Fix FTBFS with Jogl 2.2 (Closes: #765118)
scilab (5.5.1-2) unstable; urgency=medium
* Fix a typo in the patch m4-java-ppc64el.patch
---
debian/changelog | 12 +++++
debian/patches/jogl-2.2.diff | 89 ++++++++++++++++++++++++++++++++++++
debian/patches/m4-java-ppc64el.patch | 18 ++++++++
debian/patches/series | 1 +
4 files changed, 120 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 16c9499..3039a75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+scilab (5.5.1-3) unstable; urgency=medium
+
+ * Fix FTBFS with Jogl 2.2 (Closes: #765118)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 06 Nov 2014 10:54:21 +0100
+
+scilab (5.5.1-2) unstable; urgency=medium
+
+ * Fix a typo in the patch m4-java-ppc64el.patch
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 07 Oct 2014 10:29:47 +0200
+
scilab (5.5.1-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/patches/jogl-2.2.diff b/debian/patches/jogl-2.2.diff
new file mode 100644
index 0000000..dd62fde
--- /dev/null
+++ b/debian/patches/jogl-2.2.diff
@@ -0,0 +1,89 @@
+--- scilab.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
++++ scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+@@ -19,12 +19,14 @@ import org.scilab.forge.scirenderer.implementation.jogl.renderer.JoGLRendererMan
+ import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
+ import org.scilab.forge.scirenderer.picking.PickingManager;
+
++import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
+ import com.jogamp.opengl.util.awt.ImageUtil;
+-import com.jogamp.opengl.util.awt.Screenshot;
++
+ import java.awt.Dimension;
+ 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;
+@@ -33,7 +35,7 @@ import javax.media.opengl.GLContext;
+ import javax.media.opengl.GLDrawableFactory;
+ import javax.media.opengl.GLEventListener;
+ import javax.media.opengl.GLException;
+-import javax.media.opengl.GLPbuffer;
++import javax.media.opengl.GLOffscreenAutoDrawable;
+ import javax.media.opengl.GLProfile;
+ import javax.swing.SwingUtilities;
+
+@@ -154,17 +156,17 @@ public final class JoGLCanvas implements Canvas, GLEventListener {
+
+ @Override
+ public int getWidth() {
+- return autoDrawable.getWidth();
++ return autoDrawable.getSurfaceWidth();
+ }
+
+ @Override
+ public int getHeight() {
+- return autoDrawable.getHeight();
++ return autoDrawable.getSurfaceHeight();
+ }
+
+ @Override
+ public Dimension getDimension() {
+- return new Dimension(autoDrawable.getWidth(), autoDrawable.getHeight());
++ return new Dimension(autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight());
+ }
+
+ @Override
+@@ -244,14 +246,16 @@ public final class JoGLCanvas implements Canvas, GLEventListener {
+
+ if (SwingUtilities.isEventDispatchThread()) {
+ context.makeCurrent();
+- image[0] = Screenshot.readToBufferedImage(autoDrawable.getWidth(), autoDrawable.getHeight());
++ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), true);
++ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), false);
+ context.release();
+ } else {
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ context.makeCurrent();
+- image[0] = Screenshot.readToBufferedImage(autoDrawable.getWidth(), autoDrawable.getHeight());
++ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), true);
++ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), false);
+ context.release();
+ }
+ });
+@@ -271,7 +275,7 @@ public final class JoGLCanvas implements Canvas, GLEventListener {
+ */
+ public void destroy() {
+ if (isOffscreen) {
+- ((GLPbuffer) autoDrawable).destroy();
++ ((GLOffscreenAutoDrawable) autoDrawable).destroy();
+ }
+ try {
+ isValid = false;
+@@ -289,9 +293,11 @@ public final class JoGLCanvas implements Canvas, GLEventListener {
+ */
+ private static GLAutoDrawable getOffscreenDrawable(int width, int height) {
+ GLDrawableFactory factory = GLDrawableFactory.getDesktopFactory();
++
+ GLCapabilities capabilities = new GLCapabilities(GLProfile.getDefault());
++ capabilities.setPBuffer(true);
+
+- return factory.createGLPbuffer(null, capabilities, null, width, height, null);
++ return factory.createOffscreenAutoDrawable(null, capabilities, null, width, height);
+ }
+
+ // Implementation of function from GLEventListener.
diff --git a/debian/patches/m4-java-ppc64el.patch b/debian/patches/m4-java-ppc64el.patch
index 158bd5d..f90f86f 100644
--- a/debian/patches/m4-java-ppc64el.patch
+++ b/debian/patches/m4-java-ppc64el.patch
@@ -14,3 +14,21 @@
armv*)
machine=arm
;;
+diff --git a/scilab/bin/scilab b/scilab/bin/scilab
+index 863cb3c..3331931 100755
+--- scilab-5.5.0.orig/bin/scilab
++++ scilab-5.5.0/scilab/bin/scilab
+@@ -525,9 +525,12 @@ detect_java_vm() {
+ proc="mips"
+ fi
+ ;;
+- "ppc"|"powerpc"|"ppc64")
++ "ppc"|"powerpc")
+ proc="ppc"
+ ;;
++ "ppc64"|"ppc64el")
++ proc="ppc64"
++ ;;
+ "s390")
+ proc="s390"
+ ;;
diff --git a/debian/patches/series b/debian/patches/series
index c36b0dd..79b5b19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ missing-lib.diff
m4-hdf5.patch
m4-java-ppc64el.patch
remove-exit.diff
+jogl-2.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