File chromium-7.0.542.0-system-libvpx.patch of Package chromium

diff -up chromium-7.0.542.0/build/linux/system.gyp.system-libvpx chromium-7.0.542.0/build/linux/system.gyp
--- chromium-7.0.542.0/src/build/linux/system.gyp.system-libvpx	2010-10-06 14:01:19.638507000 -0400
+++ chromium-7.0.542.0/src/build/linux/system.gyp	2010-10-06 14:01:19.650507000 -0400
@@ -409,6 +409,26 @@
       }]]
     },
     {
+      'target_name': 'libvpx',
+      'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '-I/usr/include/vpx',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '',
+            ],
+            'libraries': [
+              '-lvpx',
+            ],
+          },
+      }]]
+    },
+    {
       'target_name': 'gnome-keyring',
       'type': 'settings',
       'conditions': [
diff -up chromium-7.0.542.0/remoting/base/decoder_vp8.cc.system-libvpx chromium-7.0.542.0/remoting/base/decoder_vp8.cc
--- chromium-7.0.542.0/src/remoting/base/decoder_vp8.cc.system-libvpx	2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/src/remoting/base/decoder_vp8.cc	2010-10-06 14:01:19.651507000 -0400
@@ -10,9 +10,9 @@
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
+#include <vpx_codec.h>
+#include <vpx_decoder.h>
+#include <vp8dx.h>
 }
 
 namespace remoting {
diff -up chromium-7.0.542.0/remoting/base/encoder_vp8.cc.system-libvpx chromium-7.0.542.0/remoting/base/encoder_vp8.cc
--- chromium-7.0.542.0/src/remoting/base/encoder_vp8.cc.system-libvpx	2010-10-04 05:39:56.000000000 -0400
+++ chromium-7.0.542.0/src/remoting/base/encoder_vp8.cc	2010-10-06 14:01:19.652507000 -0400
@@ -11,9 +11,9 @@
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
-#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
-#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
+#include <vpx_codec.h>
+#include <vpx_encoder.h>
+#include <vp8cx.h>
 }
 
 namespace remoting {
diff -up chromium-7.0.542.0/remoting/remoting.gyp.system-libvpx chromium-7.0.542.0/remoting/remoting.gyp
--- chromium-7.0.542.0/src/remoting/remoting.gyp.system-libvpx	2010-10-06 14:01:19.641507000 -0400
+++ chromium-7.0.542.0/src/remoting/remoting.gyp	2010-10-06 14:01:19.654507000 -0400
@@ -114,7 +114,7 @@
         '../gfx/gfx.gyp:gfx',
         '../media/media.gyp:media',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../third_party/libvpx/libvpx.gyp:libvpx_include',
+        '../build/linux/system.gyp:libvpx',
         '../third_party/zlib/zlib.gyp:zlib',
         'chromoting_jingle_glue',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
diff -up chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp.system-libvpx chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp
--- chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp.system-libvpx	2010-10-06 14:04:09.730507291 -0400
+++ chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp	2010-10-06 14:05:14.341510863 -0400
@@ -812,6 +812,9 @@
             '<(output_root)',
             '../..',  # The chromium 'src' directory.
           ],
+          'dependencies': [
+            '../../build/linux/system.gyp:libvpx',
+          ],
           'direct_dependent_settings': {
             'defines': [
               '__STDC_CONSTANT_MACROS',  # FFmpeg uses INT64_C.
diff -up chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment.system-libvpx chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment
--- chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg_stub_headers.fragment.system-libvpx	2010-10-04 05:45:34.000000000 -0400
+++ chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg_stub_headers.fragment	2010-10-06 14:01:19.655507000 -0400
@@ -7,9 +7,9 @@ extern "C" {
 #include <libavformat/avformat.h>
 
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/include/vpx/vpx_codec.h"
-#include "third_party/libvpx/include/vpx/vpx_encoder.h"
-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
+#include <vpx_codec.h>
+#include <vpx_encoder.h>
+#include <vpx_decoder.h>
 
 typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);