Date: Mon, 1 Sep 2014 15:18:18 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366885 - in head/www/chromium: . files Message-ID: <201409011518.s81FIIiH085567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Sep 1 15:18:18 2014 New Revision: 366885 URL: http://svnweb.freebsd.org/changeset/ports/366885 QAT: https://qat.redports.org/buildarchive/r366885/ Log: www/chromium: fix on i386 files/patch-manual-build is intended to fix some build errors when building chromium outside of poudriere, but it confuses the package builders for i386. So rename it only apply it on amd64. While here clean up some protobuf lines. Submitted by: pkg-fallout Added: head/www/chromium/files/extra-patch-manual-amd64 - copied unchanged from r366878, head/www/chromium/files/patch-manual-build Deleted: head/www/chromium/files/patch-manual-build Modified: head/www/chromium/Makefile Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Mon Sep 1 15:17:13 2014 (r366884) +++ head/www/chromium/Makefile Mon Sep 1 15:18:18 2014 (r366885) @@ -207,6 +207,11 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- CONFIGURE_ENV+= AR=/usr/bin/ar .endif +# fix for non-poudriere builds, but it confuses pkg-builder on i386 +.if ${ARCH} == amd64 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-manual-amd64 +.endif + # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ @@ -243,10 +248,8 @@ post-patch: pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" - # keep third_party/protobuf to ease debugging cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ - 'third_party/protobuf' \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ Copied: head/www/chromium/files/extra-patch-manual-amd64 (from r366878, head/www/chromium/files/patch-manual-build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-manual-amd64 Mon Sep 1 15:18:18 2014 (r366885, copy of r366878, head/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409011518.s81FIIiH085567>