Fixed all patches to apply cleanly:
--- ./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-24
00:50:27.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 {
--- ./third_party/khronos/GLES2/gl2.h.orig 2014-08-23 23:00:29.000000000
+0200
+++ ./third_party/khronos/GLES2/gl2.h 2014-08-23 22:46:49.000000000 +0200
@@ -67,8 +67,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 GLsizeiptr;
+typedef ptrdiff_t GLintptr;
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-24 01:13:41.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
--
Carlos Jacobo Puga Medina <c...@fbsd.es>
_______________________________________________
freebsd-chromium@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-chromium
To unsubscribe, send any mail to "freebsd-chromium-unsubscr...@freebsd.org"
