~saiarcot895/chromium-browser/chromium-browser.quantal.beta

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2014-03-15 12:34:23 UTC
  • Revision ID: saiarcot895@gmail.com-20140315123423-gc15qxfqli956riq
Tags: 34.0.1847.60-0ubuntu1~ppa1~quantal1
* New upstream version 34.0.1847.60
* Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
                                                                       
3
3
Index: beta.trusty/src/third_party/ffmpeg/ffmpeg.gyp
4
4
===================================================================
5
 
--- beta.trusty.orig/src/third_party/ffmpeg/ffmpeg.gyp  2014-03-07 17:27:38.827691354 -0500
6
 
+++ beta.trusty/src/third_party/ffmpeg/ffmpeg.gyp       2014-03-07 17:27:38.775689450 -0500
 
5
--- beta.trusty.orig/src/third_party/ffmpeg/ffmpeg.gyp  2014-03-15 07:23:39.415063635 -0500
 
6
+++ beta.trusty/src/third_party/ffmpeg/ffmpeg.gyp       2014-03-15 07:23:39.355063920 -0500
7
7
@@ -140,6 +140,10 @@
8
8
             ],
9
9
             'yasm_output_path': '<(shared_generated_dir)/yasm'
35
35
             '<(platform_config_root)',
36
36
Index: beta.trusty/src/third_party/icu/icu.gyp
37
37
===================================================================
38
 
--- beta.trusty.orig/src/third_party/icu/icu.gyp        2014-03-07 17:27:38.827691354 -0500
39
 
+++ beta.trusty/src/third_party/icu/icu.gyp     2014-03-07 17:27:38.823691207 -0500
 
38
--- beta.trusty.orig/src/third_party/icu/icu.gyp        2014-03-15 07:23:39.415063635 -0500
 
39
+++ beta.trusty/src/third_party/icu/icu.gyp     2014-03-15 07:23:39.407063673 -0500
40
40
@@ -34,8 +34,11 @@
41
41
          target_arch=="mipsel")', {
42
42
         'target_conditions': [