1 |
phajdan.jr 14/07/30 17:46:54 |
2 |
|
3 |
Added: chromium-ffmpeg-r3.patch |
4 |
Log: |
5 |
Dev channel bump. Fix bug #513048 by mgorny. Remove old. |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-client/chromium/files/chromium-ffmpeg-r3.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r3.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r3.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: chromium-ffmpeg-r3.patch |
16 |
=================================================================== |
17 |
--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py |
18 |
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py |
19 |
@@ -7,7 +7,6 @@ |
20 |
from __future__ import print_function |
21 |
|
22 |
import collections |
23 |
-import functools |
24 |
import multiprocessing |
25 |
import optparse |
26 |
import os |
27 |
@@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__)) |
28 |
FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..')) |
29 |
|
30 |
|
31 |
+BRANDINGS = [ |
32 |
+ 'Chrome', |
33 |
+ 'ChromeOS', |
34 |
+ 'Chromium', |
35 |
+ 'ChromiumOS', |
36 |
+] |
37 |
+ |
38 |
+ |
39 |
USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args] |
40 |
|
41 |
Valid combinations are linux [ia32|x64|mipsel|arm|arm-neon] |
42 |
@@ -113,8 +120,6 @@ def RewriteFile(path, search, replace): |
43 |
|
44 |
def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs, |
45 |
config_only, config, configure_flags): |
46 |
- print('%s configure/build:' % config) |
47 |
- |
48 |
config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config) |
49 |
shutil.rmtree(config_dir, ignore_errors=True) |
50 |
os.makedirs(os.path.join(config_dir, 'out')) |
51 |
@@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs, |
52 |
|
53 |
def main(argv): |
54 |
parser = optparse.OptionParser(usage=USAGE) |
55 |
+ parser.add_option('--branding', action='append', dest='brandings', |
56 |
+ choices=BRANDINGS, |
57 |
+ help='Branding to build; determines e.g. supported codecs') |
58 |
parser.add_option('--config-only', action='store_true', |
59 |
help='Skip the build step. Useful when a given platform ' |
60 |
'is not necessary for generate_gyp.py') |
61 |
@@ -426,9 +434,15 @@ def main(argv): |
62 |
'--enable-parser=gsm', |
63 |
]) |
64 |
|
65 |
- do_build_ffmpeg = functools.partial( |
66 |
- BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs, |
67 |
- options.config_only) |
68 |
+ def do_build_ffmpeg(branding, configure_flags): |
69 |
+ if options.brandings and branding not in options.brandings: |
70 |
+ print('%s skipped' % branding) |
71 |
+ return |
72 |
+ |
73 |
+ print('%s configure/build:' % branding) |
74 |
+ BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs, |
75 |
+ options.config_only, branding, configure_flags) |
76 |
+ |
77 |
do_build_ffmpeg('Chromium', |
78 |
configure_flags['Common'] + |
79 |
configure_flags['Chromium'] + |