← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/ffmpeg-gyp-config.patch

  • Committer: Chad Miller
  • Date: 2014-01-21 21:22:04 UTC
  • Revision ID: chad.miller@canonical.com-20140121212204-wkrfe0z1io4guv1g
* Upstream release 32.0.1700.77:  (LP: #1269387)
  - Tab indicators for sound, webcam and casting 
  - Automatically blocking malware files 
  - A number of new apps/extension APIs 
  - Lots of under the hood changes for stability and performance 
  - CVE-2013-6646: Use-after-free in web workers.
  - CVE-2013-6641: Use-after-free related to forms.
  - CVE-2013-6642: Address bar spoofing in Chrome for Android.
  - CVE-2013-6643: Unprompted sync with an attacker’s Google account.
  - CVE-2013-6645: Use-after-free related to speech input elements.
  - CVE-2013-6644: Various fixes from internal audits, fuzzing and other
    initiatives.
* Re-merged webapps patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ffmpeg-gyp-config.patch
2
2
                                                                       
3
3
--- a/src/third_party/ffmpeg/ffmpeg.gyp
4
4
+++ b/src/third_party/ffmpeg/ffmpeg.gyp
5
 
@@ -436,6 +436,9 @@
 
5
@@ -132,6 +132,10 @@
 
6
             ],
 
7
             'yasm_output_path': '<(shared_generated_dir)/yasm'
 
8
           },
 
9
+          'include_dirs': [
 
10
+            '<(platform_config_root)',
 
11
+            '.',
 
12
+          ],
 
13
         },
 
14
       ] # targets
 
15
     }], # arch != arm
 
16
@@ -501,6 +505,9 @@
6
17
   'targets': [
7
18
     {
8
19
       'target_name': 'ffmpeg',
12
23
       'sources': [
13
24
         # Files needed for stub generation rules.
14
25
         '<@(sig_files)',
15
 
@@ -524,6 +527,7 @@
 
26
@@ -589,6 +596,7 @@
16
27
           'type': '<(component)',
17
28
           'include_dirs': [
18
29
             '<(output_root)',
20
31
             '../..',  # The chromium 'src' directory.
21
32
             '<(platform_config_root)',
22
33
             '.',
23
 
@@ -645,6 +649,10 @@
24
 
         ],
25
 
         'yasm_output_path': '<(shared_generated_dir)/yasm'
26
 
       },
27
 
+      'include_dirs': [
28
 
+        '<(platform_config_root)',
29
 
+        '.',
30
 
+      ],
31
 
     },
32
 
   ],  # targets
33
 
 }
34
34
--- a/src/third_party/icu/icu.gyp
35
35
+++ b/src/third_party/icu/icu.gyp
36
36
@@ -31,8 +31,11 @@