packages: chromium-browser/chromium-browser.spec, chromium-browser/gyp-syst...

glen glen at pld-linux.org
Fri Mar 30 00:24:14 CEST 2012 

Author: glen                         Date: Thu Mar 29 22:24:14 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged 18.0.1024.142 from DEVEL (now also stable branch)

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.183 -> 1.184) , gyp-system-minizip.patch (1.5 -> 1.6) , system-libs.patch (1.12 -> 1.13) , chromium-browser-pulse.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.183 packages/chromium-browser/chromium-browser.spec:1.184
--- packages/chromium-browser/chromium-browser.spec:1.183	Thu Mar 22 10:28:23 2012
+++ packages/chromium-browser/chromium-browser.spec	Fri Mar 30 00:24:08 2012
@@ -21,6 +21,7 @@
 %bcond_without	system_vpx		# with system vpx
 %bcond_without	system_yasm		# with system yasm
 %bcond_without	system_zlib		# with system zlib
+%bcond_without	libjpegturbo		# use libjpeg-turbo features
 %bcond_with		verbose			# verbose build (V=1)
 
 # TODO
@@ -50,13 +51,12 @@
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	17.0.963.83
+Version:	18.0.1025.142
 Release:	1
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
-# Source0-md5:	55eb30a093f060e718c4b69fd8ab5d7b
-#SourceX:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
+# Source0-md5:	6e1313b57234c1f3414cff27e0865d99
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source5:	find-lang.sh
@@ -72,11 +72,10 @@
 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
@@ -99,6 +98,7 @@
 %{?with_keyring:BuildRequires:	libgnome-keyring-devel}
 BuildRequires:	libicu-devel >= 4.6
 BuildRequires:	libjpeg-devel
+%{?with_libjpegturbo:BuildRequires:	libjpeg-turbo-devel >= 1.2.0}
 BuildRequires:	libpng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libstdc++-devel
@@ -138,6 +138,7 @@
 Requires:	hicolor-icon-theme
 %{?with_system_vpx:Requires:	libvpx >= 0.9.5-2}
 Requires:	xdg-utils >= 1.0.2-4
+%{?with_libjpegturbo:Requires:	libjpeg-turbo >= 1.2.0}
 Provides:	wwwbrowser
 Obsoletes:	chromium-browser-bookmark_manager < 5.0.388.0
 Obsoletes:	chromium-browser-inspector < 15.0.863.0
@@ -214,10 +215,8 @@
 %patch7 -p1
 cd src
 %patch9 -p1
-cd ..
 %patch10 -p1
-cd src
-%patch11 -p0
+%{!?with_libjpegturbo:%patch11 -p0}
 cd ..
 
 cd src
@@ -393,6 +392,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2012/03/29 22:24:08  glen
+- merged 18.0.1024.142 from DEVEL (now also stable branch)
+
+Revision 1.177.2.11  2012/03/29 13:25:03  arekm
+- up to 18.0.1024.142
+
+Revision 1.177.2.10  2012/03/27 08:10:17  arekm
+- up to 18.0.1025.140
+
+Revision 1.177.2.9  2012/03/20 14:02:24  arekm
+- up to 18.0.1025.113
+
+Revision 1.177.2.8  2012/03/18 09:53:43  arekm
+- up to 18.0.1025.108
+
+Revision 1.177.2.7  2012/03/16 18:39:07  arekm
+- up to 18.0.1025
+
+Revision 1.177.2.6  2012/03/12 22:10:07  arekm
+- up to 18.0.1025.56
+
+Revision 1.177.2.5  2012/03/08 21:43:54  arekm
+- up to 18.0.1025.54
+
+Revision 1.177.2.4  2012/03/01 10:20:06  arekm
+- up to 18.0.1025.45
+
+Revision 1.177.2.3  2012/02/28 21:27:06  arekm
+- rel 2; depend on libjpeg-turbo >= 1.2.0 instead of disabling some features (that are not supported by non-turbo libjpeg)
+
+Revision 1.177.2.2  2012/02/23 20:23:55  arekm
+- up to 18.0.1025.39
+
+Revision 1.177.2.1  2012/02/16 17:40:13  arekm
+- up to 18.0.1025.33
+
 Revision 1.183  2012/03/22 09:28:23  glen
 - up to 17.0.963.83
 

================================================================
Index: packages/chromium-browser/gyp-system-minizip.patch
diff -u packages/chromium-browser/gyp-system-minizip.patch:1.5 packages/chromium-browser/gyp-system-minizip.patch:1.6
--- packages/chromium-browser/gyp-system-minizip.patch:1.5	Thu Feb 16 18:47:27 2012
+++ packages/chromium-browser/gyp-system-minizip.patch	Fri Mar 30 00:24:08 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.12 packages/chromium-browser/system-libs.patch:1.13
--- packages/chromium-browser/system-libs.patch:1.12	Thu Feb 16 18:47:27 2012
+++ packages/chromium-browser/system-libs.patch	Fri Mar 30 00:24:08 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.2
--- /dev/null	Fri Mar 30 00:24:14 2012
+++ packages/chromium-browser/chromium-browser-pulse.patch	Fri Mar 30 00:24:08 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_;
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.spec?r1=1.183&r2=1.184
    http://cvs.pld-linux.org/packages/chromium-browser/gyp-system-minizip.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/chromium-browser/system-libs.patch?r1=1.12&r2=1.13
    http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser-pulse.patch?r1=1.1&r2=1.2

More information about the pld-cvs-commit mailing list