Author: arekm Date: Sun Feb 12 16:20:25 2012 GMT Module: packages Tag: DEVEL ---- Log message: - beta channel; up to 18.0.1025.11
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.177 -> 1.178) , gyp-system-minizip.patch (1.3 -> 1.4) , system-libs.patch (1.10 -> 1.11) , chromium-browser-pulse.patch (NONE -> 1.1.2.1) (NEW), chromium-revert-jpeg-swizzle-r2.patch (NONE -> 1.1) (NEW), chromium-revert-jpeg-swizzle-r0.patch (1.1 -> NONE) (REMOVED), dlopen-sonames.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.177 packages/chromium-browser/chromium-browser.spec:1.178 --- packages/chromium-browser/chromium-browser.spec:1.177 Thu Feb 9 22:39:14 2012 +++ packages/chromium-browser/chromium-browser.spec Sun Feb 12 17:20:20 2012 @@ -50,12 +50,12 @@ %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser -Version: 17.0.963.46 -Release: 2 +Version: 18.0.1025.11 +Release: 1 License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz -# Source0-md5: 2799babdc6837530775219ff8a1b322b +# Source0-md5: 0bde819c093c1de4b76955608dcccc00 #SourceX: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz Source2: %{name}.sh Source3: %{name}.desktop @@ -72,11 +72,11 @@ Patch7: dlopen_sonamed_gl.patch Patch8: chromium_useragent.patch.in Patch9: system-expat.patch -Patch10: dlopen-sonames.patch +Patch10: %{name}-pulse.patch # https://bugs.gentoo.org/show_bug.cgi?id=393471 # libjpeg-turbo >= 1.1.90 supports that feature # but there is no autodetection currently, so revert for now -Patch11: chromium-revert-jpeg-swizzle-r0.patch +Patch11: chromium-revert-jpeg-swizzle-r2.patch URL: http://www.chromium.org/Home %{?with_gconf:BuildRequires: GConf2-devel} BuildRequires: OpenGL-GLU-devel @@ -214,9 +214,7 @@ %patch7 -p1 cd src %patch9 -p1 -cd .. %patch10 -p1 -cd src %patch11 -p0 cd .. @@ -393,6 +391,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.178 2012/02/12 16:20:20 arekm +- beta channel; up to 18.0.1025.11 + Revision 1.177 2012/02/09 21:39:14 arekm - release 2 ================================================================ Index: packages/chromium-browser/gyp-system-minizip.patch diff -u packages/chromium-browser/gyp-system-minizip.patch:1.3 packages/chromium-browser/gyp-system-minizip.patch:1.4 --- packages/chromium-browser/gyp-system-minizip.patch:1.3 Fri Jan 6 00:21:40 2012 +++ packages/chromium-browser/gyp-system-minizip.patch Sun Feb 12 17:20:20 2012 @@ -83,3 +83,14 @@ #if defined(OS_WIN) #include "third_party/zlib/contrib/minizip/iowin32.h" #endif +--- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~ 2012-02-12 16:37:27.000000000 +0100 ++++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc 2012-02-12 16:53:51.341474034 +0100 +@@ -10,7 +10,7 @@ + #if defined(OS_WIN) + #include "third_party/zlib/contrib/minizip/iowin32.h" + #elif defined(OS_POSIX) +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include <minizip/ioapi.h> + #endif + + namespace { ================================================================ Index: packages/chromium-browser/system-libs.patch diff -u packages/chromium-browser/system-libs.patch:1.10 packages/chromium-browser/system-libs.patch:1.11 --- packages/chromium-browser/system-libs.patch:1.10 Fri Jan 6 00:21:40 2012 +++ packages/chromium-browser/system-libs.patch Sun Feb 12 17:20:20 2012 @@ -42,14 +42,15 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" ---- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig 2011-07-19 04:00:59.000000000 +0200 -+++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc 2011-07-22 20:43:47.608727449 +0200 -@@ -17,7 +17,7 @@ +--- a/src/chrome/common/metrics/metrics_log_base.cc~ 2012-02-09 03:36:29.000000000 +0100 ++++ b/src/chrome/common/metrics/metrics_log_base.cc 2012-02-12 16:17:46.992725484 +0100 +@@ -10,7 +10,7 @@ #include "base/perftimer.h" #include "base/string_number_conversions.h" #include "base/sys_info.h" -#include "base/third_party/nspr/prtime.h" +#include <nspr/prtime.h> - #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/logging_chrome.h" + #include "libxml/xmlwriter.h" + ================================================================ Index: packages/chromium-browser/chromium-browser-pulse.patch diff -u /dev/null packages/chromium-browser/chromium-browser-pulse.patch:1.1.2.1 --- /dev/null Sun Feb 12 17:20:26 2012 +++ packages/chromium-browser/chromium-browser-pulse.patch Sun Feb 12 17:20:20 2012 @@ -0,0 +1,81 @@ +diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc +index c58d5bf..55ce3d2 100644 +--- a/media/audio/pulse/pulse_output.cc ++++ b/media/audio/pulse/pulse_output.cc +@@ -126,7 +126,7 @@ void PulseAudioOutputStream::WriteRequestCallback(pa_stream* playback_handle, + PulseAudioOutputStream* stream = + reinterpret_cast<PulseAudioOutputStream*>(stream_addr); + +- DCHECK_EQ(stream->manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(stream->manager_->GetMessageLoop()->BelongsToCurrentThread()); + + stream->write_callback_handled_ = true; + +@@ -153,7 +153,7 @@ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, + write_callback_handled_(false), + ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + source_callback_(NULL) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + // TODO(slock): Sanity check input values. + } +@@ -167,7 +167,7 @@ PulseAudioOutputStream::~PulseAudioOutputStream() { + } + + bool PulseAudioOutputStream::Open() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + // TODO(slock): Possibly move most of this to an OpenPlaybackDevice function + // in a new class 'pulse_util', like alsa_util. +@@ -270,7 +270,7 @@ void PulseAudioOutputStream::Reset() { + } + + void PulseAudioOutputStream::Close() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + Reset(); + +@@ -280,7 +280,7 @@ void PulseAudioOutputStream::Close() { + } + + void PulseAudioOutputStream::WaitForWriteRequest() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + if (stream_stopped_) + return; +@@ -382,7 +382,7 @@ void PulseAudioOutputStream::WriteToStream(size_t bytes_to_write, + } + + void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + CHECK(callback); + DLOG_IF(ERROR, !playback_handle_) + << "Open() has not been called successfully"; +@@ -402,19 +402,19 @@ void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { + } + + void PulseAudioOutputStream::Stop() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + stream_stopped_ = true; + } + + void PulseAudioOutputStream::SetVolume(double volume) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + volume_ = static_cast<float>(volume); + } + + void PulseAudioOutputStream::GetVolume(double* volume) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + *volume = volume_; + } ================================================================ Index: packages/chromium-browser/chromium-revert-jpeg-swizzle-r2.patch diff -u /dev/null packages/chromium-browser/chromium-revert-jpeg-swizzle-r2.patch:1.1 --- /dev/null Sun Feb 12 17:20:26 2012 +++ packages/chromium-browser/chromium-revert-jpeg-swizzle-r2.patch Sun Feb 12 17:20:20 2012 @@ -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) { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.177&r2=1.178&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/gyp-system-minizip.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
