summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium/files/chromium-system-vpx-r1.patch')
-rw-r--r--www-client/chromium/files/chromium-system-vpx-r1.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-system-vpx-r1.patch b/www-client/chromium/files/chromium-system-vpx-r1.patch
new file mode 100644
index 000000000000..a5faa49e292f
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-vpx-r1.patch
@@ -0,0 +1,64 @@
+--- remoting/base/encoder_vp8.cc.orig 2010-11-10 09:52:56.000000000 +0100
++++ remoting/base/encoder_vp8.cc 2010-11-10 09:53:32.000000000 +0100
+@@ -11,9 +11,9 @@
+
+ extern "C" {
+ #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/vp8cx.h"
++#include "vpx/vpx_codec.h"
++#include "vpx/vpx_encoder.h"
++#include "vpx/vp8cx.h"
+ }
+
+ namespace remoting {
+--- remoting/base/decoder_vp8.cc.orig 2010-11-10 09:54:14.000000000 +0100
++++ remoting/base/decoder_vp8.cc 2010-11-10 09:54:37.000000000 +0100
+@@ -10,9 +10,9 @@
+
+ extern "C" {
+ #define VPX_CODEC_DISABLE_COMPAT 1
+-#include "third_party/libvpx/include/vpx/vpx_codec.h"
+-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
+-#include "third_party/libvpx/include/vpx/vp8dx.h"
++#include "vpx/vpx_codec.h"
++#include "vpx/vpx_decoder.h"
++#include "vpx/vp8dx.h"
+ }
+
+ namespace remoting {
+--- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig 2010-11-10 09:55:43.000000000 +0100
++++ third_party/ffmpeg/ffmpeg_stub_headers.fragment 2010-11-10 09:56:09.000000000 +0100
+@@ -7,9 +7,9 @@
+ #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/vpx_codec.h"
++#include "vpx/vpx_encoder.h"
++#include "vpx/vpx_decoder.h"
+
+ typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
+
+--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-11-19 10:32:50.000000000 +0000
++++ third_party/ffmpeg/ffmpeg.gyp 2010-11-19 10:36:33.000000000 +0000
+@@ -898,6 +898,16 @@
+ },
+ }],
+
++ ['use_system_vpx!=0', {
++ 'direct_dependent_settings': {
++ 'link_settings': {
++ 'libraries': [
++ '-lvpx',
++ ],
++ },
++ },
++ }],
++
+ # Add pkg-config result to include path when use_system_ffmpeg!=0
+ ['use_system_ffmpeg!=0', {
+ 'cflags': [