[packages/chromium-browser/DEVEL] up to 26.0.1410.28; libvpx patch outdated
glen
glen at pld-linux.org
Thu Mar 7 11:58:41 CET 2013
commit 40a3ea766be40f2f20329b6968b39a2668dccc46
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Mar 7 11:48:57 2013 +0200
up to 26.0.1410.28; libvpx patch outdated
chromium-browser.spec | 4 +--
system-ffmpeg.patch | 10 +++---
system-libvpx.patch | 93 ---------------------------------------------------
3 files changed, 5 insertions(+), 102 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 59de7b4..a47c82f 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -64,7 +64,7 @@
# http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
%define branch 26.0.1410
-%define basever 19
+%define basever 28
#define patchver 70
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -114,7 +114,6 @@ Patch26: master-prefs-path.patch
Patch27: tcmalloc-glibc2.16.patch
Patch28: system-mesa.patch
Patch29: speechd-0.8.patch
-Patch30: system-libvpx.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -300,7 +299,6 @@ cd ..
%patch24 -p1
%patch26 -p1
%patch29 -p1
-%patch30 -p2
cd src
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 6108254..7252af5 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -13,18 +13,16 @@ index 17241b9..8a92312 100644
namespace media {
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
+--- chromium-browser-26.0.1410.28/media/media.gyp~ 2013-03-07 10:20:52.000000000 +0200
++++ chromium-browser-26.0.1410.28/media/media.gyp 2013-03-07 10:22:28.357340017 +0200
+@@ -430,6 +430,9 @@
'dependencies': [
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
+ 'export_dependent_settings': [
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
- }, { # use_ffmpeg == 0
+ }, { # media_use_ffmpeg == 0
# Exclude the sources that depend on ffmpeg.
'sources!': [
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000
diff --git a/system-libvpx.patch b/system-libvpx.patch
deleted file mode 100644
index 3334847..0000000
--- a/system-libvpx.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-http://crbug.com/174287
---- branches/1410/src/media/media.gyp 2013/03/05 22:36:07 186272
-+++ branches/1410/src/media/media.gyp 2013/03/05 22:37:51 186273
-@@ -12,12 +12,12 @@
- 'conditions': [
- ['OS == "android" or OS == "ios"', {
- # Android and iOS don't use ffmpeg.
-- 'use_ffmpeg%': 0,
-+ 'media_use_ffmpeg%': 0,
- # Android and iOS don't use libvpx.
-- 'use_libvpx%': 0,
-+ 'media_use_libvpx%': 0,
- }, { # 'OS != "android" and OS != "ios"'
-- 'use_ffmpeg%': 1,
-- 'use_libvpx%': 1,
-+ 'media_use_ffmpeg%': 1,
-+ 'media_use_libvpx%': 1,
- }],
- # Screen capturer works only on Windows, OSX and Linux.
- ['OS=="win" or OS=="mac" or OS=="linux"', {
-@@ -426,14 +426,14 @@
- 'yuv_convert',
- ],
- }],
-- ['use_ffmpeg == 1', {
-+ ['media_use_ffmpeg == 1', {
- 'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- ],
- 'export_dependent_settings': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- ],
-- }, { # use_ffmpeg == 0
-+ }, { # media_use_ffmpeg == 0
- # Exclude the sources that depend on ffmpeg.
- 'sources!': [
- 'base/media_posix.cc',
-@@ -458,11 +458,16 @@
- 'webm/webm_stream_parser.h',
- ],
- }],
-- ['use_libvpx == 1', {
-+ ['media_use_libvpx == 1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
- ],
-- }, { # use_libvpx == 0
-+ }, { # media_use_libvpx == 0
-+ 'direct_dependent_settings': {
-+ 'defines': [
-+ 'MEDIA_DISABLE_LIBVPX',
-+ ],
-+ },
- # Exclude the sources that depend on libvpx.
- 'sources!': [
- 'filters/vpx_video_decoder.cc',
-@@ -853,7 +858,7 @@
- 'yuv_convert',
- ],
- }],
-- ['use_ffmpeg == 1', {
-+ ['media_use_ffmpeg == 1', {
- 'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- ],
---- branches/1410/src/webkit/media/filter_helpers.cc 2013/03/05 22:36:07 186272
-+++ branches/1410/src/webkit/media/filter_helpers.cc 2013/03/05 22:37:51 186273
-@@ -45,11 +45,15 @@
- new media::FFmpegVideoDecoder(message_loop);
- filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
-
-+ // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
-+ // (http://crbug.com/174287) .
-+#if !defined(MEDIA_DISABLE_LIBVPX)
- if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
- scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder =
- new media::VpxVideoDecoder(message_loop);
- filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder);
- }
-+#endif // defined(MEDIA_USE_LIBVPX)
- }
-
- bool BuildMediaStreamCollection(
---- branches/1410/src/webkit/media/webkit_media.gypi 2013/03/05 22:36:07 186272
-+++ branches/1410/src/webkit/media/webkit_media.gypi 2013/03/05 22:37:51 186273
-@@ -34,6 +34,7 @@
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-+ '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/media/media.gyp:shared_memory_support',
- '<(DEPTH)/media/media.gyp:yuv_convert',
- '<(DEPTH)/skia/skia.gyp:skia',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/40a3ea766be40f2f20329b6968b39a2668dccc46
More information about the pld-cvs-commit
mailing list