[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-system-ffmpeg-r0.patch

[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-system-ffmpeg-r0.patch

[PaweA Hajdan (phajdan.jr)]

phajdan.jr    12/11/16 05:23:10

  Added:                chromium-system-ffmpeg-r0.patch
  Log:
  Add experimental support to build wih system ffmpeg.
  
  (Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 30427902)

Revision  Changes    Path
1.1                  www-client/chromium/files/chromium-system-ffmpeg-r0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?rev=1.1&content-type=text/plain

Index: chromium-system-ffmpeg-r0.patch
===================================================================
--- 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
@@ -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 {
 

[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-system-ffmpeg-r0.patch

[PaweA Hajdan (phajdan.jr)]

phajdan.jr    12/12/02 05:01:27

  Modified:             chromium-system-ffmpeg-r0.patch
  Log:
  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)

Revision  Changes    Path
1.2                  www-client/chromium/files/chromium-system-ffmpeg-r0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch?r1=1.1&r2=1.2

Index: chromium-system-ffmpeg-r0.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-system-ffmpeg-r0.patch	16 Nov 2012 05:23:10 -0000	1.1
+++ chromium-system-ffmpeg-r0.patch	2 Dec 2012 05:01:27 -0000	1.2
@@ -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',