diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-06 03:08:14 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-06 03:08:14 +0000 |
| commit | 4b85a604764f917f137ea137f654a6194f42bed5 (patch) | |
| tree | 175c07b5bd7731b0fa88b7bf891b53772bfd25f9 /www-client/chromium/files | |
| parent | Revision bump to disable static libs and remove la files because they are not... (diff) | |
| download | gentoo-2-4b85a604764f917f137ea137f654a6194f42bed5.tar.gz gentoo-2-4b85a604764f917f137ea137f654a6194f42bed5.tar.bz2 gentoo-2-4b85a604764f917f137ea137f654a6194f42bed5.zip | |
Version bump for dev channel release. Includes a workaround for upstream http://crbug.com/50678, reported to me by Julien Sanchez <julien.sanchez@gmail.com>. Removed old ebuilds.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium/files')
| -rw-r--r-- | www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch b/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch new file mode 100644 index 000000000000..183598ff536f --- /dev/null +++ b/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch @@ -0,0 +1,58 @@ +--- media/filters/ffmpeg_glue.cc.orig 2010-08-05 15:27:11.000000000 +0200 ++++ media/filters/ffmpeg_glue.cc 2010-08-05 15:27:25.000000000 +0200 +@@ -134,7 +134,7 @@ + + // Register our protocol glue code with FFmpeg. + avcodec_init(); +- av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol)); ++ av_register_protocol(&kFFmpegURLProtocol); + av_lockmgr_register(&LockManagerOperation); + + // Now register the rest of FFmpeg. +--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-08-05 18:25:34.000000000 +0200 ++++ third_party/ffmpeg/ffmpeg.gyp 2010-08-05 18:29:12.000000000 +0200 +@@ -836,10 +836,20 @@ + 'cflags': [ + '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + ], ++ 'link_settings': { ++ 'libraries': [ ++ '<!@(pkg-config --libs libavcodec libavformat libavutil)', ++ ], ++ }, + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + ], ++ 'link_settings': { ++ 'libraries': [ ++ '<!@(pkg-config --libs libavcodec libavformat libavutil)', ++ ], ++ }, + }, + }, { # else use_system_ffmpeg==0, add local copy to include path + 'include_dirs': [ +--- media/base/media_posix.cc.orig 2010-08-06 02:17:43.000000000 +0200 ++++ media/base/media_posix.cc 2010-08-06 02:18:00.000000000 +0200 +@@ -72,20 +72,7 @@ + // Attempts to initialize the media library (loading DSOs, etc.). + // Returns true if everything was successfully initialized, false otherwise. + bool InitializeMediaLibrary(const FilePath& module_dir) { +- // TODO(ajwong): We need error resolution. +- tp_ffmpeg::StubPathMap paths; +- for (int i = 0; i < static_cast<int>(tp_ffmpeg::kNumStubModules); ++i) { +- tp_ffmpeg::StubModules module = static_cast<tp_ffmpeg::StubModules>(i); +- +- // Add the sumo library first so it takes precedence. +- paths[module].push_back(module_dir.Append(sumo_name).value()); +- +- // Add the more specific FFmpeg library name. +- FilePath path = module_dir.Append(GetDSOName(module)); +- paths[module].push_back(path.value()); +- } +- +- return tp_ffmpeg::InitializeStubs(paths); ++ return true; + } + + #if defined(OS_LINUX) |