Date: Sun, 24 Aug 2014 01:25:28 +0200 From: Carlos Jacobo Puga Medina <cpm@fbsd.es> To: =?ISO-8859-1?Q?Ren=E9?= Ladan <rene@freebsd.org> Cc: freebsd-chromium@freebsd.org Subject: Re: chromium 37 up for testing (and polishing) Message-ID: <20140824012528.dfd1f295a8fd8b27a9442f43@fbsd.es> In-Reply-To: <20140824001855.77e65f14e9cc9bd60f2f37a6@fbsd.es> References: <20140823191817.72221ad837a5bce62f4dfeba@fbsd.es> <CADL2u4h%2B%2Bvp9=S_kOoAafQBF%2Bi5bVhj27uKK1Y64%2BJEtLT5a7A@mail.gmail.com> <20140823215526.4248b76f3d04bc34d73f70fd@fbsd.es> <20140823230710.b8589229dd2e62817645da4d@fbsd.es> <20140824001855.77e65f14e9cc9bd60f2f37a6@fbsd.es>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <cpm@fbsd.es>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140824012528.dfd1f295a8fd8b27a9442f43>