aboutsummaryrefslogtreecommitdiff
path: root/www/chromium
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2013-04-25 21:31:23 +0000
committerRene Ladan <rene@FreeBSD.org>2013-04-25 21:31:23 +0000
commitcce4c55bffd43ae023d908e48b1c178058d3f078 (patch)
treeac5dc535eb801cabc6b0c34cabef921f3dcb844f /www/chromium
parent9e001f125ef8275d74f8e1d60a82e4d74830196d (diff)
downloadports-cce4c55bffd43ae023d908e48b1c178058d3f078.tar.gz
ports-cce4c55bffd43ae023d908e48b1c178058d3f078.zip
Notes
Diffstat (limited to 'www/chromium')
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/files/patch-third_party__libyuv__source__row_posix.cc56
2 files changed, 57 insertions, 1 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 3636c32704e9..fe55a5a596e8 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -81,7 +81,7 @@ OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO CLANG DEBUG
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>
diff --git a/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc b/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc
new file mode 100644
index 000000000000..0b8775ba6ff4
--- /dev/null
+++ b/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc
@@ -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