From owner-freebsd-chromium@FreeBSD.ORG Sat Aug 23 23:26:49 2014 Return-Path: Delivered-To: freebsd-chromium@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FAA46E1; Sat, 23 Aug 2014 23:26:49 +0000 (UTC) Received: from erelay4.ox.registrar-servers.com (erelay4.ox.registrar-servers.com [192.64.117.33]) by mx1.freebsd.org (Postfix) with ESMTP id 0733E3970; Sat, 23 Aug 2014 23:26:48 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by erelay1.ox.registrar-servers.com (Postfix) with ESMTP id BC3CB22029AC; Sat, 23 Aug 2014 23:26:47 +0000 (UTC) Received: from erelay1.ox.registrar-servers.com ([127.0.0.1]) by localhost (erelay.ox.registrar-servers.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id wukNiDzUezPH; Sat, 23 Aug 2014 19:26:47 -0400 (EDT) Received: from imap10.ox.privateemail.com (imap10.ox.privateemail.com [192.64.116.221]) by erelay1.ox.registrar-servers.com (Postfix) with ESMTP id 15AA422031E3; Sat, 23 Aug 2014 19:26:47 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.privateemail.com (Postfix) with ESMTP id ACC592400C7; Sat, 23 Aug 2014 19:26:46 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at imap10.ox.privateemail.com Received: from mail.privateemail.com ([127.0.0.1]) by localhost (imap10.ox.privateemail.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id dagn76KjRrnQ; Sat, 23 Aug 2014 19:26:46 -0400 (EDT) Received: from localhost (186.Red-81-35-74.dynamicIP.rima-tde.net [81.35.74.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.privateemail.com (Postfix) with ESMTPSA id 91A9D24005D; Sat, 23 Aug 2014 19:26:44 -0400 (EDT) Date: Sun, 24 Aug 2014 01:25:28 +0200 From: Carlos Jacobo Puga Medina To: =?ISO-8859-1?Q?Ren=E9?= Ladan 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> <20140823215526.4248b76f3d04bc34d73f70fd@fbsd.es> <20140823230710.b8589229dd2e62817645da4d@fbsd.es> <20140824001855.77e65f14e9cc9bd60f2f37a6@fbsd.es> X-Mailer: Sylpheed 3.4.2 (GTK+ 2.24.22; i386-portbld-freebsd11.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-chromium@freebsd.org X-BeenThere: freebsd-chromium@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: FreeBSD-specific Chromium issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 23:26:49 -0000 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 +#include #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