Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > 50b683d450775ca84ad6748bcc4c81af > files > 22

chromium-browser-stable-57.0.2987.133-1.mga5.src.rpm

--- chromium-57.0.2987.88/build/linux/unbundle/mesa.gn.bak	2017-03-04 10:58:31.827845017 +0100
+++ chromium-57.0.2987.88/build/linux/unbundle/mesa.gn	2017-03-05 10:52:21.420424070 +0100
@@ -0,0 +1,11 @@
+import("//build/config/linux/pkg_config.gni")
+source_set("mesa") {
+}
+pkg_config("system_osmesa") {
+  packages = [ "osmesa" ]
+}
+source_set("osmesa") {
+  public_configs = [ ":system_osmesa" ]
+}
+source_set("mesa_headers") {
+}
--- chromium-57.0.2987.88/build/linux/unbundle/replace_gn_files.py.system-mesa	2017-03-05 09:47:38.365544523 +0100
+++ chromium-57.0.2987.88/build/linux/unbundle/replace_gn_files.py	2017-03-05 10:03:39.729439729 +0100
@@ -29,6 +29,7 @@
   'libwebp': 'third_party/libwebp/BUILD.gn',
   'libxml': 'third_party/libxml/BUILD.gn',
   'libxslt': 'third_party/libxslt/BUILD.gn',
+  'mesa': 'third_party/mesa/BUILD.gn',
   'opus': 'third_party/opus/BUILD.gn',
   're2': 'third_party/re2/BUILD.gn',
   'snappy': 'third_party/snappy/BUILD.gn',
--- chromium-57.0.2987.88/services/ui/BUILD.gn.system-mesa	2017-03-02 00:02:17.000000000 +0100
+++ chromium-57.0.2987.88/services/ui/BUILD.gn	2017-03-05 21:39:43.491141135 +0100
@@ -24,7 +24,6 @@
   ]
 
   deps = [
-    ":copy_gl_libraries",
     ":lib",
     ":resources_100",
     ":resources_200",
@@ -34,7 +33,6 @@
   ]
 
   data_deps = [
-    ":copy_gl_libraries",
     ":manifest",
     "//services/ui/ime/test_ime_driver",
   ]
@@ -51,35 +49,6 @@
   source = "manifest.json"
 }
 
-copy("copy_gl_libraries") {
-  deps = [
-    "//third_party/mesa:osmesa",
-  ]
-
-  if (is_win) {
-    deps += [
-      "//third_party/angle:libEGL",
-      "//third_party/angle:libGLESv2",
-    ]
-
-    sources = [
-      "$root_shlib_dir/libEGL.dll",
-      "$root_shlib_dir/libGLESv2.dll",
-      "$root_shlib_dir/osmesa.dll",
-    ]
-  } else if (is_android || is_linux) {
-    sources = [
-      "$root_shlib_dir/libosmesa.so",
-    ]
-  } else {
-    sources = []
-  }
-
-  outputs = [
-    "$root_out_dir/$packages_directory/ui/{{source_file_part}}",
-  ]
-}
-
 source_set("lib") {
   sources = [
     "service.cc",
--- chromium-57.0.2987.88/ui/gl/gl_implementation_osmesa.cc.system-mesa	2017-03-02 00:02:32.000000000 +0100
+++ chromium-57.0.2987.88/ui/gl/gl_implementation_osmesa.cc	2017-03-05 22:53:02.474863214 +0100
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <GL/osmesa.h>
+
+static void * const get_proc_address1 = (void *)&OSMesaGetProcAddress;
+
 #include "ui/gl/gl_implementation_osmesa.h"
 
 #include "base/files/file_path.h"
@@ -16,29 +20,14 @@
 namespace gl {
 
 bool InitializeStaticGLBindingsOSMesaGL() {
-  base::FilePath module_path;
-  if (!PathService::Get(base::DIR_MODULE, &module_path)) {
-    LOG(ERROR) << "PathService::Get failed.";
-    return false;
-  }
-
-  base::FilePath library_path = module_path.Append("libosmesa.so");
-  base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
-  if (!library)
-    return false;
-
   GLGetProcAddressProc get_proc_address =
-      reinterpret_cast<GLGetProcAddressProc>(
-          base::GetFunctionPointerFromNativeLibrary(library,
-                                                    "OSMesaGetProcAddress"));
+      reinterpret_cast<GLGetProcAddressProc>(get_proc_address1);
   if (!get_proc_address) {
     LOG(ERROR) << "OSMesaGetProcAddress not found.";
-    base::UnloadNativeLibrary(library);
     return false;
   }
 
   SetGLGetProcAddressProc(get_proc_address);
-  AddGLNativeLibrary(library);
   SetGLImplementation(kGLImplementationOSMesaGL);
 
   InitializeStaticGLBindingsGL();
--- chromium-57.0.2987.88/ui/gl/BUILD.gn.system-mesa	2017-03-02 00:02:32.000000000 +0100
+++ chromium-57.0.2987.88/ui/gl/BUILD.gn	2017-03-08 00:41:17.682176748 +0100
@@ -179,6 +179,7 @@
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
+    deps += [ "//third_party/mesa:osmesa" ]
   }
   if (use_x11) {
     sources += [
--- chromium-57.0.2987.110/gpu/command_buffer/common/gles2_cmd_format.h.bak	2017-03-16 23:02:33.000000000 +0100
+++ chromium-57.0.2987.110/gpu/command_buffer/common/gles2_cmd_format.h	2017-03-20 21:58:30.217201591 +0100
@@ -42,8 +42,8 @@
 typedef double GLdouble;
 typedef double GLclampd;
 typedef void GLvoid;
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 typedef struct __GLsync *GLsync;
 typedef int64_t GLint64;
 typedef uint64_t GLuint64;
--- chromium-57.0.2987.133/ppapi/lib/gl/include/GLES2/gl2.h.bak	2017-03-30 01:40:38.000000000 +0200
+++ chromium-57.0.2987.133/ppapi/lib/gl/include/GLES2/gl2.h	2017-04-03 02:05:29.690170162 +0200
@@ -31,8 +31,8 @@ typedef khronos_float_t  GLclampf;
 typedef khronos_int32_t  GLfixed;
 
 /* GL types for handling large vertex buffer objects */
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 
 /* OpenGL ES core versions */
 #define GL_ES_VERSION_2_0                 1
--- chromium-57.0.2987.133/third_party/angle/include/GLES2/gl2.h.bak	2017-03-30 01:41:17.000000000 +0200
+++ chromium-57.0.2987.133/third_party/angle/include/GLES2/gl2.h	2017-04-03 02:01:34.099393132 +0200
@@ -38,6 +38,8 @@
 
 #include <GLES2/gl2platform.h>
 
+#include <stddef.h>
+
 #ifndef GL_APIENTRYP
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
@@ -72,8 +72,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/angle/include/GLES3/gl31.h.bak	2017-03-30 01:41:17.000000000 +0200
+++ chromium-57.0.2987.133/third_party/angle/include/GLES3/gl31.h	2017-04-03 02:02:43.762144368 +0200
@@ -38,6 +38,8 @@
 
 #include <GLES3/gl3platform.h>
 
+#include <stddef.h>
+
 #ifndef GL_APIENTRYP
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
@@ -72,8 +72,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/angle/include/GLES3/gl32.h.bak	2017-03-30 01:41:17.000000000 +0200
+++ chromium-57.0.2987.133/third_party/angle/include/GLES3/gl32.h	2017-04-03 02:02:01.142908348 +0200
@@ -70,8 +70,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/angle/include/GLES3/gl3.h.bak	2017-03-30 01:41:17.000000000 +0200
+++ chromium-57.0.2987.133/third_party/angle/include/GLES3/gl3.h	2017-04-03 02:02:22.213530640 +0200
@@ -38,6 +38,8 @@
 
 #include <GLES3/gl3platform.h>
 
+#include <stddef.h>
+
 #ifndef GL_APIENTRYP
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
@@ -72,8 +72,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/angle/src/libANGLE/renderer/gl/functionsgl_typedefs.h.bak	2017-03-30 01:41:17.000000000 +0200
+++ chromium-57.0.2987.133/third_party/angle/src/libANGLE/renderer/gl/functionsgl_typedefs.h	2017-04-03 02:03:35.387218976 +0200
@@ -39,8 +39,8 @@ typedef khronos_float_t  GLclampf;
 typedef double           GLdouble;
 typedef double           GLclampd;
 typedef khronos_int32_t  GLfixed;
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 typedef unsigned short   GLhalf;
 typedef khronos_int64_t  GLint64;
 typedef khronos_uint64_t GLuint64;
--- chromium-57.0.2987.133/third_party/khronos/GLES2/gl2.h.bak	2017-03-30 01:40:48.000000000 +0200
+++ chromium-57.0.2987.133/third_party/khronos/GLES2/gl2.h	2017-04-02 23:43:06.636330152 +0200
@@ -39,6 +39,8 @@
 #include <GLES2/gl2chromium.h>
 #include <GLES2/gl2platform.h>
 
+#include <stddef.h>
+
 /* Generated on date 20141020 */
 
 /* Generated C header for:
@@ -69,8 +69,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/khronos/GLES3/gl31.h.bak	2017-03-30 01:40:48.000000000 +0200
+++ chromium-57.0.2987.133/third_party/khronos/GLES3/gl31.h	2017-04-02 23:53:08.535522508 +0200
@@ -66,8 +66,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/khronos/GLES3/gl32.h.bak	2017-03-30 01:40:48.000000000 +0200
+++ chromium-57.0.2987.133/third_party/khronos/GLES3/gl32.h	2017-04-02 23:52:10.311570707 +0200
@@ -74,8 +74,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
diff -up chromium-57.0.2987.133/third_party/khronos/GLES3/gl3.h.bak chromium-57.0.2987.133/third_party/khronos/GLES3/gl3.h
--- chromium-57.0.2987.133/third_party/khronos/GLES3/gl3.h.bak	2017-03-30 01:40:48.000000000 +0200
+++ chromium-57.0.2987.133/third_party/khronos/GLES3/gl3.h	2017-04-02 23:43:13.611205014 +0200
@@ -38,6 +38,8 @@
 
 #include <GLES3/gl3platform.h>
 
+#include <stddef.h>
+
 /* Generated on date 20141118 */
 
 /* Generated C header for:
@@ -68,8 +68,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/mesa/src/include/GLES/gl.h.bak	2017-03-30 01:41:21.000000000 +0200
+++ chromium-57.0.2987.133/third_party/mesa/src/include/GLES/gl.h	2017-04-03 02:04:13.741531483 +0200
@@ -31,8 +31,8 @@ typedef khronos_float_t  GLclampf;
 typedef khronos_int32_t  GLfixed;
 typedef khronos_int32_t  GLclampx;
 
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 
 
 /*************************************************************/
--- chromium-57.0.2987.133/third_party/swiftshader/include/GLES2/gl2.h.bak	2017-03-30 01:41:23.000000000 +0200
+++ chromium-57.0.2987.133/third_party/swiftshader/include/GLES2/gl2.h	2017-04-02 23:53:44.800869685 +0200
@@ -70,8 +70,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/swiftshader/include/GLES3/gl3.h.bak	2017-03-30 01:41:23.000000000 +0200
+++ chromium-57.0.2987.133/third_party/swiftshader/include/GLES3/gl3.h	2017-04-02 23:54:07.886454137 +0200
@@ -70,8 +70,8 @@ typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- chromium-57.0.2987.133/third_party/swiftshader/include/GLES/gl.h.bak	2017-03-30 01:41:23.000000000 +0200
+++ chromium-57.0.2987.133/third_party/swiftshader/include/GLES/gl.h	2017-04-02 23:56:34.417816928 +0200
@@ -31,8 +31,8 @@ typedef khronos_float_t  GLclampf;
 typedef khronos_int32_t  GLfixed;
 typedef khronos_int32_t  GLclampx;
 
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 
 
 /*************************************************************/
--- chromium-57.0.2987.133/third_party/mesa/src/include/GL/glext.h.bak	2017-03-30 01:41:21.000000000 +0200
+++ chromium-57.0.2987.133/third_party/mesa/src/include/GL/glext.h	2017-04-05 20:32:02.255627096 +0200
@@ -6153,8 +6153,8 @@
 typedef signed   long long int GLintptr;
 typedef signed   long long int GLsizeiptr;
 #else
-typedef signed   long  int     GLintptr;
-typedef signed   long  int     GLsizeiptr;
+typedef ptrdiff_t     GLintptr;
+typedef ptrdiff_t     GLsizeiptr;
 #endif
 #endif
 
--- chromium-57.0.2987.133/gpu/command_buffer/build_gles2_cmd_buffer.py.bak	2017-03-30 01:40:36.000000000 +0200
+++ chromium-57.0.2987.133/gpu/command_buffer/build_gles2_cmd_buffer.py	2017-04-05 22:59:17.453802279 +0200
@@ -61,8 +61,8 @@
 }
 
 _GL_TYPES_32 = {
-  'GLintptr': 'long int',
-  'GLsizeiptr': 'long int'
+  'GLintptr': 'ptrdiff_t',
+  'GLsizeiptr': 'ptrdiff_t'
 }
 
 _GL_TYPES_64 = {
--- chromium-57.0.2987.133/ppapi/c/ppb_opengles2.h.bak	2017-03-30 01:40:38.000000000 +0200
+++ chromium-57.0.2987.133/ppapi/c/ppb_opengles2.h	2017-04-05 23:37:39.237757444 +0200
@@ -58,6 +58,8 @@
 
 #include "ppapi/c/pp_resource.h"
 
+#include <stddef.h>
+
 #ifndef __gl2_h_
 typedef void GLvoid;
 typedef int GLsizei;
@@ -78,8 +78,8 @@
 typedef long long int GLintptr;
 typedef long long int GLsizeiptr;
 #else
-typedef long int GLintptr;
-typedef long int GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
 #endif  // _WIN64
 #endif  // __gl2_h_

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional