From 92497251d85a7e7cf39230a014955dbbda0a49ea Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 21 Nov 2019 09:32:57 +0100
Subject: Bug 1156: EGL-GBM: Fix Cleanup (Newt package relocation / hack
 default GBM)

Now: TYPE_EGL_GBM == ".egl.gbm"
---
 .../com/jogamp/nativewindow/NativeWindowFactory.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/nativewindow/classes/com')

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
index df1feefc7..23250db25 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
@@ -87,7 +87,7 @@ public abstract class NativeWindowFactory {
     public static final String TYPE_WAYLAND = ".wayland";
 
     /** GBM/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/
-    public static final String TYPE_GBM = ".gbm";
+    public static final String TYPE_EGL_GBM = ".egl.gbm";
 
     /** OpenKODE/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/
     public static final String TYPE_EGL = ".egl";
@@ -167,24 +167,24 @@ public abstract class NativeWindowFactory {
             case HPUX:
             default:
               if( BcmVCArtifacts.guessVCIVUsed() ) {
-                return TYPE_BCM_VC_IV;
+                  return TYPE_BCM_VC_IV;
               }
-              if(guessX()){
-                    return TYPE_X11;
+              if( guessX() ) {
+                  return TYPE_X11;
               }
-              if(guessWayland()){
+              if( guessWayland() ) {
                   //TODO
                   return TYPE_WAYLAND;
               }
-              if(guessGBM()){
-                return TYPE_GBM;
+              if( true || guessGBM() ) { // FIXME
+                  return TYPE_EGL_GBM;
               }
               return TYPE_X11;
         }
     }
 
     private static boolean guessX() {
-        return System.getProperty("DISPLAY") !=null;
+        return System.getProperty("DISPLAY") != null;
     }
 
     private static boolean guessWayland() {
-- 
cgit v1.2.3