From e8200923c6841fd3181995cee5d09bb71b6352ea Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 23 May 2013 01:36:57 +0200
Subject: [PATCH] chromium: disable system mesa on x86 for now.

---
 srcpkgs/chromium/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 40f9078d14..6582190c50 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -46,6 +46,12 @@ do_configure() {
 	# use_system_hyphen=1 (http://crbug.com/176285)
 	# use_system_hunspell=1 (likely https://crbug.com/24517)
 
+	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
+		# XXX disable system mesa for now.
+		# /usr/include/GL/glext.h:6153:19: error: 'GLsizeiptr' has a previous declaration as 'typedef ptrdiff_t GLsizeiptr'
+		# ./gpu/command_buffer/common/gles2_cmd_format.h:40:26: error: conflicting declaration 'typedef khronos_intptr_t GLintptr'
+		local _system_mesa="-Duse_system_mesa=1"
+	fi
 
 	build/gyp_chromium -f make build/all.gyp --depth=. -Dwerror= \
 	 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 \
@@ -58,10 +64,11 @@ do_configure() {
 	 -Duse_system_jsoncpp=1 -Duse_system_libevent=1 -Duse_system_libexif=1 \
 	 -Duse_system_libjpeg=1 -Duse_system_libmtp=1 -Duse_system_libpng=1 \
 	 -Duse_system_libsrtp=1 -Duse_system_libusb=1 -Duse_system_libwebp=1 \
-	 -Duse_system_libxml=1 -Duse_system_minizip=1 -Duse_system_mesa=1 \
+	 -Duse_system_libxml=1 -Duse_system_minizip=1 \
 	 -Duse_system_nspr=1 -Duse_system_opus=1 -Duse_system_protobuf=1 \
 	 -Duse_system_re2=1 -Duse_system_speex=1 -Duse_system_stlport=1 \
-	 -Duse_system_yasm=1 -Duse_system_zlib=1 -Duse_system_xdg=1
+	 -Duse_system_yasm=1 -Duse_system_zlib=1 -Duse_system_xdg=1 \
+	 ${_system_mesa}
 }
 
 do_build() {