[packages/chromium-browser/dev-27: 2/3] builds as: --without tcmalloc --without nacl
glen
glen at pld-linux.org
Fri Mar 29 13:12:57 CET 2013
commit 2e9c61585413872841d9e260af231284c2600bcd
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Mar 28 11:49:13 2013 +0200
builds as: --without tcmalloc --without nacl
chromium-browser.spec | 12 +--
chromium-ppapi.patch | 13 ---
harfbuzz-0.13.patch | 15 ----
master-prefs-path.patch | 2 +-
system-ffmpeg.patch | 181 ++++---------------------------------
system-jsoncpp.patch | 18 ----
system-mesa.patch | 234 ------------------------------------------------
system-nspr.patch | 33 -------
8 files changed, 17 insertions(+), 491 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 9d01c65..41f00d4 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -77,7 +77,7 @@ Version: %{branch}.%{basever}
Release: 0.1
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
-Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{branch}.%{basever}.tar.xz
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{branch}.%{basever}.tar.gz
# Source0-md5: eafd6a919faadc8a7446cd673f460c4c
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
@@ -92,13 +92,11 @@ Source7: clean-source.sh
Source8: get-source.sh
Source9: master_preferences.json
Patch1: plugin-searchdirs.patch
-#Patch2: system-nspr.patch
Patch3: disable_dlog_and_dcheck_in_release_builds.patch
Patch4: path-libpdf.patch
Patch6: get-webkit_revision.patch
Patch7: dlopen_sonamed_gl.patch
Patch8: chromium_useragent.patch.in
-Patch9: chromium-ppapi.patch
Patch10: system-libxnvctrl.patch
# https://bugs.gentoo.org/show_bug.cgi?id=393471
# libjpeg-turbo >= 1.1.90 supports that feature
@@ -107,14 +105,12 @@ Patch12: system-ffmpeg.patch
Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
Patch18: nacl-no-untar.patch
-Patch19: system-jsoncpp.patch
Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
Patch27: tcmalloc-glibc2.16.patch
Patch28: system-mesa.patch
Patch29: speechd-0.8.patch
-Patch30: harfbuzz-0.13.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -286,12 +282,9 @@ ln -s %{SOURCE7} .
%patch7 -p2
%patch10 -p2
%patch15 -p2
-%patch9 -p0
-#%patch2 -p1
%{!?with_libjpegturbo:%patch11 -p0}
%patch12 -p1
%patch16 -p1
-%patch19 -p2
%patch27 -p1
%patch28 -p1
%patch25 -p2
@@ -299,9 +292,6 @@ ln -s %{SOURCE7} .
%patch24 -p2
%patch26 -p2
%patch29 -p2
-cd third_party/WebKit
-%patch30 -p1
-cd -
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
diff --git a/chromium-ppapi.patch b/chromium-ppapi.patch
deleted file mode 100644
index d0dcf99..0000000
--- a/chromium-ppapi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-from gentoo chromium-ppapi-r0.patch
-
---- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
-+++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
-@@ -80,7 +80,7 @@
- ],
- },
- 'conditions': [
-- ['target_arch!="arm"', {
-+ ['target_arch!="arm" and disable_glibc==0', {
- 'variables': {
- 'build_glibc': 1,
- # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
diff --git a/harfbuzz-0.13.patch b/harfbuzz-0.13.patch
deleted file mode 100644
index d540bcf..0000000
--- a/harfbuzz-0.13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://crbug.com/223500
-http://trac.webkit.org/changeset/143337/trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
-
-Index: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
-===================================================================
---- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (revision 142928)
-+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (revision 143337)
-@@ -330,4 +330,7 @@
- if (shouldSetDirection)
- hb_buffer_set_direction(harfBuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
-+ else
-+ // Leaving direction to HarfBuzz to guess is *really* bad, but will do for now.
-+ hb_buffer_guess_segment_properties(harfBuzzBuffer.get());
-
- // Add a space as pre-context to the buffer. This prevents showing dotted-circle
diff --git a/master-prefs-path.patch b/master-prefs-path.patch
index b037842..abccc61 100644
--- a/master-prefs-path.patch
+++ b/master-prefs-path.patch
@@ -6,7 +6,7 @@
base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
-+ master_prefs = FilePath("/etc/chromium-browser");
++ master_prefs = base::FilePath("/etc/chromium-browser");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 7252af5..0bf19a1 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,3 +1,13 @@
+--- chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py~ 2013-03-27 03:14:02.000000000 +0200
++++ chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py 2013-03-27 23:48:09.802791538 +0200
+@@ -40,6 +40,7 @@
+ o_path = os.path.join(tmpdir, 'test.o')
+
+ cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
++ shell=True,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ cxx_stdout, cxx_stderr = cxx_popen.communicate()
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
index 17241b9..8a92312 100644
--- a/media/filters/ffmpeg_glue.h
@@ -13,9 +23,11 @@ index 17241b9..8a92312 100644
namespace media {
---- chromium-browser-26.0.1410.28/media/media.gyp~ 2013-03-07 10:20:52.000000000 +0200
-+++ chromium-browser-26.0.1410.28/media/media.gyp 2013-03-07 10:22:28.357340017 +0200
-@@ -430,6 +430,9 @@
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
'dependencies': [
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
@@ -36,166 +48,3 @@ index 17241b9..8a92312 100644
namespace media {
// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
-Index: build/common.gypi
-diff --git a/build/common.gypi b/build/common.gypi
-index 34c6a15e0add1001e4a24712c9c809e3b698a390..521decfa19d102263086ebf4de7c8bac74c95e30 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -741,6 +741,9 @@
- 'google_default_client_secret%': '<(google_default_client_secret)',
- 'enable_managed_users%': '<(enable_managed_users)',
-
-+ # Use system ffmpeg instead of bundled one.
-+ 'use_system_ffmpeg%': 0,
-+
- # Use system mesa instead of bundled one.
- 'use_system_mesa%': 0,
-
-Index: media/ffmpeg/ffmpeg_common.cc
-diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
-index 26953efc699a0dc1ce9cd951eb47b04713974b44..bf234304aa2b26fb7e0f729a4e75257099c00358 100644
---- a/media/ffmpeg/ffmpeg_common.cc
-+++ b/media/ffmpeg/ffmpeg_common.cc
-@@ -84,8 +84,10 @@ AudioCodec CodecIDToAudioCodec(CodecID codec_id) {
- return kCodecGSM_MS;
- case CODEC_ID_PCM_MULAW:
- return kCodecPCM_MULAW;
-+#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
- case CODEC_ID_OPUS:
- return kCodecOpus;
-+#endif
- default:
- DVLOG(1) << "Unknown audio CodecID: " << codec_id;
- }
-@@ -129,8 +131,10 @@ static CodecID AudioCodecToCodecID(AudioCodec audio_codec,
- return CODEC_ID_GSM_MS;
- case kCodecPCM_MULAW:
- return CODEC_ID_PCM_MULAW;
-+#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
- case kCodecOpus:
- return CODEC_ID_OPUS;
-+#endif
- default:
- DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
- }
-@@ -147,8 +151,10 @@ VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
- return kCodecMPEG4;
- case CODEC_ID_VP8:
- return kCodecVP8;
-+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
- case AV_CODEC_ID_VP9:
- return kCodecVP9;
-+#endif
- default:
- DVLOG(1) << "Unknown video CodecID: " << codec_id;
- }
-@@ -165,8 +171,10 @@ static CodecID VideoCodecToCodecID(VideoCodec video_codec) {
- return CODEC_ID_MPEG4;
- case kCodecVP8:
- return CODEC_ID_VP8;
-+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
- case kCodecVP9:
- return AV_CODEC_ID_VP9;
-+#endif
- default:
- DVLOG(1) << "Unknown VideoCodec: " << video_codec;
- }
-@@ -468,8 +476,10 @@ ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout, int channels) {
- return CHANNEL_LAYOUT_6_1_FRONT;
- case AV_CH_LAYOUT_7POINT0_FRONT:
- return CHANNEL_LAYOUT_7_0_FRONT;
-+#ifdef AV_CH_LAYOUT_7POINT1_WIDE_BACK
- case AV_CH_LAYOUT_7POINT1_WIDE_BACK:
- return CHANNEL_LAYOUT_7_1_WIDE_BACK;
-+#endif
- case AV_CH_LAYOUT_OCTAGONAL:
- return CHANNEL_LAYOUT_OCTAGONAL;
- default:
-Index: media/media.gyp
-diff --git a/media/media.gyp b/media/media.gyp
-index f514dec48e5cc78567d141f20e2cb970a8707e92..75b62bebb503e2d9488bf0fc5cec3fd0a7e1916d 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -469,6 +469,18 @@
- 'filters/vpx_video_decoder.h',
- ],
- }],
-+ ['use_system_ffmpeg == 1', {
-+ 'defines': [
-+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+ '--code "#include <libavcodec/avcodec.h>\n'
-+ 'int test() { return CODEC_ID_OPUS; }" '
-+ '--on-failure CHROMIUM_OMIT_CODEC_ID_OPUS)',
-+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+ '--code "#include <libavcodec/avcodec.h>\n'
-+ 'int test() { return AV_CODEC_ID_VP9; }" '
-+ '--on-failure CHROMIUM_OMIT_AV_CODEC_ID_VP9)',
-+ ],
-+ }],
- ['OS == "ios"', {
- 'includes': [
- # For shared_memory_support_sources variable.
-Index: tools/compile_test/compile_test.py
-diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
-new file mode 100755
-index 0000000000000000000000000000000000000000..a52c0720209142af858d656a071ca43328dd3b16
---- /dev/null
-+++ b/tools/compile_test/compile_test.py
-@@ -0,0 +1,57 @@
-+#!/usr/bin/env python
-+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+"""
-+Tries to compile given code, produces different output depending on success.
-+
-+This is similar to checks done by ./configure scripts.
-+"""
-+
-+
-+import optparse
-+import os
-+import shutil
-+import subprocess
-+import sys
-+import tempfile
-+
-+
-+def DoMain(argv):
-+ parser = optparse.OptionParser()
-+ parser.add_option('--code')
-+ parser.add_option('--on-success', default='')
-+ parser.add_option('--on-failure', default='')
-+
-+ options, args = parser.parse_args(argv)
-+
-+ if not options.code:
-+ parser.error('Missing required --code switch.')
-+
-+ cxx = os.environ.get('CXX', 'g++')
-+
-+ tmpdir = tempfile.mkdtemp()
-+ try:
-+ cxx_path = os.path.join(tmpdir, 'test.cc')
-+ with open(cxx_path, 'w') as f:
-+ f.write(options.code.decode('string-escape'))
-+
-+ o_path = os.path.join(tmpdir, 'test.o')
-+
-+ cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'], shell=True,
-+ stdout=subprocess.PIPE,
-+ stderr=subprocess.PIPE)
-+ cxx_stdout, cxx_stderr = cxx_popen.communicate()
-+ if cxx_popen.returncode == 0:
-+ print options.on_success
-+ else:
-+ print options.on_failure
-+ finally:
-+ shutil.rmtree(tmpdir)
-+
-+ return 0
-+
-+
-+if __name__ == '__main__':
-+ sys.exit(DoMain(sys.argv[1:]))
diff --git a/system-jsoncpp.patch b/system-jsoncpp.patch
deleted file mode 100644
index 9f7d57e..0000000
--- a/system-jsoncpp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Adjust include path for system jsoncpp
-
-https://src.chromium.org/viewvc/chrome?view=rev&revision=183190
-
---- a/src/third_party/jsoncpp/jsoncpp.gyp
-+++ b/src/third_party/jsoncpp/jsoncpp.gyp
-@@ -66,6 +66,11 @@
- 'includes': [
- '../../build/shim_headers.gypi',
- ],
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '/usr/include/jsoncpp',
-+ ],
-+ },
- 'link_settings': {
- 'libraries': [
- '-ljsoncpp',
diff --git a/system-mesa.patch b/system-mesa.patch
index 4e7d9a2..61f0d80 100644
--- a/system-mesa.patch
+++ b/system-mesa.patch
@@ -1,7 +1,5 @@
in PLD Linux, windows includes are not packaged
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
-
-also, load in patch from gentoo: files/chromium-mesa-r0.patch
--- chromium-browser-26.0.1410.12/ui/gl/generate_bindings.py~ 2013-02-21 12:18:08.000000000 +0200
+++ chromium-browser-26.0.1410.12/ui/gl/generate_bindings.py 2013-02-28 11:54:36.763395432 +0200
@@ -1172,7 +1172,7 @@
@@ -13,235 +11,3 @@ also, load in patch from gentoo: files/chromium-mesa-r0.patch
[GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
]
-Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-index 80a4d230ad4b82abbaa82f2c328286b9d89da329..d56df6fdb0d851125148a1aac0bedbc487320682 100644
---- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
-+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-@@ -355,7 +355,8 @@ void GLES2ShaderBinary(
- n, shaders, binaryformat, binary, length);
- }
- void GLES2ShaderSource(
-- GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+ GLuint shader, GLsizei count, const GLchar* const* str,
-+ const GLint* length) {
- gles2::GetGLContext()->ShaderSource(shader, count, str, length);
- }
- void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {
-Index: gpu/command_buffer/client/gles2_implementation.cc
-diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
-index b6c354819ce5d556ff91f7b5273875c3cec83f7a..600c02f3751a2ab72eed498be7ee0f02e628130d 100644
---- a/gpu/command_buffer/client/gles2_implementation.cc
-+++ b/gpu/command_buffer/client/gles2_implementation.cc
-@@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
- }
-
- void GLES2Implementation::ShaderSource(
-- GLuint shader, GLsizei count, const char** source, const GLint* length) {
-+ GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
- GPU_CLIENT_SINGLE_THREAD_CHECK();
- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
- << shader << ", " << count << ", "
-Index: gpu/command_buffer/client/gles2_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
-index febcaf45bb5446393c7785196c9ef4a329438d0f..e4a63822ae6b3b9c950b7f9b05f173ce1ecfdb87 100644
---- a/gpu/command_buffer/client/gles2_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
-@@ -253,7 +253,7 @@ virtual void ShaderBinary(
- GLsizei length) OVERRIDE;
-
- virtual void ShaderSource(
-- GLuint shader, GLsizei count, const char** str,
-+ GLuint shader, GLsizei count, const GLchar* const* str,
- const GLint* length) OVERRIDE;
-
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
-Index: gpu/command_buffer/client/gles2_interface_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
-index b84dd71bd9139ac487a40847ddb746f839cf3593..8aafc7fd45891be4e2aa61f5825c20d0ccd1dc76 100644
---- a/gpu/command_buffer/client/gles2_interface_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_autogen.h
-@@ -152,7 +152,8 @@ virtual void ShaderBinary(
- GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
- GLsizei length) = 0;
- virtual void ShaderSource(
-- GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;
-+ GLuint shader, GLsizei count, const GLchar* const* str,
-+ const GLint* length) = 0;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
- virtual void StencilFuncSeparate(
- GLenum face, GLenum func, GLint ref, GLuint mask) = 0;
-Index: gpu/command_buffer/client/gles2_interface_stub_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-index 3c1c6696b08923142c879aa591b3902339e5874c..80e6c1003ae1be90fcd1a2871ffdde58f7237bff 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
- GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
- GLsizei length) OVERRIDE;
- virtual void ShaderSource(
-- GLuint shader, GLsizei count, const char** str,
-+ GLuint shader, GLsizei count, const GLchar* const* str,
- const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-index dce39c0def3ec52499c712afe1f792809c00db28..f097e8cba8e4d13af9027122a36b93f2ec28ae46 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-@@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary(
- const void* /* binary */, GLsizei /* length */) {
- }
- void GLES2InterfaceStub::ShaderSource(
-- GLuint /* shader */, GLsizei /* count */, const char** /* str */,
-+ GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */,
- const GLint* /* length */) {
- }
- void GLES2InterfaceStub::StencilFunc(
-Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-index 46cbdccccd0e3e4074b1fd919fc6b91d95fe04a5..da02881f9d180bd26f5a2bad2d4e814a9ca085b3 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
- GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
- GLsizei length) OVERRIDE;
- virtual void ShaderSource(
-- GLuint shader, GLsizei count, const char** str,
-+ GLuint shader, GLsizei count, const GLchar* const* str,
- const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-index 8aff42a6711c38b76e8767057b41fa31fe89f168..8f87a40da0f26f0dd71772e5fbcf519c8b02ad12 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-@@ -570,7 +570,8 @@ void GLES2TraceImplementation::ShaderBinary(
- }
-
- void GLES2TraceImplementation::ShaderSource(
-- GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+ GLuint shader, GLsizei count, const GLchar* const* str,
-+ const GLint* length) {
- TRACE_EVENT0("gpu", "GLES2Trace::ShaderSource");
- gl_->ShaderSource(shader, count, str, length);
- }
-Index: gpu/command_buffer/cmd_buffer_functions.txt
-diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
-index 2ad875a4aeaf86566c5f0334090f6583468c4781..08d33d963e3450d6fe442b333fb88089b184d86b 100644
---- a/gpu/command_buffer/cmd_buffer_functions.txt
-+++ b/gpu/command_buffer/cmd_buffer_functions.txt
-@@ -103,7 +103,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar
- GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
--GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
-+GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length);
- GL_APICALL void GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/GLES2/gl2.h
-diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
-index edebb8b23a56f6a67bb1ecfe5304bb5b372745e6..7aef573b6af7f4e3c76bdfb741374521b2f1eca4 100644
---- a/third_party/khronos/GLES2/gl2.h
-+++ b/third_party/khronos/GLES2/gl2.h
-@@ -160,7 +160,6 @@ typedef khronos_ssize_t GLsizeiptr;
- #define GL_INVALID_VALUE 0x0501
- #define GL_INVALID_OPERATION 0x0502
- #define GL_OUT_OF_MEMORY 0x0505
--#define GL_CONTEXT_LOST 0x300E // TODO(gman): What value?
-
- /* FrontFaceDirection */
- #define GL_CW 0x0900
-@@ -529,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
- GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
--GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
- GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
- GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL GLenum GL_APIENTRY glGetError (void);
-@@ -548,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
- GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
- GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
--GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
- GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
- GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
- GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-@@ -570,7 +569,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
- GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
--GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
-+GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
- GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
- GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
- GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/README.chromium
-diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
-index b47cb038c3cc5b51181194a55869842118bf7a56..da2e6c511e33767a458da1a17bd1b78e87779439 100644
---- a/third_party/khronos/README.chromium
-+++ b/third_party/khronos/README.chromium
-@@ -20,7 +20,6 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
- and not here.
-
- GLES2/gl2.h
-- - Added GL_CONTEXT_LOST constant.
- - Added include of gl2chromium.h
- GLES2/gl2ext.h
- - Added Chromium and Angle extensions.
-Index: ui/gl/generate_bindings.py
-diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
-index 16f89984bc3d1dc967d6ea3d2c4c1ed799716f8e..8422bbc8baf049f6431cea602a179296698f12b3 100755
---- a/ui/gl/generate_bindings.py
-+++ b/ui/gl/generate_bindings.py
-@@ -482,7 +482,7 @@ GL_FUNCTIONS = [
- { 'return_type': 'void',
- 'names': ['glShaderSource'],
- 'arguments':
-- 'GLuint shader, GLsizei count, const char** str, const GLint* length',
-+ 'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
- 'logging_code': """
- GL_SERVICE_LOG_CODE_BLOCK({
- for (GLsizei ii = 0; ii < count; ++ii) {
-@@ -1584,7 +1584,7 @@ namespace gfx {
- file.write('\n')
- file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
- (func['return_type'], func['names'][0], func['arguments']))
-- argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
-+ argument_names = re.sub(r'(const )?[a-zA-Z0-9]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
- func['arguments'])
- if argument_names == 'void':
- argument_names = ''
-Index: ui/gl/gl_bindings_skia_in_process.cc
-diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
-index f45626616ed6ff8e8de0c59b25165e6b51f3668d..115eac8d8a57e7abc000935e20c8eb311cd404e8 100644
---- a/ui/gl/gl_bindings_skia_in_process.cc
-+++ b/ui/gl/gl_bindings_skia_in_process.cc
-@@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
- glScissor(x, y, width, height);
- }
-
--GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
-+GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
- const GLint* length) {
- glShaderSource(shader, count, str, length);
- }
-Index: third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
-===================================================================
---- a/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (revision 7840)
-+++ b/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h (working copy)
-@@ -37,4 +37,8 @@
- // Non-VBO vertices and indices are not allowed in Chromium.
- #define GR_GL_MUST_USE_VBO 1
-
-+// Use updated Khronos signature for glShaderSource
-+// (const char* const instead of char**).
-+#define GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE 1
-+
- #endif
diff --git a/system-nspr.patch b/system-nspr.patch
deleted file mode 100644
index d116ce2..0000000
--- a/system-nspr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- chromium-23.0.1271.95/base/pr_time_unittest.cc.system-code 2012-11-27 21:01:53.000000000 -0500
-+++ chromium-23.0.1271.95/base/pr_time_unittest.cc 2012-12-12 15:22:19.695293771 -0500
-@@ -5,7 +5,7 @@
- #include <time.h>
-
- #include "base/compiler_specific.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <prtime.h>
- #include "base/time.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
---- chromium-23.0.1271.95/chrome/browser/metrics/metrics_log.cc.system-code 2012-11-27 21:02:10.000000000 -0500
-+++ chromium-23.0.1271.95/chrome/browser/metrics/metrics_log.cc 2012-12-12 15:22:19.699293773 -0500
-@@ -16,7 +16,7 @@
- #include "base/string_number_conversions.h"
- #include "base/string_util.h"
- #include "base/sys_info.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <prtime.h>
- #include "base/time.h"
- #include "base/tracked_objects.h"
- #include "base/utf_string_conversions.h"
---- chromium-23.0.1271.95/chrome/common/metrics/metrics_log_base.cc.system-code 2012-11-27 21:02:37.000000000 -0500
-+++ chromium-23.0.1271.95/chrome/common/metrics/metrics_log_base.cc 2012-12-12 15:22:19.706293777 -0500
-@@ -11,7 +11,7 @@
- #include "base/string_number_conversions.h"
- #include "base/sys_byteorder.h"
- #include "base/sys_info.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <prtime.h>
- #include "base/utf_string_conversions.h"
- #include "chrome/common/chrome_version_info.h"
- #include "chrome/common/logging_chrome.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/4a275e0ef3b6b244e09ed5e0fdff5c1df31093b7
More information about the pld-cvs-commit
mailing list