svn commit: r316533 - in head/www/chromium: . files

[Rene Ladan]

Author: rene
Date: Thu Apr 25 21:31:23 2013
New Revision: 316533
URL: http://svnweb.freebsd.org/changeset/ports/316533

Log:
  Use clang as the default compiler instead of GCC 4.6+
  
  Add a patch to make clang 3.3 r178606+ happy [1]
  
  Obtained from:	upstream libyuv [1]

Added:
  head/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc   (contents, props changed)
Modified:
  head/www/chromium/Makefile

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Thu Apr 25 20:51:38 2013	(r316532)
+++ head/www/chromium/Makefile	Thu Apr 25 21:31:23 2013	(r316533)
@@ -81,7 +81,7 @@ OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO 
 CODECS_DESC=	Compile and enable patented codecs like H.264
 CLANG_DESC=	Build Chromium with Clang instead of GCC 4.6+
 
-OPTIONS_DEFAULT=	CODECS GCONF
+OPTIONS_DEFAULT=	CODECS GCONF CLANG
 
 .include <bsd.port.options.mk>
 

Added: head/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc	Thu Apr 25 21:31:23 2013	(r316533)
@@ -0,0 +1,56 @@
+--- third_party/libyuv/source/row_posix.cc.orig	2013-04-25 16:12:41.000000000 +0200
++++ third_party/libyuv/source/row_posix.cc	2013-04-25 16:18:34.000000000 +0200
+@@ -1805,7 +1805,7 @@
+                                  uint8* dst_rgb24,
+                                  int width) {
+ // fpic 32 bit gcc 4.2 on OSX runs out of GPR regs.
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__llvm__)
+   asm volatile (
+     "movdqa    %[kShuffleMaskARGBToRGB24_0],%%xmm5 \n"
+     "movdqa    %[kShuffleMaskARGBToRGB24],%%xmm6   \n"
+@@ -1814,7 +1814,7 @@
+ #endif
+ 
+   asm volatile (
+-#ifndef __APPLE__
++#if !(defined(__APPLE__) || defined(__llvm__))
+     "movdqa    %[kShuffleMaskARGBToRGB24_0],%%xmm5 \n"
+     "movdqa    %[kShuffleMaskARGBToRGB24],%%xmm6   \n"
+ #endif
+@@ -1843,7 +1843,7 @@
+     [dst_rgb24]"+r"(dst_rgb24),  // %[dst_rgb24]
+     [width]"+rm"(width)    // %[width]
+   : [kYuvConstants]"r"(&kYuvConstants.kUVToB)
+-#ifndef __APPLE__
++#if !(defined(__APPLE__) || defined(__llvm__))
+     , [kShuffleMaskARGBToRGB24_0]"m"(kShuffleMaskARGBToRGB24_0),
+     [kShuffleMaskARGBToRGB24]"m"(kShuffleMaskARGBToRGB24)
+ #endif
+@@ -1860,7 +1860,7 @@
+                                uint8* dst_raw,
+                                int width) {
+ // fpic 32 bit gcc 4.2 on OSX runs out of GPR regs.
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__llvm__)
+   asm volatile (
+     "movdqa    %[kShuffleMaskARGBToRAW_0],%%xmm5 \n"
+     "movdqa    %[kShuffleMaskARGBToRAW],%%xmm6   \n"
+@@ -1869,7 +1869,7 @@
+ #endif
+ 
+   asm volatile (
+-#ifndef __APPLE__
++#if !(defined(__APPLE__) || defined(__llvm__))
+     "movdqa    %[kShuffleMaskARGBToRAW_0],%%xmm5 \n"
+     "movdqa    %[kShuffleMaskARGBToRAW],%%xmm6   \n"
+ #endif
+@@ -1898,7 +1898,7 @@
+     [dst_raw]"+r"(dst_raw),  // %[dst_raw]
+     [width]"+rm"(width)    // %[width]
+   : [kYuvConstants]"r"(&kYuvConstants.kUVToB)
+-#ifndef __APPLE__
++#if !(defined(__APPLE__) || defined(__llvm__))
+     , [kShuffleMaskARGBToRAW_0]"m"(kShuffleMaskARGBToRAW_0),
+     [kShuffleMaskARGBToRAW]"m"(kShuffleMaskARGBToRAW)
+ #endif