dlopen_sonamed_gl.patch

   1 dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
   2 as we don't want to Depend on the -dev packages for the .so files:
   3 - libosmesa.so.7: Mesa-libOSMesa-7.10-1
   4 - libGLESv2.so.2: Mesa-libGLES-7.11-0.20110227.1
   5 - libEGL.so.1: Mesa-libEGL-7.10-1
   6
   7 ---
   8  app/gfx/gl/gl_implementation_linux.cc |   12 ++++++------
   9  1 file changed, 6 insertions(+), 6 deletions(-)
  10
  11 Index: src/app/gfx/gl/gl_implementation_linux.cc
  12 ===================================================================
  13 --- src.orig/app/gfx/gl/gl_implementation_linux.cc
  14 +++ src/app/gfx/gl/gl_implementation_linux.cc
  15 @@ -40,19 +40,19 @@
  16      case kGLImplementationOSMesaGL: {
  17        FilePath module_path;
  18        if (!PathService::Get(base::DIR_MODULE, &module_path)) {
  19          LOG(ERROR) << "PathService::Get failed.";
  20          return false;
  21        }
  22
  23        base::NativeLibrary library = base::LoadNativeLibrary(
  24 -          module_path.Append("libosmesa.so"));
  25 +          module_path.Append("libosmesa.so.7"));
  26        if (!library) {
  27 -        VLOG(1) << "libosmesa.so not found";
  28 +        VLOG(1) << "libosmesa.so.7 not found";
  29          return false;
  30        }
  31
  32        GLGetProcAddressProc get_proc_address =
  33            reinterpret_cast<GLGetProcAddressProc>(
  34                base::GetFunctionPointerFromNativeLibrary(
  35                    library, "OSMesaGetProcAddress"));
  36        if (!get_proc_address) {
  37 @@ -92,26 +92,26 @@
  38        SetGLImplementation(kGLImplementationDesktopGL);
  39
  40        InitializeGLBindingsGL();
  41        InitializeGLBindingsGLX();
  42        break;
  43      }
  44      case kGLImplementationEGLGLES2: {
  45        base::NativeLibrary gles_library = base::LoadNativeLibrary(
  46 -          FilePath("libGLESv2.so"));
  47 +          FilePath("libGLESv2.so.2"));
  48        if (!gles_library) {
  49 -        VLOG(1) << "libGLESv2.so not found";
  50 +        VLOG(1) << "libGLESv2.so.2 not found";
  51          return false;
  52        }
  53
  54        base::NativeLibrary egl_library = base::LoadNativeLibrary(
  55 -          FilePath("libEGL.so"));
  56 +          FilePath("libEGL.so.1"));
  57        if (!egl_library) {
  58 -        VLOG(1) << "libEGL.so not found";
  59 +        VLOG(1) << "libEGL.so.1 not found";
  60          base::UnloadNativeLibrary(gles_library);
  61          return false;
  62        }
  63
  64        GLGetProcAddressProc get_proc_address =
  65            reinterpret_cast<GLGetProcAddressProc>(
  66                base::GetFunctionPointerFromNativeLibrary(
  67                    egl_library, "eglGetProcAddress"));