[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 693 Include libvpx system headers.

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 693
Revision Id: iuculano at debian.org-20101116123628-0x0o8prflsy1r7nl
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Include libvpx system headers.


--------------------------------------------------------
  ** Added :
        - debian/patches/vpx.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-11-16 12:10:04 +0000
+++ b/debian/changelog	2010-11-16 12:36:28 +0000
@@ -4,8 +4,9 @@
   * Refreshed patches
   * Added libxtst-dev in build-depends
   * Use v8 and glew system copy for the moment.
+  * Include libvpx system headers.
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Tue, 16 Nov 2010 13:09:47 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Tue, 16 Nov 2010 13:34:02 +0100
 
 chromium-browser (7.0.544.0~r61416-1) UNRELEASED; urgency=low
 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-11-16 12:10:04 +0000
+++ b/debian/patches/series	2010-11-16 12:36:28 +0000
@@ -13,3 +13,4 @@
 gecko-mediaplayer.patch
 ffmpeg_arm.patch
 system-speech.patch
+vpx.patch

=== added file 'debian/patches/vpx.patch'
--- a/debian/patches/vpx.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/vpx.patch	2010-11-16 12:36:28 +0000
@@ -0,0 +1,68 @@
+--- a/src/remoting/base/decoder_vp8.cc
++++ b/src/remoting/base/decoder_vp8.cc
+@@ -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 {
+--- a/src/remoting/base/encoder_vp8.cc
++++ b/src/remoting/base/encoder_vp8.cc
+@@ -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 {
+--- a/src/third_party/ffmpeg/ffmpeg.gyp
++++ b/src/third_party/ffmpeg/ffmpeg.gyp
+@@ -899,10 +899,20 @@
+               'cflags': [
+                 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+               ],
++              'link_settings': {
++                'libraries': [
++                  '-lvpx',
++                ],
++              },
+               'direct_dependent_settings': {
+                 'cflags': [
+                   '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+                 ],
++              'link_settings': {
++                'libraries': [
++                  '-lvpx',
++                ],
++               },
+               },
+             }, {  # else use_system_ffmpeg==0, add local copy to include path
+               'include_dirs': [
+--- a/src/third_party/ffmpeg/ffmpeg_stub_headers.fragment
++++ b/src/third_party/ffmpeg/ffmpeg_stub_headers.fragment
+@@ -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/vpx_codec.h"
++#include "vpx/vpx_encoder.h"
++#include "vpx/vpx_decoder.h"
+ 
+ typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
+