| 1 |
phajdan.jr 12/12/02 05:01:27 |
| 2 |
|
| 3 |
Modified: chromium-system-ffmpeg-r0.patch |
| 4 |
Log: |
| 5 |
Fix build with USE="-system-ffmpeg", bug #444432 by victor2008. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 30427902) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-client/chromium/files/chromium-system-ffmpeg-r0.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: chromium-system-ffmpeg-r0.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- chromium-system-ffmpeg-r0.patch 16 Nov 2012 05:23:10 -0000 1.1 |
| 23 |
+++ chromium-system-ffmpeg-r0.patch 2 Dec 2012 05:01:27 -0000 1.2 |
| 24 |
@@ -1,5 +1,7 @@ |
| 25 |
---- media/filters/ffmpeg_glue.h.orig 2012-11-16 00:05:30.196358339 +0000 |
| 26 |
-+++ media/filters/ffmpeg_glue.h 2012-11-16 00:05:50.604414879 +0000 |
| 27 |
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h |
| 28 |
+index 17241b9..8a92312 100644 |
| 29 |
+--- a/media/filters/ffmpeg_glue.h |
| 30 |
++++ b/media/filters/ffmpeg_glue.h |
| 31 |
@@ -28,9 +28,9 @@ |
| 32 |
#include "base/basictypes.h" |
| 33 |
#include "base/memory/scoped_ptr.h" |
| 34 |
@@ -11,3 +13,29 @@ |
| 35 |
|
| 36 |
namespace media { |
| 37 |
|
| 38 |
+diff --git a/media/media.gyp b/media/media.gyp |
| 39 |
+index df217d2..fde3830 100644 |
| 40 |
+--- a/media/media.gyp |
| 41 |
++++ b/media/media.gyp |
| 42 |
+@@ -363,6 +363,9 @@ |
| 43 |
+ 'dependencies': [ |
| 44 |
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
| 45 |
+ ], |
| 46 |
++ 'export_dependent_settings': [ |
| 47 |
++ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
| 48 |
++ ], |
| 49 |
+ }, { # use_ffmpeg == 0 |
| 50 |
+ # Exclude the sources that depend on ffmpeg. |
| 51 |
+ 'sources!': [ |
| 52 |
+diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi |
| 53 |
+index 81b770c..7b6d673 100644 |
| 54 |
+--- a/webkit/media/webkit_media.gypi |
| 55 |
++++ b/webkit/media/webkit_media.gypi |
| 56 |
+@@ -24,6 +24,7 @@ |
| 57 |
+ 'dependencies': [ |
| 58 |
+ '<(DEPTH)/base/base.gyp:base', |
| 59 |
+ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| 60 |
++ '<(DEPTH)/media/media.gyp:media', |
| 61 |
+ '<(DEPTH)/media/media.gyp:shared_memory_support', |
| 62 |
+ '<(DEPTH)/media/media.gyp:yuv_convert', |
| 63 |
+ '<(DEPTH)/skia/skia.gyp:skia', |
Archives