Enable EGL/ES1/ES2 detection/test on desktop (using mesa's libraries)

Ubuntu:
 sudo apt-get install mesa-utils-extra libegl1-mesa libegl1-mesa-drivers libgles1-mesa libgles2-mesa

4 files changed, 16 insertions, 8 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
index 22d39fdae..6fd3ecf1c 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
@@ -63,11 +63,13 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle
 
     protected List/*<String>*/ getEGLLibNamesList() {
         List/*<String>*/ eglLibNames = new ArrayList();
-        // EGL
+        // try default generic names first 
         eglLibNames.add("EGL");
         // for windows distributions using the 'unlike' lib prefix, 
         // where our tool does not add it.
         eglLibNames.add("libEGL");
+        // this is the default EGL lib name, according to the spec 
+        eglLibNames.add("libEGL.so.1");
         return eglLibNames;
     }
 }
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
index 221a64ced..13da8d3d4 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
@@ -47,6 +47,7 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         List/*<List>*/ libNames = new ArrayList();
 
         List/*<String>*/ glesLibNames = new ArrayList();
+        // try default generic names first 
         glesLibNames.add("GLES_CM");
         glesLibNames.add("GLES_CL");
         glesLibNames.add("GLESv1_CM");
@@ -55,6 +56,8 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         glesLibNames.add("libGLES_CM");
         glesLibNames.add("libGLES_CL");
         glesLibNames.add("libGLESv1_CM");
+        // this is the default lib name, according to the spec 
+        glesLibNames.add("libGLESv1_CM.so.1");
 
         libNames.add(glesLibNames);
         libNames.add(getEGLLibNamesList());
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index 5a9815fdd..361f0148e 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -47,6 +47,7 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         List/*<List>*/ libNames = new ArrayList();
 
         List/*<String>*/ glesLibNames = new ArrayList();
+        // try default generic names first 
         glesLibNames.add("GLES20");
         glesLibNames.add("GLESv2");
         glesLibNames.add("GLESv2_CM");
@@ -55,7 +56,9 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         glesLibNames.add("libGLES20"); 
         glesLibNames.add("libGLESv2");
         glesLibNames.add("libGLESv2_CM");
-
+        // this is the default lib name, according to the spec 
+        glesLibNames.add("libGLESv2.so.2");
+        
         libNames.add(glesLibNames);
         libNames.add(getEGLLibNamesList());
         return libNames;
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
index 51b6144c5..60e163c46 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
@@ -39,7 +39,7 @@ public class X11GLXDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundl
     public List getToolLibNames() {
         List/*<List>*/ libNamesList = new ArrayList();
 
-        List/*<String>*/ glesLibNames = new ArrayList();
+        List/*<String>*/ glLibNames = new ArrayList();
 
         // Be aware that on DRI systems, eg ATI fglrx, etc, 
         // you have to set LIBGL_DRIVERS_PATH env variable.
@@ -47,16 +47,16 @@ public class X11GLXDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundl
         //    export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri
         //
 
-        // this is the default GL lib name, according to the spec
-        glesLibNames.add("libGL.so.1");
+        // this is the default lib name, according to the spec
+        glLibNames.add("libGL.so.1");
 
         // try this one as well, if spec fails
-        glesLibNames.add("libGL.so");
+        glLibNames.add("libGL.so");
 
         // last but not least .. the generic one
-        glesLibNames.add("GL");
+        glLibNames.add("GL");
 
-        libNamesList.add(glesLibNames);
+        libNamesList.add(glLibNames);
 
         return libNamesList;
     }