summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-12-02 05:01:27 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-12-02 05:01:27 +0000
commitae6d6847b503231f55ba83a74aad4781c7bd573a (patch)
tree632fc209eee4b27e81795a1dd9ce942587cf4b5e /www-client
parentold (diff)
downloadgentoo-2-ae6d6847b503231f55ba83a74aad4781c7bd573a.tar.gz
gentoo-2-ae6d6847b503231f55ba83a74aad4781c7bd573a.tar.bz2
gentoo-2-ae6d6847b503231f55ba83a74aad4781c7bd573a.zip
Fix build with USE="-system-ffmpeg", bug #444432 by victor2008.
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 30427902)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/files/chromium-system-ffmpeg-r0.patch32
2 files changed, 35 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 748456663efd..43d6bafc32ff 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.762 2012/11/30 23:47:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.763 2012/12/02 05:01:27 phajdan.jr Exp $
+
+ 02 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ files/chromium-system-ffmpeg-r0.patch:
+ Fix build with USE="-system-ffmpeg", bug #444432 by victor2008.
*chromium-24.0.1312.27 (30 Nov 2012)
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
index 774639aab3b6..04cb6f53cacd 100644
--- a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
@@ -1,5 +1,7 @@
---- media/filters/ffmpeg_glue.h.orig 2012-11-16 00:05:30.196358339 +0000
-+++ media/filters/ffmpeg_glue.h 2012-11-16 00:05:50.604414879 +0000
+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"
@@ -11,3 +13,29 @@
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',
++ ],
+ }, { # use_ffmpeg == 0
+ # Exclude the sources that depend on ffmpeg.
+ 'sources!': [
+diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
+index 81b770c..7b6d673 100644
+--- a/webkit/media/webkit_media.gypi
++++ b/webkit/media/webkit_media.gypi
+@@ -24,6 +24,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',