[libjogl2-java] 01/02: fix-mesa-detection.diff: Fix detecting Mesa 17.2 ->. (Closes: #880924) (LP: #1742894)

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository libjogl2-java.

commit 0bf9b073c0ea2b70f3bc2f28e88d982bd4449240
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 12 21:29:14 2018 +0200

    fix-mesa-detection.diff: Fix detecting Mesa 17.2 ->. (Closes: #880924) (LP: #1742894)
---
 debian/changelog                       |  8 ++++++++
 debian/patches/fix-mesa-detection.diff | 15 +++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06a0663..9016e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libjogl2-java (2.3.2+dfsg-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * fix-mesa-detection.diff: Fix detecting Mesa 17.2 ->. (Closes:
+    #880924) (LP: #1742894)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 12 Jan 2018 21:23:23 +0200
+
 libjogl2-java (2.3.2+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-mesa-detection.diff b/debian/patches/fix-mesa-detection.diff
new file mode 100644
index 0000000..6941d79
--- /dev/null
+++ b/debian/patches/fix-mesa-detection.diff
@@ -0,0 +1,15 @@
+Description: Mesa 17.2.x dropped "Gallium" from the renderer string, so look for "Mesa" in the version string
+
+https://jogamp.org/bugzilla/show_bug.cgi?id=1357
+
+--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
++++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+@@ -2113,7 +2113,7 @@ public abstract class GLContextImpl exte
+     final boolean isES = 0 != ( ctp & GLContext.CTX_PROFILE_ES );
+     final boolean isX11 = NativeWindowFactory.TYPE_X11 == NativeWindowFactory.getNativeWindowType(true);
+     final boolean isWindows = Platform.getOSType() == Platform.OSType.WINDOWS;
+-    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ");
++    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ") || glVersion.contains(MesaSP);
+ 
+     final boolean isDriverATICatalyst;
+     final boolean isDriverNVIDIAGeForce;
diff --git a/debian/patches/series b/debian/patches/series
index 6d5322a..ea004a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ alpha.diff
 add-ports.diff
 clang_FTBFS.patch
 disable-test-compilation.patch
+fix-mesa-detection.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git