[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 712 Use system libvpx

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 712
Revision Id: iuculano at debian.org-20110130144744-4ar4fb2it7jx0s22
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Use system libvpx


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/patches/series
        - debian/patches/vpx.patch

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-01-30 14:23:00 +0000
+++ b/debian/changelog	2011-01-30 14:47:44 +0000
@@ -9,8 +9,9 @@
   * Refreshed patches.
   * Build against libv8
   * Use libicu system headers
+  * Use system libvpx
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 30 Jan 2011 15:22:13 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 30 Jan 2011 15:46:48 +0100
 
 chromium-browser (9.0.587.0~r66374-1) experimental; urgency=low
 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2011-01-30 14:23:00 +0000
+++ b/debian/patches/series	2011-01-30 14:47:44 +0000
@@ -13,5 +13,5 @@
 gecko-mediaplayer.patch
 ffmpeg_arm.patch
 system-speech.patch
-#vpx.patch
 icu.patch
+vpx.patch

=== modified file 'debian/patches/vpx.patch'
--- a/debian/patches/vpx.patch	2010-11-16 12:36:28 +0000
+++ b/debian/patches/vpx.patch	2011-01-30 14:47:44 +0000
@@ -7,9 +7,9 @@
 -#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"
++#include <vpx/vpx_codec.h>
++#include <vpx/vpx_decoder.h>
++#include <vpx/vp8dx.h>
  }
  
  namespace remoting {
@@ -22,15 +22,15 @@
 -#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"
++#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 @@
+@@ -841,10 +841,20 @@
                'cflags': [
                  '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
                ],
@@ -66,3 +66,13 @@
  
  typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
  
+--- a/src/remoting/remoting.gyp
++++ b/src/remoting/remoting.gyp
+@@ -114,7 +114,6 @@
+         '../gfx/gfx.gyp:gfx',
+         '../media/media.gyp:media',
+         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+-        '../third_party/libvpx/libvpx.gyp:libvpx_include',
+         '../third_party/zlib/zlib.gyp:zlib',
+         'chromoting_jingle_glue',
+         'proto/chromotocol.gyp:chromotocol_proto_lib',