up to 48.0.2564.103

[packages/chromium-browser.git] / dlopen_sonamed_gl.patch

diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch
index da742965d4fb3eff153fbf3545f867fd8e7dd531..116793698c65892d2f05c63d7353c6927d2d0f8a 100644 (file)
--- a/dlopen_sonamed_gl.patch
+++ b/dlopen_sonamed_gl.patch
@@ -1,67 +1,16 @@
 dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
-as we don't want to Depend on the -dev packages for the .so files:
-- libosmesa.so.7: Mesa-libOSMesa-7.10-1
-- libGLESv2.so.1: ???
-- libEGL.so.1: Mesa-libEGL-7.10-1
-
----
- app/gfx/gl/gl_implementation_linux.cc |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: src/app/gfx/gl/gl_implementation_linux.cc
-===================================================================
---- src.orig/app/gfx/gl/gl_implementation_linux.cc
-+++ src/app/gfx/gl/gl_implementation_linux.cc
-@@ -40,19 +40,19 @@
-     case kGLImplementationOSMesaGL: {
-       FilePath module_path;
-       if (!PathService::Get(base::DIR_MODULE, &module_path)) {
-         LOG(ERROR) << "PathService::Get failed.";
-         return false;
-       }
+as we don't want to Depend on the -devel packages for the .so files:
+- libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
+- libGLESv2.so.2: Mesa-libGLES-9.2.0-2
+- libEGL.so.1: Mesa-libEGL-9.2.0-2
+--- chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc~  2014-08-12 22:02:27.000000000 +0300
++++ chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc   2014-08-18 23:09:25.208179075 +0300
+@@ -37,7 +37,7 @@
+     return false;
+   }
  
-       base::NativeLibrary library = base::LoadNativeLibrary(
--          module_path.Append("libosmesa.so"));
-+          module_path.Append("libosmesa.so.7"));
-       if (!library) {
--        VLOG(1) << "libosmesa.so not found";
-+        VLOG(1) << "libosmesa.so.7 not found";
-         return false;
-       }
- 
-       GLGetProcAddressProc get_proc_address =
-           reinterpret_cast<GLGetProcAddressProc>(
-               base::GetFunctionPointerFromNativeLibrary(
-                   library, "OSMesaGetProcAddress"));
-       if (!get_proc_address) {
-@@ -92,26 +92,26 @@
-       SetGLImplementation(kGLImplementationDesktopGL);
- 
-       InitializeGLBindingsGL();
-       InitializeGLBindingsGLX();
-       break;
-     }
-     case kGLImplementationEGLGLES2: {
-       base::NativeLibrary gles_library = base::LoadNativeLibrary(
--          FilePath("libGLESv2.so"));
-+          FilePath("libGLESv2.so.2"));
-       if (!gles_library) {
--        VLOG(1) << "libGLESv2.so not found";
-+        VLOG(1) << "libGLESv2.so.2 not found";
-         return false;
-       }
- 
-       base::NativeLibrary egl_library = base::LoadNativeLibrary(
--          FilePath("libEGL.so"));
-+          FilePath("libEGL.so.1"));
-       if (!egl_library) {
--        VLOG(1) << "libEGL.so not found";
-+        VLOG(1) << "libEGL.so.1 not found";
-         base::UnloadNativeLibrary(gles_library);
-         return false;
-       }
- 
-       GLGetProcAddressProc get_proc_address =
-           reinterpret_cast<GLGetProcAddressProc>(
-               base::GetFunctionPointerFromNativeLibrary(
-                   egl_library, "eglGetProcAddress"));
+-  base::FilePath library_path = module_path.Append("libosmesa.so");
++  base::FilePath library_path = module_path.Append("libOSMesa.so.8");
+   base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
+   if (!library)
+     return false;