From d686924d80660a266c57473b7fbc209d6a1a062b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 15 Nov 2015 05:03:32 +0100
Subject: Bug 1268: Adapt to GlueGen commit
 2034bbfac88b7d1360f9c939e173ff758f7f47ac

---
 .../classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java    |  2 +-
 src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java | 10 ++++++++++
 .../opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java    | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/jogl/classes/jogamp')

diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java
index 6025b45ff..5eb429774 100644
--- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java
+++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java
@@ -48,7 +48,7 @@ public class DesktopGLDynamicLookupHelper extends GLDynamicLookupHelper {
             gluLibNames.add("libGLU.so"); // unix
             gluLibNames.add("GLU32"); // windows
             gluLibNames.add("GLU"); // generic
-            gluLib = loadFirstAvailable(gluLibNames, null, true);
+            gluLib = loadFirstAvailable(gluLibNames, true, true, null, true);
             if(null != gluLib) {
                 nativeLibraries.add(gluLib);
             }
diff --git a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java
index 39de3200d..7c75b0615 100644
--- a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java
@@ -58,6 +58,16 @@ public abstract class GLDynamicLibraryBundleInfo implements DynamicLibraryBundle
     @Override
     public boolean shallLookupGlobal() { return false; }
 
+    @Override
+    public final boolean searchToolLibInSystemPath() {
+        return true;
+    }
+
+    @Override
+    public final boolean searchToolLibSystemPathFirst() {
+        return true;
+    }
+
     @Override
     public final RunnableExecutor getLibLoaderExecutor() {
         return DynamicLibraryBundle.getDefaultRunnableExecutor();
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
index 595fed77a..6a4257ade 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
@@ -331,6 +331,16 @@ class FFMPEGDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo  {
         return glueLibNames;
     }
 
+    @Override
+    public final boolean searchToolLibInSystemPath() {
+        return true;
+    }
+
+    @Override
+    public final boolean searchToolLibSystemPathFirst() {
+        return true;
+    }
+
     @Override
     public final List<List<String>> getToolLibNames() {
         final List<List<String>> libsList = new ArrayList<List<String>>();
-- 
cgit v1.2.3