phajdan.jr 14/06/14 08:34:17 Modified: chromium-ffmpeg-r1.patch Log: 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!)
Revision Changes Path 1.2 www-client/chromium/files/chromium-ffmpeg-r1.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?r1=1.1&r2=1.2 Index: chromium-ffmpeg-r1.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- chromium-ffmpeg-r1.patch 12 Jun 2014 06:36:11 -0000 1.1 +++ chromium-ffmpeg-r1.patch 14 Jun 2014 08:34:17 -0000 1.2 @@ -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']