chromium-system-vpx.patch

   1 --- remoting/base/encoder_vp8.cc.orig   2010-11-10 09:52:56.000000000 +0100
   2 +++ remoting/base/encoder_vp8.cc        2010-11-10 09:53:32.000000000 +0100
   3 @@ -11,9 +11,9 @@
   4
   5  extern "C" {
   6  #define VPX_CODEC_DISABLE_COMPAT 1
   7 -#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
   8 -#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
   9 -#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
  10 +#include "vpx/vpx_codec.h"
  11 +#include "vpx/vpx_encoder.h"
  12 +#include "vpx/vp8cx.h"
  13  }
  14
  15  namespace remoting {
  16 --- remoting/base/decoder_vp8.cc.orig   2010-11-10 09:54:14.000000000 +0100
  17 +++ remoting/base/decoder_vp8.cc        2010-11-10 09:54:37.000000000 +0100
  18 @@ -10,9 +10,9 @@
  19
  20  extern "C" {
  21  #define VPX_CODEC_DISABLE_COMPAT 1
  22 -#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
  23 -#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
  24 -#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
  25 +#include "vpx/vpx_codec.h"
  26 +#include "vpx/vpx_decoder.h"
  27 +#include "vpx/vp8dx.h"
  28  }
  29
  30  namespace remoting {
  31 --- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig        2010-11-10 09:55:43.000000000 +0100
  32 +++ third_party/ffmpeg/ffmpeg_stub_headers.fragment     2010-11-10 09:56:09.000000000 +0100
  33 @@ -7,9 +7,9 @@
  34  #include <libavformat/avformat.h>
  35
  36  #define VPX_CODEC_DISABLE_COMPAT 1
  37 -#include "third_party/libvpx/include/vpx/vpx_codec.h"
  38 -#include "third_party/libvpx/include/vpx/vpx_encoder.h"
  39 -#include "third_party/libvpx/include/vpx/vpx_decoder.h"
  40 +#include "vpx/vpx_codec.h"
  41 +#include "vpx/vpx_encoder.h"
  42 +#include "vpx/vpx_decoder.h"
  43
  44  typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
  45
  46 --- third_party/ffmpeg/ffmpeg.gyp.orig  2010-11-19 10:32:50.000000000 +0000
  47 +++ third_party/ffmpeg/ffmpeg.gyp       2010-11-19 10:36:33.000000000 +0000
  48 @@ -898,6 +898,16 @@
  49                },
  50              }],
  51
  52 +            ['use_system_vpx!=0', {
  53 +              'direct_dependent_settings': {
  54 +                'link_settings': {
  55 +                  'libraries': [
  56 +                    '-lvpx',
  57 +                  ],
  58 +                },
  59 +              },
  60 +            }],
  61 +
  62              # Add pkg-config result to include path when use_system_ffmpeg!=0
  63              ['use_system_ffmpeg!=0', {
  64                'cflags': [
  65 --- remoting/remoting.gyp~      2010-12-24 04:01:42.000000000 +0100
  66 +++ remoting/remoting.gyp       2011-01-07 19:29:09.730911879 +0100
  67 @@ -114,7 +114,6 @@
  68          '../gfx/gfx.gyp:gfx',
  69          '../media/media.gyp:media',
  70          '../third_party/protobuf/protobuf.gyp:protobuf_lite',
  71 -        '../third_party/libvpx/libvpx.gyp:libvpx_include',
  72          '../third_party/zlib/zlib.gyp:zlib',
  73          'chromoting_jingle_glue',
  74          'proto/chromotocol.gyp:chromotocol_proto_lib',