| 1 |
phajdan.jr 11/01/03 14:57:26 |
| 2 |
|
| 3 |
Added: chromium-gecko-mediaplayer-r1.patch |
| 4 |
chromium-system-vpx-r2.patch |
| 5 |
Log: |
| 6 |
Rebase patches, bugs #349228 and #349234. Used patches by Mike Gilbert <floppymaster@×××××.com>, tested by Julien Sanchez <julien.sanchez@×××××.com>. |
| 7 |
|
| 8 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: chromium-gecko-mediaplayer-r1.patch |
| 17 |
=================================================================== |
| 18 |
--- webkit/glue/plugins/plugin_list.cc_posix.orig 2010-10-09 11:05:44.000000000 +0200 |
| 19 |
+++ webkit/plugins/npapi/plugin_list_posix.cc 2010-10-09 11:06:35.000000000 +0200 |
| 20 |
@@ -89,7 +89,9 @@ |
| 21 |
bool IsBlacklistedPlugin(const FilePath& path) { |
| 22 |
const char* kBlackListedPlugins[] = { |
| 23 |
"nppdf.so", // Adobe PDF |
| 24 |
+#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER |
| 25 |
"gecko-mediaplayer", // Gecko Media Player |
| 26 |
+#endif // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER |
| 27 |
}; |
| 28 |
std::string filename = path.BaseName().value(); |
| 29 |
for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) { |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 www-client/chromium/files/chromium-system-vpx-r2.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-vpx-r2.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-vpx-r2.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: chromium-system-vpx-r2.patch |
| 39 |
=================================================================== |
| 40 |
--- remoting/base/encoder_vp8.cc.orig 2010-11-10 09:52:56.000000000 +0100 |
| 41 |
+++ remoting/base/encoder_vp8.cc 2010-11-10 09:53:32.000000000 +0100 |
| 42 |
@@ -11,9 +11,9 @@ |
| 43 |
|
| 44 |
extern "C" { |
| 45 |
#define VPX_CODEC_DISABLE_COMPAT 1 |
| 46 |
-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" |
| 47 |
-#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" |
| 48 |
-#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" |
| 49 |
+#include "vpx/vpx_codec.h" |
| 50 |
+#include "vpx/vpx_encoder.h" |
| 51 |
+#include "vpx/vp8cx.h" |
| 52 |
} |
| 53 |
|
| 54 |
namespace remoting { |
| 55 |
--- remoting/base/decoder_vp8.cc.orig 2010-11-10 09:54:14.000000000 +0100 |
| 56 |
+++ remoting/base/decoder_vp8.cc 2010-11-10 09:54:37.000000000 +0100 |
| 57 |
@@ -10,9 +10,9 @@ |
| 58 |
|
| 59 |
extern "C" { |
| 60 |
#define VPX_CODEC_DISABLE_COMPAT 1 |
| 61 |
-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" |
| 62 |
-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" |
| 63 |
-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" |
| 64 |
+#include "vpx/vpx_codec.h" |
| 65 |
+#include "vpx/vpx_decoder.h" |
| 66 |
+#include "vpx/vp8dx.h" |
| 67 |
} |
| 68 |
|
| 69 |
namespace remoting { |
| 70 |
--- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig 2010-11-10 09:55:43.000000000 +0100 |
| 71 |
+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment 2010-11-10 09:56:09.000000000 +0100 |
| 72 |
@@ -7,9 +7,9 @@ |
| 73 |
#include <libavformat/avformat.h> |
| 74 |
|
| 75 |
#define VPX_CODEC_DISABLE_COMPAT 1 |
| 76 |
-#include "third_party/libvpx/include/vpx/vpx_codec.h" |
| 77 |
-#include "third_party/libvpx/include/vpx/vpx_encoder.h" |
| 78 |
-#include "third_party/libvpx/include/vpx/vpx_decoder.h" |
| 79 |
+#include "vpx/vpx_codec.h" |
| 80 |
+#include "vpx/vpx_encoder.h" |
| 81 |
+#include "vpx/vpx_decoder.h" |
| 82 |
|
| 83 |
typedef int (*AVLockMgrOperation)(void**, enum AVLockOp); |
| 84 |
|
| 85 |
--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-11-19 10:32:50.000000000 +0000 |
| 86 |
+++ third_party/ffmpeg/ffmpeg.gyp 2010-11-19 10:36:33.000000000 +0000 |
| 87 |
@@ -898,6 +898,16 @@ |
| 88 |
}, |
| 89 |
}], |
| 90 |
|
| 91 |
+ ['use_system_vpx!=0', { |
| 92 |
+ 'direct_dependent_settings': { |
| 93 |
+ 'link_settings': { |
| 94 |
+ 'libraries': [ |
| 95 |
+ '-lvpx', |
| 96 |
+ ], |
| 97 |
+ }, |
| 98 |
+ }, |
| 99 |
+ }], |
| 100 |
+ |
| 101 |
# Add pkg-config result to include path when use_system_ffmpeg!=0 |
| 102 |
['use_system_ffmpeg!=0', { |
| 103 |
'cflags': [ |
Archives