summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2014-06-14 08:34:17 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2014-06-14 08:34:17 +0000
commit6849cb40c28b61d72af0718dd9c09c37a5ce114f (patch)
tree0a526ef59cd6c300c87f6118c0b9d5799f60e0a4 /www-client
parentImport the multilib support from ::mozilla. Clean up a bit and copy the simpl... (diff)
downloadgentoo-2-6849cb40c28b61d72af0718dd9c09c37a5ce114f.tar.gz
gentoo-2-6849cb40c28b61d72af0718dd9c09c37a5ce114f.tar.bz2
gentoo-2-6849cb40c28b61d72af0718dd9c09c37a5ce114f.zip
Fix build on amd64, reported as part of bug #513048 by mgorny and floppym.
(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/files/chromium-ffmpeg-r1.patch11
2 files changed, 16 insertions, 1 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 21e945a0a5e5..fc552bd090bf 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1094 2014/06/12 14:14:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1095 2014/06/14 08:34:17 phajdan.jr Exp $
+
+ 14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ files/chromium-ffmpeg-r1.patch:
+ Fix build on amd64, reported as part of bug #513048 by mgorny and floppym.
12 Jun 2014; Mike Gilbert <floppym@gentoo.org>
-chromium-35.0.1916.114-r1.ebuild:
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
index ed037ddb6dc1..821c9e7ca7b9 100644
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -27,3 +27,14 @@
if target_os == 'linux':
do_build_ffmpeg('ChromiumOS',
+--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig 2014-06-13 13:13:35.762996021 +0000
++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py 2014-06-13 13:13:38.693099249 +0000
+@@ -131,7 +131,7 @@
+ """
+
+ # Controls GYP conditional stanza generation.
+-SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
++SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
+ SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
+ # Mac doesn't have any platform specific files, so just use linux and win.
+ SUPPORTED_PLATFORMS = ['linux', 'win']