Date: Tue, 26 Aug 2014 19:25:09 +0200 From: Carlos Jacobo Puga Medina <cpm@fbsd.es> To: =?ISO-8859-1?Q?Ren=E9?= Ladan <rene@freebsd.org> Cc: chromium-list freebsd <freebsd-chromium@freebsd.org> Subject: Re: chromium 37 up for testing (and polishing) Message-ID: <20140826192509.906c9f1ceb167d7b2a145f59@fbsd.es> In-Reply-To: <CADL2u4jkMcWUv5pU2dcXCvvKG04rx3JK7pUgADgf3MFOeNryhg@mail.gmail.com> References: <20140826153613.a1203a3d3d3e3ef56691b1fb@fbsd.es> <CADL2u4jkMcWUv5pU2dcXCvvKG04rx3JK7pUgADgf3MFOeNryhg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 26 Aug 2014 18:39:10 +0200
Ren=E9 Ladan <rene@freebsd.org> wrote:
> > 2014-08-26 15:36 GMT+02:00 Carlos Jacobo Puga Medina <cpm@fbsd.es>:
> >
> > Finally, I installed chromium 37.0.2062.94 on 11-CURRENT/i386. I built =
it
> > with clang 3.4.1. I need to check further before have a respetable opin=
ion,
> > but for now it looks pretty cool.
> >
> > The following patches fix chromium build with Clang
> >
> > I still don't get why they are needed (strictly speaking), chromium bui=
lds
> fine in my 11-i386 vm having only the dependencies of chromium (and pkg a=
nd
> panicmail) installed.
>=20
> But if people insist I'll just add them.
Do it if you consider it necessary, but I needed these patches to fix typed=
efs errors (a bunch of course). Also, it solved the same problem in chromiu=
m-36.0.1985.143.
>=20
> Rene
>=20
>=20
> > --- ./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 =3D glBindVertexArrayOES;
> > functions->fBlendColor =3D glBlendColor;
> > functions->fBlendFunc =3D glBlendFunc;
> > - functions->fBufferData =3D glBufferData;
> > - functions->fBufferSubData =3D glBufferSubData;
> > + functions->fBufferData =3D (GrGLBufferDataProc)glBufferData;
> > + functions->fBufferSubData =3D (GrGLBufferSubDataProc)glBufferSubData;
> > functions->fClear =3D glClear;
> > functions->fClearColor =3D glClearColor;
> > functions->fClearStencil =3D glClearStencil;
> > @@ -74,7 +74,7 @@
> > functions->fInsertEventMarker =3D glInsertEventMarkerEXT;
> > functions->fLineWidth =3D glLineWidth;
> > functions->fLinkProgram =3D glLinkProgram;
> > - functions->fMapBufferSubData =3D glMapBufferSubDataCHROMIUM;
> > + functions->fMapBufferSubData =3D
> > (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM;
> > functions->fMapTexSubImage2D =3D glMapTexSubImage2DCHROMIUM;
> > functions->fPixelStorei =3D glPixelStorei;
> > functions->fPopGroupMarker =3D 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
> >
> >
> >
Regards,
--=20
Carlos Jacobo Puga Medina <cpm@fbsd.es>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140826192509.906c9f1ceb167d7b2a145f59>