← Back to branch summary

~cmiller/chromium-browser/ppa-state-beta-raring

« back to all changes in this revision

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

  • Committer: Chad Miller
  • Date: 2013-02-15 18:32:52 UTC
  • mfrom: (798.1.31 p-raring)
  • Revision ID: chad.miller@canonical.com-20130215183252-0xch75o4tpcghq28
* New beta version 25.0.1364.84.
* Add Recomends for webaccounts-chromium-extension.
* Add Recomends for unity-chromium-extension.
* debian/patches/ffmpeg-gyp-config.
  - Renamed from debian/patches/gyp-config-root
  - Write includes for more targets in ffmpeg building.
* debian/rules:
  - Adopt some ARM build conditions from Debian.
  - Write REMOVED files in correct place.
* Put GOOG search credit in a patch so we know when it fails.  Also 
  add credit to the other search idioms for GOOG.
* Clean up debian/rules file. Stop matching Ubuntu versions outside
  of Ubuntu environments.  Match patterns instead of whole words
  because releases can have any number of updates.

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
 
@@ -475,6 +475,7 @@
 
5
@@ -399,6 +399,9 @@
 
6
   'targets': [
 
7
     {
 
8
       'target_name': 'ffmpeg',
 
9
+      'include_dirs': [
 
10
+        '<(platform_config_root)',
 
11
+      ],
 
12
       'sources': [
 
13
         # Files needed for stub generation rules.
 
14
         '<@(sig_files)',
 
15
@@ -475,12 +478,14 @@
6
16
             'project_path': 'third_party/ffmpeg',
7
17
             'intermediate_dir': '<(INTERMEDIATE_DIR)',
8
18
             'output_root': '<(SHARED_INTERMEDIATE_DIR)/ffmpeg',
10
20
           },
11
21
           'sources': [
12
22
             '<(extra_header)',
13
 
 
 
23
           ],
 
24
           'type': '<(component)',
 
25
           'include_dirs': [
 
26
+           '<(platform_config_root)',
 
27
             '<(output_root)',
 
28
             '../..',  # The chromium 'src' directory.
 
29
           ],
 
30
@@ -626,6 +631,10 @@
 
31
         ],
 
32
         'yasm_output_path': '<(shared_generated_dir)/yasm'
 
33
       },
 
34
+      'include_dirs': [
 
35
+        '<(platform_config_root)',
 
36
+        '.',
 
37
+      ],
 
38
     },
 
39
   ],  # targets
 
40
 }