ffmpeg.patch

   1 --- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig  2014-06-13 13:13:35.762996021 +0000
   2 +++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py       2014-06-13 13:13:38.693099249 +0000
   3 @@ -131,7 +131,7 @@
   4  """
   5
   6  # Controls GYP conditional stanza generation.
   7 -SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
   8 +SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
   9  SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
  10  # Mac doesn't have any platform specific files, so just use linux and win.
  11  SUPPORTED_PLATFORMS = ['linux', 'win']
  12 --- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
  13 +++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
  14 @@ -7,7 +7,6 @@
  15  from __future__ import print_function
  16
  17  import collections
  18 -import functools
  19  import multiprocessing
  20  import optparse
  21  import os
  22 @@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
  23  FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..'))
  24
  25
  26 +BRANDINGS = [
  27 +  'Chrome',
  28 +  'ChromeOS',
  29 +  'Chromium',
  30 +  'ChromiumOS',
  31 +]
  32 +
  33 +
  34  USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args]
  35
  36  Valid combinations are linux       [ia32|x64|mipsel|arm|arm-neon]
  37 @@ -113,8 +120,6 @@ def RewriteFile(path, search, replace):
  38
  39  def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
  40                  config_only, config, configure_flags):
  41 -  print('%s configure/build:' % config)
  42 -
  43    config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config)
  44    shutil.rmtree(config_dir, ignore_errors=True)
  45    os.makedirs(os.path.join(config_dir, 'out'))
  46 @@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
  47
  48  def main(argv):
  49    parser = optparse.OptionParser(usage=USAGE)
  50 +  parser.add_option('--branding', action='append', dest='brandings',
  51 +                    choices=BRANDINGS,
  52 +                    help='Branding to build; determines e.g. supported codecs')
  53    parser.add_option('--config-only', action='store_true',
  54                      help='Skip the build step. Useful when a given platform '
  55                      'is not necessary for generate_gyp.py')
  56 @@ -426,9 +434,15 @@ def main(argv):
  57        '--enable-parser=gsm',
  58    ])
  59
  60 -  do_build_ffmpeg = functools.partial(
  61 -      BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
  62 -      options.config_only)
  63 +  def do_build_ffmpeg(branding, configure_flags):
  64 +    if options.brandings and branding not in options.brandings:
  65 +      print('%s skipped' % branding)
  66 +      return
  67 +
  68 +    print('%s configure/build:' % branding)
  69 +    BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
  70 +                options.config_only, branding, configure_flags)
  71 +
  72    do_build_ffmpeg('Chromium',
  73                    configure_flags['Common'] +
  74                    configure_flags['Chromium'] +