summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-02-01 20:11:58 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-02-01 20:11:58 +0000
commitcc809355c6000a054442b6444f79be3c6e42f59b (patch)
tree1c73db551410ee5f698a161492b5a55c5cdc17f5 /www-client/chromium/files
parentMarking mercurial-2.0 ppc for bug 393265 (diff)
downloadgentoo-2-cc809355c6000a054442b6444f79be3c6e42f59b.tar.gz
gentoo-2-cc809355c6000a054442b6444f79be3c6e42f59b.tar.bz2
gentoo-2-cc809355c6000a054442b6444f79be3c6e42f59b.zip
Version bump for dev channel release. Remove old.
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-gyp-settings-r0.patch11
-rw-r--r--www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch61
-rw-r--r--www-client/chromium/files/chromium-webkit-zlib-r0.patch49
3 files changed, 121 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-gyp-settings-r0.patch b/www-client/chromium/files/chromium-gyp-settings-r0.patch
new file mode 100644
index 000000000000..dfebcf3e8d24
--- /dev/null
+++ b/www-client/chromium/files/chromium-gyp-settings-r0.patch
@@ -0,0 +1,11 @@
+--- third_party/flac/flac.gyp.orig 2012-02-01 09:48:17.000000000 +0100
++++ third_party/flac/flac.gyp 2012-02-01 09:51:21.000000000 +0100
+@@ -93,7 +93,7 @@
+ 'targets': [
+ {
+ 'target_name': 'libflac',
+- 'type': 'settings',
++ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_SYSTEM_FLAC',
diff --git a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch
new file mode 100644
index 000000000000..1d21121f0cc6
--- /dev/null
+++ b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch
@@ -0,0 +1,61 @@
+This reverts http://trac.webkit.org/changeset/101286
+to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471
+
+Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+===================================================================
+--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970)
++++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286)
+@@ -67,24 +67,6 @@
+
+ #include <setjmp.h>
+
+-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN)
+-#define ASSUME_LITTLE_ENDIAN 0
+-#else
+-#define ASSUME_LITTLE_ENDIAN 1
+-#endif
+-
+-#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
+-#define TURBO_JPEG_RGB_SWIZZLE
+-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16)
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
+-#endif
+-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
+-#endif
+-
+ namespace WebCore {
+
+ struct decoder_error_mgr {
+@@ -270,7 +252,7 @@
+ case JCS_RGB:
+ case JCS_YCbCr:
+ // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
+- m_info.out_color_space = rgbOutputColorSpace();
++ m_info.out_color_space = JCS_RGB;
+ break;
+ case JCS_CMYK:
+ case JCS_YCCK:
+@@ -525,19 +507,6 @@
+ }
+
+ jpeg_decompress_struct* info = m_reader->info();
+-
+-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE)
+- if (turboSwizzled(info->out_color_space)) {
+- ASSERT(!m_scaled);
+- while (info->output_scanline < info->output_height) {
+- unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline));
+- if (jpeg_read_scanlines(info, &row, 1) != 1)
+- return false;
+- }
+- return true;
+- }
+-#endif
+-
+ JSAMPARRAY samples = m_reader->samples();
+
+ while (info->output_scanline < info->output_height) {
diff --git a/www-client/chromium/files/chromium-webkit-zlib-r0.patch b/www-client/chromium/files/chromium-webkit-zlib-r0.patch
new file mode 100644
index 000000000000..8332652a1785
--- /dev/null
+++ b/www-client/chromium/files/chromium-webkit-zlib-r0.patch
@@ -0,0 +1,49 @@
+--- webkit/support/webkit_support_gfx.cc.orig 2012-02-01 11:00:50.000000000 +0100
++++ webkit/support/webkit_support_gfx.cc 2012-02-01 11:04:21.000000000 +0100
+@@ -14,6 +14,12 @@
+ #else
+ #include "third_party/libpng/png.h"
+ #endif
++
++#if defined(USE_SYSTEM_ZLIB)
++#include <zlib.h>
++#else
++#include "third_party/zlib/zlib.h"
++#endif
+ }
+
+ namespace webkit_support {
+--- webkit/support/webkit_support.gypi.orig 2012-02-01 11:05:23.000000000 +0100
++++ webkit/support/webkit_support.gypi 2012-02-01 11:06:31.000000000 +0100
+@@ -140,6 +140,7 @@
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
++ '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+ ],
+ 'sources': [
+ 'webkit_support_gfx.h',
+--- webkit/support/webkit_support.gypi.orig 2012-02-01 12:46:29.000000000 +0100
++++ webkit/support/webkit_support.gypi 2012-02-01 12:47:09.000000000 +0100
+@@ -89,6 +89,7 @@
+ '<(DEPTH)/crypto/crypto.gyp:crypto',
+ '<(DEPTH)/net/net.gyp:net',
+ '<(DEPTH)/skia/skia.gyp:skia',
++ '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+ '<(DEPTH)/ui/ui.gyp:ui',
+ 'glue',
+ 'webkit_support_gfx',
+--- webkit/tools/test_shell/simple_clipboard_impl.cc.orig 2012-02-01 14:02:32.000000000 +0100
++++ webkit/tools/test_shell/simple_clipboard_impl.cc 2012-02-01 14:03:10.000000000 +0100
+@@ -11,7 +11,11 @@
+ #include "base/string16.h"
+ #include "googleurl/src/gurl.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
++#if defined(USE_SYSTEM_ZLIB)
++#include <zlib.h>
++#else
+ #include "third_party/zlib/zlib.h"
++#endif
+ #include "ui/base/clipboard/clipboard.h"
+ #include "ui/gfx/codec/png_codec.h"
+ #include "ui/gfx/size.h"