[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r1.patch

[PaweA Hajdan (phajdan.jr)]

phajdan.jr14/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  ChangesPath
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.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?r1=1.1r2=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.patch12 Jun 2014 06:36:11 -  1.1
+++ chromium-ffmpeg-r1.patch14 Jun 2014 08:34:17 -  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 +
 third_party/ffmpeg/chromium/scripts/generate_gyp.py2014-06-13 
13:13:38.693099249 +
+@@ -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']

[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r1.patch

[PaweA Hajdan (phajdan.jr)]

phajdan.jr14/06/12 06:36:11

  Added:chromium-ffmpeg-r1.patch
  Log:
  Dev channel bump. Add pic USE flag to build libffmpegsumo.so without text 
relocations on x86 (bug #493670 by ago). Remove old.
  
  (Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 
0x4F1A2555EA71991D!)

Revision  ChangesPath
1.1  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.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r1.patch?rev=1.1content-type=text/plain

Index: chromium-ffmpeg-r1.patch
===
--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig2014-06-11 
10:13:47.246416916 +
+++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py 2014-06-11 
10:19:55.333739033 +
@@ -170,12 +170,13 @@
 'is not necessary for generate_gyp.py')
   options, args = parser.parse_args(argv)
 
-  if len(args) != 2:
+  if len(args)  2:
 parser.print_help()
 return 1
 
   target_os = args[0]
   target_arch = args[1]
+  configure_args = args[2:]
 
   if target_os not in ('linux', 'linux-noasm', 'win', 'win-vs2013', 'mac'):
 parser.print_help()
@@ -429,9 +430,9 @@
   BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
   options.config_only)
   do_build_ffmpeg(
-  'Chromium', configure_flags['Common'] + configure_flags['Chromium'])
+  'Chromium', configure_flags['Common'] + configure_flags['Chromium'] + 
configure_args)
   do_build_ffmpeg(
-  'Chrome', configure_flags['Common'] + configure_flags['Chrome'])
+  'Chrome', configure_flags['Common'] + configure_flags['Chrome'] + 
configure_args)
 
   if target_os == 'linux':
 do_build_ffmpeg('ChromiumOS',