diff options
Diffstat (limited to 'www/chromium/files/patch-manual-build')
-rw-r--r-- | www/chromium/files/patch-manual-build | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/www/chromium/files/patch-manual-build b/www/chromium/files/patch-manual-build new file mode 100644 index 000000000000..fa2df019ef24 --- /dev/null +++ b/www/chromium/files/patch-manual-build @@ -0,0 +1,90 @@ +--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig 2014-08-20 21:02:37.000000000 +0200 ++++ ./gpu/command_buffer/common/gles2_cmd_format.h 2014-08-25 23:47:01.000000000 +0200 +@@ -39,8 +39,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; + + namespace gpu { + namespace gles2 { +--- ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.orig 2014-08-24 12:26:40.000000000 +0200 ++++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc 2014-08-24 12:33:01.000000000 +0200 +@@ -31,8 +31,8 @@ + functions->fBindVertexArray = glBindVertexArrayOES; + functions->fBlendColor = glBlendColor; + functions->fBlendFunc = glBlendFunc; +- functions->fBufferData = glBufferData; +- functions->fBufferSubData = glBufferSubData; ++ functions->fBufferData = (GrGLBufferDataProc)glBufferData; ++ functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData; + functions->fClear = glClear; + functions->fClearColor = glClearColor; + functions->fClearStencil = glClearStencil; +@@ -74,7 +74,7 @@ + functions->fInsertEventMarker = glInsertEventMarkerEXT; + functions->fLineWidth = glLineWidth; + functions->fLinkProgram = glLinkProgram; +- functions->fMapBufferSubData = glMapBufferSubDataCHROMIUM; ++ functions->fMapBufferSubData = (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM; + functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM; + functions->fPixelStorei = glPixelStorei; + functions->fPopGroupMarker = glPopGroupMarkerEXT; +--- ./ppapi/c/ppb_opengles2.h.orig 2014-08-25 23:42:52.000000000 +0200 ++++ ./ppapi/c/ppb_opengles2.h 2014-08-25 23:44:21.000000000 +0200 +@@ -34,8 +34,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_ + +--- ./third_party/khronos/GLES2/gl2.h.orig 2014-08-20 21:03:05.000000000 +0200 ++++ ./third_party/khronos/GLES2/gl2.h 2014-08-25 23:48:36.000000000 +0200 +@@ -38,6 +38,7 @@ + + #include <GLES2/gl2chromium.h> + #include <GLES2/gl2platform.h> ++#include <cstddef> + + /* Generated on date 20131202 */ + +@@ -67,8 +68,8 @@ + 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 GLintptr; ++typedef ptrdiff_t GLsizeiptr; + typedef unsigned int GLbitfield; + typedef int GLint; + typedef unsigned char GLboolean; +--- ./third_party/mesa/src/include/GLES2/gl2.h.orig 2014-08-20 21:03:54.000000000 +0200 ++++ ./third_party/mesa/src/include/GLES2/gl2.h 2014-08-25 23:50:18.000000000 +0200 +@@ -4,6 +4,7 @@ + /* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ + + #include <GLES2/gl2platform.h> ++#include <cstddef> + + #ifdef __cplusplus + extern "C" { +@@ -35,8 +36,8 @@ + 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 |