diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2014-06-14 08:36:43 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2014-06-14 08:36:43 +0000 |
| commit | 8c249a01898936c5f83db176e69be83f9ee933aa (patch) | |
| tree | 99573bb8c3c01c61884be01ff0e4f1afe1dcf1c0 /www-client/chromium/files | |
| parent | Import the multilib support from ::mozilla. Clean up a bit and copy the simpl... (diff) | |
| download | historical-8c249a01898936c5f83db176e69be83f9ee933aa.tar.gz historical-8c249a01898936c5f83db176e69be83f9ee933aa.tar.bz2 historical-8c249a01898936c5f83db176e69be83f9ee933aa.zip | |
Fix build on amd64, reported as part of bug #513048 by mgorny and floppym.
Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!
Diffstat (limited to 'www-client/chromium/files')
| -rw-r--r-- | www-client/chromium/files/chromium-ffmpeg-r1.patch | 11 |
1 files changed, 11 insertions, 0 deletions
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'] |