public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r1.patch
@ 2014-06-12  6:36 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 2+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2014-06-12  6:36 UTC (permalink / raw
  To: gentoo-commits

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

Index: chromium-ffmpeg-r1.patch
===================================================================
--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2014-06-11 10:13:47.246416916 +0000
+++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py	2014-06-11 10:19:55.333739033 +0000
@@ -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',





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r1.patch
@ 2014-06-14  8:34 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 2+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2014-06-14  8:34 UTC (permalink / raw
  To: gentoo-commits

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']





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-06-14  8:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-14  8:34 [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r1.patch PaweA Hajdan (phajdan.jr)
  -- strict thread matches above, loose matches on Subject: below --
2014-06-12  6:36 PaweA Hajdan (phajdan.jr)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox