[arch-commits] Commit in chromium/trunk (4 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Mar 28 20:30:22 EDT 2012


    Date: Wednesday, March 28, 2012 @ 20:30:21
  Author: foutrelis
Revision: 154476

upgpkg: chromium 18.0.1025.142-1

New upstream release.

Added:
  chromium/trunk/chromium-revert-jpeg-swizzle-r2.patch
Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/gcc-4.6.patch
Deleted:
  chromium/trunk/nacl-cflags-remove-fstack-protector.patch

-------------------------------------------+
 PKGBUILD                                  |   30 ++++++-------
 chromium-revert-jpeg-swizzle-r2.patch     |   61 ++++++++++++++++++++++++++++
 gcc-4.6.patch                             |   11 -----
 nacl-cflags-remove-fstack-protector.patch |   17 -------
 4 files changed, 75 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-28 23:30:51 UTC (rev 154475)
+++ PKGBUILD	2012-03-29 00:30:21 UTC (rev 154476)
@@ -9,7 +9,7 @@
 # build time.
 
 pkgname=chromium
-pkgver=17.0.963.83
+pkgver=18.0.1025.142
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('i686' 'x86_64')
@@ -31,15 +31,15 @@
         chromium.desktop
         chromium.sh
         gcc-4.6.patch
-        nacl-cflags-remove-fstack-protector.patch
-        chromium-media-no-sse-r0.patch)
-sha256sums=('fa1f684c3605b70243e337a98c4bf6e227da268cb0b8e2ebd42b6fccb798d93f'
-            '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
+        chromium-media-no-sse-r0.patch
+        chromium-revert-jpeg-swizzle-r2.patch)
+sha256sums=('911a4ee2e30ed617c4148c84dcddfd1affa4b2fc02dc5e95ac4a4afeeda24b1d'
+            '8cf762587e547588b9461686f7d2655d5a23d09e1260b5f97137fa7d41c767a9'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
-            '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
-            '59e732880314333d6e9acf6ac99de467c98e8a92aa5c5292ae808a805e0f8d76'
-            '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761')
+            '50268dafd436813f846ea174d19c447c64d198c3937bd56910d87c5206306977'
+            '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761'
+            'd99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
@@ -48,14 +48,12 @@
   # http://code.google.com/p/chromium/issues/detail?id=80071
   patch -Np0 -i "$srcdir/gcc-4.6.patch"
 
-  # Filter -fstack-protector out of cflags for nacl_helper_bootstrap
-  # http://code.google.com/p/chromium/issues/detail?id=104569
-  patch -d native_client -Np1 -i \
-    "$srcdir/nacl-cflags-remove-fstack-protector.patch"
-
   # Remove unconditional use of SSE3 (patch from Gentoo)
   patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch"
 
+  # Fix JPEG image rendering problem (patch from Gentoo bug #393471)
+  patch -Np0 -i "$srcdir/chromium-revert-jpeg-swizzle-r2.patch"
+
   # Use Python 2
   find . -type f -exec sed -i -r \
     -e 's|/usr/bin/python$|&2|g' \
@@ -67,10 +65,10 @@
   export PATH="$srcdir/python2-path:$PATH"
 
   pushd "$srcdir/nacl_sdk"
-  ./naclsdk update pepper_16
+  ./naclsdk update pepper_18
   popd
 
-  ln -s "$srcdir/nacl_sdk/pepper_16/toolchain/linux_x86_newlib" \
+  ln -s "$srcdir/nacl_sdk/pepper_18/toolchain/linux_x86_newlib" \
     native_client/toolchain/linux_x86_newlib
 
   # We need to disable system_ssl until "next protocol negotiation" support is
@@ -91,7 +89,7 @@
     -Duse_system_bzip2=1 \
     -Duse_system_ffmpeg=0 \
     -Duse_system_libevent=1 \
-    -Duse_system_libjpeg=0 \
+    -Duse_system_libjpeg=1 \
     -Duse_system_libpng=1 \
     -Duse_system_libxml=0 \
     -Duse_system_ssl=0 \

Added: chromium-revert-jpeg-swizzle-r2.patch
===================================================================
--- chromium-revert-jpeg-swizzle-r2.patch	                        (rev 0)
+++ chromium-revert-jpeg-swizzle-r2.patch	2012-03-29 00:30:21 UTC (rev 154476)
@@ -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) {

Modified: gcc-4.6.patch
===================================================================
--- gcc-4.6.patch	2012-03-28 23:30:51 UTC (rev 154475)
+++ gcc-4.6.patch	2012-03-29 00:30:21 UTC (rev 154476)
@@ -20,17 +20,6 @@
  
  typedef signed char         schar;
  typedef signed char         int8;
-diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h
---- ppapi/cpp/paint_aggregator.h	2011-04-13 13:22:58.000000000 +0400
-+++ ppapi/cpp/paint_aggregator.h	2011-04-20 20:11:44.000000000 +0400
-@@ -9,6 +9,7 @@
- 
- #include "ppapi/cpp/point.h"
- #include "ppapi/cpp/rect.h"
-+#include <cstddef>
- 
- namespace pp {
- 
 diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc
 --- third_party/ots/src/os2.cc	2011-04-13 13:24:06.000000000 +0400
 +++ third_party/ots/src/os2.cc	2011-04-20 19:45:44.000000000 +0400

Deleted: nacl-cflags-remove-fstack-protector.patch
===================================================================
--- nacl-cflags-remove-fstack-protector.patch	2012-03-28 23:30:51 UTC (rev 154475)
+++ nacl-cflags-remove-fstack-protector.patch	2012-03-29 00:30:21 UTC (rev 154476)
@@ -1,17 +0,0 @@
-Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp
-diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
-index 66d95ca4dc98653219c965b899dbd5ad35d2960c..083e3fdd24ff4562d2037f8d17a06540e05357b8 100644
---- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
-+++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
-@@ -84,6 +84,11 @@
-         '-fasan',
-         '-faddress-sanitizer',
-         '-w',
-+        # We filter these out because release_extra_cflags or another
-+        # such thing might be adding them in, and those options wind up
-+        # coming after the -fno-stack-protector we added above.
-+        '-fstack-protector',
-+        '-fstack-protector-all',
-       ],
-       'conditions': [
-         ['clang==1', {



More information about the arch-commits mailing list