diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2013-03-01 20:56:03 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2013-03-01 20:56:03 +0000 |
| commit | a001a63d46ecd774952435cc64ee12b71c153d68 (patch) | |
| tree | d64e58dae5f24e359ad4bd2bf42073ceff02d74a /www-client | |
| parent | Backport build fix from bug #454216 to stable (bug #459668 by Diego Elio Pett... (diff) | |
| download | gentoo-2-a001a63d46ecd774952435cc64ee12b71c153d68.tar.gz gentoo-2-a001a63d46ecd774952435cc64ee12b71c153d68.tar.bz2 gentoo-2-a001a63d46ecd774952435cc64ee12b71c153d68.zip | |
Add missing patch, reported by Andrei Frunza.
(Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-system-ffmpeg-r4.patch | 40 |
2 files changed, 45 insertions, 1 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index e00407908ba8..18a4249fdd1d 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.822 2013/03/01 18:01:14 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.823 2013/03/01 20:56:02 phajdan.jr Exp $ + + 01 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +files/chromium-system-ffmpeg-r4.patch: + Add missing patch, reported by Andrei Frunza. *chromium-27.0.1425.0 (01 Mar 2013) diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch new file mode 100644 index 000000000000..9ea68f185681 --- /dev/null +++ b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch @@ -0,0 +1,40 @@ +diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h +index 17241b9..8a92312 100644 +--- a/media/filters/ffmpeg_glue.h ++++ b/media/filters/ffmpeg_glue.h +@@ -28,9 +28,9 @@ + #include "base/basictypes.h" + #include "base/memory/scoped_ptr.h" + #include "media/base/media_export.h" ++#include "media/ffmpeg/ffmpeg_common.h" + + struct AVFormatContext; +-struct AVIOContext; + + 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 @@ + 'dependencies': [ + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], ++ 'export_dependent_settings': [ ++ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ++ ], + }, { # 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 ++++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 +@@ -10,6 +10,8 @@ + #include "media/base/video_frame.h" + #include "media/base/video_util.h" + ++#undef SampleFormat ++ + namespace media { + + // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are |