diff options
Diffstat (limited to 'patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch')
| -rw-r--r-- | patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch | 161 |
1 files changed, 0 insertions, 161 deletions
diff --git a/patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch b/patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch deleted file mode 100644 index 24f6bedf2..000000000 --- a/patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> -Date: Wed, 30 Oct 2013 14:27:28 +0100 -Subject: Fix the build with a GL ES2 configured Qt. - -GLES/gl2.h is included through Qt public headers and the copy of -Chromium is used since its include path comes before /usr/include. -The problem is that this header is incompatible for some reasons, -one of them being that it converts all GL function symbols from -gl* to GLES2*. - -Qt layer code should always need to go through GL directly, -so make sure that only GYP targets that depend directly on gpu.gyp, -khronos.gyp or webkit_gpu.gyp will have an include path -pointing to those headers. - -Replace all_dependent_settings with direct_dependent_settings and -control which target inherits this include_dirs from its dependencies -by using export_dependent_settings. - -Change-Id: Id4d98fe22ef8b778b5ba8da300dad28e69507732 ---- - content/content_browser.gypi | 1 + - gpu/command_buffer_client.gypi | 3 +++ - gpu/command_buffer_common.gypi | 3 +++ - gpu/gpu.gyp | 18 ++++++++++++++++++ - third_party/khronos/khronos.gyp | 2 +- - webkit/common/gpu/webkit_gpu.gyp | 3 +++ - 6 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/content/content_browser.gypi b/content/content_browser.gypi -index b0f963c..28878f7 100644 ---- a/content/content_browser.gypi -+++ b/content/content_browser.gypi -@@ -1323,6 +1323,7 @@ - 'dependencies': [ - 'browser/devtools/devtools_resources.gyp:devtools_resources', - '../cc/cc.gyp:cc', -+ '../gpu/gpu.gyp:gpu_ipc', - '../net/net.gyp:http_server', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../ui/surface/surface.gyp:surface', -diff --git a/gpu/command_buffer_client.gypi b/gpu/command_buffer_client.gypi -index cb52ee7..827474c 100644 ---- a/gpu/command_buffer_client.gypi -+++ b/gpu/command_buffer_client.gypi -@@ -14,6 +14,9 @@ - 'dependencies': [ - '../third_party/khronos/khronos.gyp:khronos_headers', - ], -+ 'export_dependent_settings': [ -+ '../third_party/khronos/khronos.gyp:khronos_headers', -+ ], - 'sources': [ - 'command_buffer/client/cmd_buffer_helper.cc', - 'command_buffer/client/cmd_buffer_helper.h', -diff --git a/gpu/command_buffer_common.gypi b/gpu/command_buffer_common.gypi -index 87eeb5b..ab9a635 100644 ---- a/gpu/command_buffer_common.gypi -+++ b/gpu/command_buffer_common.gypi -@@ -6,6 +6,9 @@ - 'dependencies': [ - '../third_party/khronos/khronos.gyp:khronos_headers', - ], -+ 'export_dependent_settings': [ -+ '../third_party/khronos/khronos.gyp:khronos_headers', -+ ], - 'sources': [ - 'command_buffer/common/bitfield_helpers.h', - 'command_buffer/common/buffer.h', -diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp -index 46831ee..c3c9502 100644 ---- a/gpu/gpu.gyp -+++ b/gpu/gpu.gyp -@@ -23,6 +23,9 @@ - 'command_buffer/command_buffer.gyp:gles2_utils', - 'gles2_cmd_helper', - ], -+ 'export_dependent_settings': [ -+ '../third_party/khronos/khronos.gyp:khronos_headers', -+ ], - 'defines': [ - 'GLES2_IMPL_IMPLEMENTATION', - ], -@@ -90,6 +93,9 @@ - 'command_buffer_client', - 'gles2_implementation', - ], -+ 'export_dependent_settings': [ -+ 'command_buffer_client', -+ ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - ], -@@ -115,6 +121,9 @@ - 'command_buffer_client', - 'gles2_implementation_client_side_arrays_no_check', - ], -+ 'export_dependent_settings': [ -+ 'command_buffer_client', -+ ], - 'sources': [ - '<@(gles2_c_lib_source_files)', - ], -@@ -378,6 +387,9 @@ - 'gpu_config', - 'gpu_ipc', - ], -+ 'export_dependent_settings': [ -+ 'command_buffer_common', -+ ], - 'sources': [ - 'gpu_export.h', - ], -@@ -420,6 +432,9 @@ - 'dependencies': [ - 'command_buffer_common', - ], -+ 'export_dependent_settings': [ -+ 'command_buffer_common', -+ ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, -@@ -445,6 +460,9 @@ - 'dependencies': [ - 'command_buffer_common', - ], -+ 'export_dependent_settings': [ -+ 'command_buffer_common', -+ ], - }, - { - 'target_name': 'gpu_config', -diff --git a/third_party/khronos/khronos.gyp b/third_party/khronos/khronos.gyp -index 8a85572..88130d2 100644 ---- a/third_party/khronos/khronos.gyp -+++ b/third_party/khronos/khronos.gyp -@@ -7,7 +7,7 @@ - { - 'target_name': 'khronos_headers', - 'type': 'none', -- 'all_dependent_settings': { -+ 'direct_dependent_settings': { - 'include_dirs': [ - '.', - '../../gpu', # Contains GLES2/gl2chromium.h -diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp -index a28e4e8..1a0190c 100644 ---- a/webkit/common/gpu/webkit_gpu.gyp -+++ b/webkit/common/gpu/webkit_gpu.gyp -@@ -28,6 +28,9 @@ - '<(DEPTH)/ui/gl/gl.gyp:gl', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx', - ], -+ 'export_dependent_settings': [ -+ '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', -+ ], - 'sources': [ - # This list contains all .h and .cc in gpu except for test code. - 'context_provider_in_process.cc', |