95560 2012-08-31 05:15:47 -0700 [Qt] Use system OpenGLES / EGL includes if available instead of ANGLE includes 2012-09-06 22:46:04 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 95965 P2 Normal --- 95466 1 milian.wolff milian.wolff anilsson eric.carlson feature-media-reviews hausmann jbauman webkit.review.bot oldest_to_newest 709507 0 milian.wolff 2012-08-31 05:15:47 -0700 Building QtWebKit for QNX with OpenGL support fails because the ANGLE headers in ThirdParty/ANGLE/include/{EGL,GLES2} are used instead of the system versions. These headers reference x11 headers for example, which is not available on QNX and thus triggers compilation errors. I'll propose a patch based on Simon Hausmann's previous patch shown here: http://paste.ubuntu.com/1175616/ I had to extend it though, since the code in ANGLE/src contains includes of "GLSLANG/ShaderLang.h" which will not be found with the patch above, since ANGLE/include is not in the INCLUDEPATH anymore. To fix this, I will add the GLSLANG folder directly to the include path and change the includes to something like #if PLATFORM(Qt) #include "ShaderLang.h" #else #include "GLSLANG/ShaderLang.h" #endif I'll add a patch. 709523 1 161675 milian.wolff 2012-08-31 05:46:20 -0700 Created attachment 161675 Patch 709530 2 webkit.review.bot 2012-08-31 05:49:22 -0700 Attachment 161675 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ANGLE/ChangeLog', u'Sour..." exit_code: 1 Source/ThirdParty/ANGLE/src/compiler/ShaderLang.cpp:14: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 16 files If any of these errors are false positives, please file a bug against check-webkit-style. 709537 3 milian.wolff 2012-08-31 05:53:47 -0700 The style check is a false-positive afaiks, as this is ThirdParty code. 709637 4 jbauman 2012-08-31 08:08:00 -0700 It would make more sense to modify eglplatform.h not to include X11 headers (and use their types) on QNX. It looks like this has already been done for android. Also, please upstream any changes. 709643 5 jbauman 2012-08-31 08:14:43 -0700 Or alternatively, if QNX doesn't support EGL, you could try ensuring that Extensions3DOpenGLES.cpp isn't compiled there. 709655 6 milian.wolff 2012-08-31 08:38:40 -0700 Thanks for the hint, EGL is supported and there is a eglplatform.h - I'll copy the code from there and put it into ANGLE's eglplatform.h and revise the patch presented here. Or, well - I'll try to get it upstream into ANGLE also. 714127 7 161675 hausmann 2012-09-06 22:45:09 -0700 Comment on attachment 161675 Patch The solution to this is to change the way Angle is built and it's been done already :) 714128 8 hausmann 2012-09-06 22:46:04 -0700 Bug #95965 fixes the issue of building WebKit on a platform where EGL/GLES2 is provided and where those would clash with Angle. *** This bug has been marked as a duplicate of bug 95965 *** 161675 2012-08-31 05:46:20 -0700 2012-09-06 22:45:08 -0700 Patch bug-95560-20120831144607.patch text/plain 14151 milian.wolff U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYjc0YzZkNTM3ZmRjZjNiMWU4OTM4NmMzMTkxMGQ5OWFiNDJjZmFhNC4uOTllMWVlY2YxM2Vh MzM2ZjkwYzNlMTU1MmYxZDY2YTE5ZTdmNGQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA4LTMxICBNaWxpYW4gV29sZmYgIDxtaWxpYW4ud29s ZmZAa2RhYi5jb20+CisKKyAgICAgICAgW1F0XSBVc2Ugc3lzdGVtIE9wZW5HTEVTIC8gRUdMIGlu Y2x1ZGVzIGlmIGF2YWlsYWJsZSBpbnN0ZWFkIG9mIEFOR0xFIGluY2x1ZGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBzeXN0ZW0gRUdML0dMRVMy IGluY2x1ZGVzIGlmIGF2YWlsYWJsZSBpbnN0ZWFkIG9mIHVzaW5nIHRoZSBBTkdMRSBoZWFkZXJz LgorICAgICAgICBUaGUgQU5HTEUgdmVyc2lvbnMgZXhwZWN0IFgxMSBoZWFkZXJzIG9uIFVuaXgg c3lzdGVtcyB3aGljaCBpcyBub3QgYXZhaWxhYmxlCisgICAgICAgIG9uIFFOWCBmb3IgZXhhbXBs ZS4KKworICAgICAgICBUaGlzIHJlcXVpcmVzIHVzIHRvIHJlbW92ZSB0aGUgQU5HTEUvaW5jbHVk ZSBwYXRoIGZyb20gSU5DTFVERVBBVEggYnV0IHRoYXQKKyAgICAgICAgaW4gdHVybiBicmVha3Mg dGhlIGluY2x1ZGVzIG9mIEdMU0xBTkcvU2hhZGVyTGFuZy5oIGluIHRoZSBBTkdMRSBzb3VyY2Ug Y29kZS4KKyAgICAgICAgVGh1cyB3ZSBjaGFuZ2UgdGhlIGluY2x1ZGVzIHRoZXJlIHRvIHRoZSBk aXJlY3QgdmVyc2lvbiBvZiAjaW5jbHVkZSAiU2hhZGVyTGFuZy5oIi4KKyAgICAgICAgVG8gcHJl dmVudCBicmVha2FnZSBpbiBvdGhlciBwbGF0Zm9ybXMsIHdlIGxpbWl0IHRoaXMgY2hhbmdlIHRv IHRoZSBRdCBwbGF0Zm9ybSwKKyAgICAgICAgYnV0IHNpbmNlIHRoZSBBTkdMRSBjb2RlIGRvZXMg bm90IGluY2x1ZGUgV1RGL3d0Zi9QbGF0Zm9ybS5oIHdlIGNhbm5vdCB1c2UKKyAgICAgICAgI2lm IFBMQVRGT1JNKFF0KSBhbmQgaW5zdGVhZCBjb3B5IGl0cyBpbXBsZW1lbnRhdGlvbiBhbmQgY2hl Y2sgdGhlIGF2YWlsYWJpbGl0eSBvZgorICAgICAgICB0aGUgQlVJTERJTkdfUVRfXyBkZWZpbmUg ZGlyZWN0bHkuCisKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvQnVpbHRJbkZ1bmN0aW9uRW11bGF0 b3IuaDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvRGV0ZWN0UmVjdXJzaW9uLmg6CisgICAgICAg ICogc3JjL2NvbXBpbGVyL01hcExvbmdWYXJpYWJsZU5hbWVzLmg6CisgICAgICAgICogc3JjL2Nv bXBpbGVyL1NoSGFuZGxlLmg6CisgICAgICAgICogc3JjL2NvbXBpbGVyL1NoYWRlckxhbmcuY3Bw OgorICAgICAgICAqIHNyYy9jb21waWxlci9WYWxpZGF0ZUxpbWl0YXRpb25zLmg6CisgICAgICAg ICogc3JjL2NvbXBpbGVyL1ZhcmlhYmxlSW5mby5oOgorICAgICAgICAqIHNyYy9jb21waWxlci9W ZXJzaW9uR0xTTC5oOgorICAgICAgICAqIHNyYy9jb21waWxlci9nbHNsYW5nLnk6CisgICAgICAg ICogc3JjL2NvbXBpbGVyL2dsc2xhbmdfdGFiLmNwcDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIv bG9jYWxpbnRlcm1lZGlhdGUuaDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvdGltaW5nL1Jlc3Ry aWN0RnJhZ21lbnRTaGFkZXJUaW1pbmcuaDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvdGltaW5n L1Jlc3RyaWN0VmVydGV4U2hhZGVyVGltaW5nLmg6CisKIDIwMTItMDgtMjQgIEpvc2h1YSBOZXR0 ZXJmaWVsZCAgPGpuZXR0ZXJmaWVsZEByaW0uY29tPgogCiAgICAgICAgIFtDU1MgU2hhZGVyc10g W0FOR0xFXSBSZW5hbWVGdW5jdGlvbjo6UmVuYW1lRnVuY3Rpb24gbWF5IHN0b3JlIHJlZmVyZW5j ZXMgdG8gdGVtcG9yYXJ5IHN0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE0NDRmOTBjODBjNTUxMWE4ZTdh MGYyMjhlNGE0ZGI2YWE1YWQ0OTguLmZkMmY0NzUwOWEyZDVhODUxMjI5ZTM3ZDY3ZmFkYWRmZGVi MzFhNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMi0wOC0zMSAgTWlsaWFuIFdv bGZmICA8bWlsaWFuLndvbGZmQGtkYWIuY29tPgorCisgICAgICAgIFtRdF0gVXNlIHN5c3RlbSBP cGVuR0xFUyAvIEVHTCBpbmNsdWRlcyBpZiBhdmFpbGFibGUgaW5zdGVhZCBvZiBBTkdMRSBpbmNs dWRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1 NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ug c3lzdGVtIEVHTC9HTEVTMiBpbmNsdWRlcyBpZiBhdmFpbGFibGUgaW5zdGVhZCBvZiB1c2luZyB0 aGUgQU5HTEUgaGVhZGVycy4KKyAgICAgICAgVGhlIEFOR0xFIHZlcnNpb25zIGV4cGVjdCBYMTEg aGVhZGVycyBvbiBVbml4IHN5c3RlbXMgd2hpY2ggaXMgbm90IGF2YWlsYWJsZQorICAgICAgICBv biBRTlggZm9yIGV4YW1wbGUuCisKKyAgICAgICAgVGhpcyByZXF1aXJlcyB1cyB0byByZW1vdmUg dGhlIEFOR0xFL2luY2x1ZGUgcGF0aCBmcm9tIElOQ0xVREVQQVRIIGJ1dCB0aGF0CisgICAgICAg IGluIHR1cm4gYnJlYWtzIHRoZSBpbmNsdWRlcyBvZiBHTFNMQU5HL1NoYWRlckxhbmcuaCBpbiB0 aGUgQU5HTEUgc291cmNlIGNvZGUuCisgICAgICAgIFRodXMgd2UgY2hhbmdlIHRoZSBpbmNsdWRl cyB0aGVyZSB0byB0aGUgZGlyZWN0IHZlcnNpb24gb2YgI2luY2x1ZGUgIlNoYWRlckxhbmcuaCIu CisgICAgICAgIFRvIHByZXZlbnQgYnJlYWthZ2UgaW4gb3RoZXIgcGxhdGZvcm1zLCB3ZSBsaW1p dCB0aGlzIGNoYW5nZSB0byB0aGUgUXQgcGxhdGZvcm0sCisgICAgICAgIGJ1dCBzaW5jZSB0aGUg QU5HTEUgY29kZSBkb2VzIG5vdCBpbmNsdWRlIFdURi93dGYvUGxhdGZvcm0uaCB3ZSBjYW5ub3Qg dXNlCisgICAgICAgICNpZiBQTEFURk9STShRdCkgYW5kIGluc3RlYWQgY29weSBpdHMgaW1wbGVt ZW50YXRpb24gYW5kIGNoZWNrIHRoZSBhdmFpbGFiaWxpdHkgb2YKKyAgICAgICAgdGhlIEJVSUxE SU5HX1FUX18gZGVmaW5lIGRpcmVjdGx5LgorCisgICAgICAgICogVGFyZ2V0LnByaToKKwogMjAx Mi0wOC0zMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiByZW5kZXIgYm94IG1vZGVsIGVsZW1lbnRzIGFuZCBncmlkIG9uIGlu c3BlY3RvciBvdmVybGF5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv Y29tcGlsZXIvQnVpbHRJbkZ1bmN0aW9uRW11bGF0b3IuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9jb21waWxlci9CdWlsdEluRnVuY3Rpb25FbXVsYXRvci5oCmluZGV4IDBkOTA0ZjQx ZDA5MTZjZmY5ZThkMGMwNTg5ZjllZDg5ZDBlYzAzODIuLmU1N2IzNjQ3YWJjZDEzZTVhNzZhNTFj MWE2YzFlYjhkMmEzMDY0YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9jb21waWxlci9CdWlsdEluRnVuY3Rpb25FbXVsYXRvci5oCisrKyBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9jb21waWxlci9CdWlsdEluRnVuY3Rpb25FbXVsYXRvci5oCkBAIC03LDcg KzcsMTIgQEAKICNpZm5kZWYgQ09NUElMSUVSX0JVSUxUX0lOX0ZVTkNUSU9OX0VNVUxBVE9SX0hf CiAjZGVmaW5lIENPTVBJTElFUl9CVUlMVF9JTl9GVU5DVElPTl9FTVVMQVRPUl9IXwogCisvLyBz ZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTYwCisjaWYgZGVm aW5lZChCVUlMRElOR19RVF9fKQorI2luY2x1ZGUgIlNoYWRlckxhbmcuaCIKKyNlbHNlCiAjaW5j bHVkZSAiR0xTTEFORy9TaGFkZXJMYW5nLmgiCisjZW5kaWYKIAogI2luY2x1ZGUgImNvbXBpbGVy L0luZm9TaW5rLmgiCiAjaW5jbHVkZSAiY29tcGlsZXIvaW50ZXJtZWRpYXRlLmgiCmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvRGV0ZWN0UmVjdXJzaW9u LmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvRGV0ZWN0UmVjdXJzaW9u LmgKaW5kZXggYmJhYzc5ZGM5Y2U2ZTIzM2I0YzAxY2VlZDY5NDQ4ODhiOWIyZWI0OC4uMWYxMjIz MzQ2NWNmOGI5NmFmZWYyZTdhYzFjODdjMTRiNzk4MmNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL0RldGVjdFJlY3Vyc2lvbi5oCisrKyBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9EZXRlY3RSZWN1cnNpb24uaApAQCAtNyw3 ICs3LDEyIEBACiAjaWZuZGVmIENPTVBJTEVSX0RFVEVDVF9SRUNVUlNJT05fSF8KICNkZWZpbmUg Q09NUElMRVJfREVURUNUX1JFQ1VSU0lPTl9IXwogCisvLyBzZWUgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTYwCisjaWYgZGVmaW5lZChCVUlMRElOR19RVF9fKQor I2luY2x1ZGUgIlNoYWRlckxhbmcuaCIKKyNlbHNlCiAjaW5jbHVkZSAiR0xTTEFORy9TaGFkZXJM YW5nLmgiCisjZW5kaWYKIAogI2luY2x1ZGUgImNvbXBpbGVyL2ludGVybWVkaWF0ZS5oIgogI2lu Y2x1ZGUgImNvbXBpbGVyL1ZhcmlhYmxlSW5mby5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL01hcExvbmdWYXJpYWJsZU5hbWVzLmggYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvTWFwTG9uZ1ZhcmlhYmxlTmFtZXMuaAppbmRl eCBmYjJjN2U4MWNiOGU4ZDMzOTQ3OGNiMjAyM2UxZjBlNDM1YWRjMzFhLi4xNjljNGNhODg3Mjg0 NDYwNzcxYWExMGIyMmE3NTExNmY2Y2Y5YzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvY29tcGlsZXIvTWFwTG9uZ1ZhcmlhYmxlTmFtZXMuaAorKysgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvTWFwTG9uZ1ZhcmlhYmxlTmFtZXMuaApAQCAt Nyw3ICs3LDEyIEBACiAjaWZuZGVmIENPTVBJTEVSX01BUF9MT05HX1ZBUklBQkxFX05BTUVTX0hf CiAjZGVmaW5lIENPTVBJTEVSX01BUF9MT05HX1ZBUklBQkxFX05BTUVTX0hfCiAKKy8vIHNlZSBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1NjAKKyNpZiBkZWZpbmVk KEJVSUxESU5HX1FUX18pCisjaW5jbHVkZSAiU2hhZGVyTGFuZy5oIgorI2Vsc2UKICNpbmNsdWRl ICJHTFNMQU5HL1NoYWRlckxhbmcuaCIKKyNlbmRpZgogCiAjaW5jbHVkZSAiY29tcGlsZXIvaW50 ZXJtZWRpYXRlLmgiCiAjaW5jbHVkZSAiY29tcGlsZXIvVmFyaWFibGVJbmZvLmgiCmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvU2hIYW5kbGUuaCBiL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9TaEhhbmRsZS5oCmluZGV4IDI2NTI4 YjhkYmNiYTBiMDY0YzE4OGE3ZTlhMzU5Njk4YzdlNjU4YmQuLjc2YTJkZmFhODZiMGY0OWE3ZGU2 NjdhY2JkYmRhMjllNDg0MjViZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9jb21waWxlci9TaEhhbmRsZS5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9jb21waWxlci9TaEhhbmRsZS5oCkBAIC0xNCw3ICsxNCwxMiBAQAogLy8gVGhpcyBzaG91bGQg bm90IGJlIGluY2x1ZGVkIGJ5IGRyaXZlciBjb2RlLgogLy8KIAorLy8gc2VlIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU2MAorI2lmIGRlZmluZWQoQlVJTERJTkdf UVRfXykKKyNpbmNsdWRlICJTaGFkZXJMYW5nLmgiCisjZWxzZQogI2luY2x1ZGUgIkdMU0xBTkcv U2hhZGVyTGFuZy5oIgorI2VuZGlmCiAKICNpbmNsdWRlICJjb21waWxlci9CdWlsdEluRnVuY3Rp b25FbXVsYXRvci5oIgogI2luY2x1ZGUgImNvbXBpbGVyL0V4dGVuc2lvbkJlaGF2aW9yLmgiCmRp ZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvU2hhZGVyTGFu Zy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvU2hhZGVyTGFuZy5j cHAKaW5kZXggNTZmNWM3ZjJlYzAwNzI0YjY5YTIyMGU1NjhhMDczNDZjYmNhMzBhYi4uMGI3ODQy NjIyNjBmNjA0Yzg1ZjhhMTdjYmU0NGNjZmNmZjNlYzcxMyAxMDA2NDQKLS0tIGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL1NoYWRlckxhbmcuY3BwCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9TaGFkZXJMYW5nLmNwcApAQCAtOSw3ICs5LDEy IEBACiAvLyBhcyBkZWZpbmVkIGluIFNoYWRlckxhbmcuaAogLy8KIAorLy8gc2VlIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU2MAorI2lmIGRlZmluZWQoQlVJTERJ TkdfUVRfXykKKyNpbmNsdWRlICJTaGFkZXJMYW5nLmgiCisjZWxzZQogI2luY2x1ZGUgIkdMU0xB TkcvU2hhZGVyTGFuZy5oIgorI2VuZGlmCiAKICNpbmNsdWRlICJjb21waWxlci9Jbml0aWFsaXpl RGxsLmgiCiAjaW5jbHVkZSAiY29tcGlsZXIvcHJlcHJvY2Vzc29yL2xlbmd0aF9saW1pdHMuaCIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9WYWxpZGF0 ZUxpbWl0YXRpb25zLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvVmFs aWRhdGVMaW1pdGF0aW9ucy5oCmluZGV4IGE4MzVjYjNjMjI2ZTYwZjNmNmVmOGVjMmY2NjQ5MGNh MTJhYWI0YjQuLjZjODI3MTlmMzY2YjJhMmY2YjFjMzY4OTczOTk5MThiODhjMmVhZmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9WYWxpZGF0ZUxpbWl0 YXRpb25zLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL1ZhbGlk YXRlTGltaXRhdGlvbnMuaApAQCAtNCw3ICs0LDEzIEBACiAvLyBmb3VuZCBpbiB0aGUgTElDRU5T RSBmaWxlLgogLy8KIAorLy8gc2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NTU2MAorI2lmIGRlZmluZWQoQlVJTERJTkdfUVRfXykKKyNpbmNsdWRlICJTaGFkZXJM YW5nLmgiCisjZWxzZQogI2luY2x1ZGUgIkdMU0xBTkcvU2hhZGVyTGFuZy5oIgorI2VuZGlmCisK ICNpbmNsdWRlICJjb21waWxlci9pbnRlcm1lZGlhdGUuaCIKIAogY2xhc3MgVEluZm9TaW5rQmFz ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9WYXJp YWJsZUluZm8uaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9WYXJpYWJs ZUluZm8uaAppbmRleCA2NjdhY2FmY2NjYzY0ZjJlMzY1YTk0ZWM1Zjc3Y2QyYWQyZGQxYTQ2Li4x MWY5YTY3ZWMwMWE3NDEwY2IwYTdkNjA3ZDgyNjBlMmYyNmIxOGIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvVmFyaWFibGVJbmZvLmgKKysrIGIvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL1ZhcmlhYmxlSW5mby5oCkBAIC03LDcg KzcsMTMgQEAKICNpZm5kZWYgQ09NUElMRVJfVkFSSUFCTEVfSU5GT19IXwogI2RlZmluZSBDT01Q SUxFUl9WQVJJQUJMRV9JTkZPX0hfCiAKKy8vIHNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTU1NjAKKyNpZiBkZWZpbmVkKEJVSUxESU5HX1FUX18pCisjaW5jbHVk ZSAiU2hhZGVyTGFuZy5oIgorI2Vsc2UKICNpbmNsdWRlICJHTFNMQU5HL1NoYWRlckxhbmcuaCIK KyNlbmRpZgorCiAjaW5jbHVkZSAiY29tcGlsZXIvaW50ZXJtZWRpYXRlLmgiCiAKIC8vIFByb3Zp ZGVzIGluZm9ybWF0aW9uIGFib3V0IGEgdmFyaWFibGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvVmVyc2lvbkdMU0wuaCBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9jb21waWxlci9WZXJzaW9uR0xTTC5oCmluZGV4IDM3NmZjYjg0ODYxYWU1 MjEzZGY3YTU0OTdjNWJhMjcwMGMyOWQ3YzQuLmEyN2ZlNDJlMTAwNjFmNDUwZDQ3ZGVhMTk4ZmEx Y2M0MGY1NzI3YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci9WZXJzaW9uR0xTTC5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci9WZXJzaW9uR0xTTC5oCkBAIC03LDcgKzcsMTMgQEAKICNpZm5kZWYgQ09NUElMRVJfVkVS U0lPTkdMU0xfSF8KICNkZWZpbmUgQ09NUElMRVJfVkVSU0lPTkdMU0xfSF8KIAorLy8gc2VlIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU2MAorI2lmIGRlZmluZWQo QlVJTERJTkdfUVRfXykKKyNpbmNsdWRlICJTaGFkZXJMYW5nLmgiCisjZWxzZQogI2luY2x1ZGUg IkdMU0xBTkcvU2hhZGVyTGFuZy5oIgorI2VuZGlmCisKICNpbmNsdWRlICJjb21waWxlci9pbnRl cm1lZGlhdGUuaCIKIAogLy8gVHJhdmVyc2VzIHRoZSBpbnRlcm1lZGlhdGUgdHJlZSB0byByZXR1 cm4gdGhlIG1pbmltdW0gR0xTTCB2ZXJzaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvY29tcGlsZXIvZ2xzbGFuZy55IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2NvbXBpbGVyL2dsc2xhbmcueQppbmRleCAzY2FkMzM1MDBjMzY5NzY5M2Y4OTJlMTQ1Yjg5 N2RlNmExZmQ2OWRhLi40MDc4YTQyODNlYWE4ZGIxYzY1OGM0N2MzMWRiYjQxYjk4NmE1OGVmIDEw MDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvZ2xzbGFuZy55 CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9nbHNsYW5nLnkKQEAg LTM2LDcgKzM2LDEzIEBAIFdISUNIIEdFTkVSQVRFUyBUSEUgR0xTTCBFUyBQQVJTRVIgKGdsc2xh bmdfdGFiLmNwcCBBTkQgZ2xzbGFuZ190YWIuaCkuCiAKICNpbmNsdWRlICJjb21waWxlci9TeW1i b2xUYWJsZS5oIgogI2luY2x1ZGUgImNvbXBpbGVyL1BhcnNlSGVscGVyLmgiCisKKy8vIHNlZSBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1NjAKKyNpZiBkZWZpbmVk KEJVSUxESU5HX1FUX18pCisjaW5jbHVkZSAiU2hhZGVyTGFuZy5oIgorI2Vsc2UKICNpbmNsdWRl ICJHTFNMQU5HL1NoYWRlckxhbmcuaCIKKyNlbmRpZgogCiAjZGVmaW5lIFlZRU5BQkxFX05MUyAw CiAjZGVmaW5lIFlZTFRZUEVfSVNfVFJJVklBTCAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvZ2xzbGFuZ190YWIuY3BwIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2NvbXBpbGVyL2dsc2xhbmdfdGFiLmNwcAppbmRleCA0NmI1MTRhMDcyMzQ3 ZTNhOGE4OTk5M2VjNDRiNzczYjlmNGUxMDE4Li4yNDM4OTJiMjQ4ZGRmNWE2MGEyODQ0MDY3YTRi OGRhMWYxNzJmN2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29t cGlsZXIvZ2xzbGFuZ190YWIuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9j b21waWxlci9nbHNsYW5nX3RhYi5jcHAKQEAgLTI4NCw3ICsyODQsMTMgQEAKIAogI2luY2x1ZGUg ImNvbXBpbGVyL1N5bWJvbFRhYmxlLmgiCiAjaW5jbHVkZSAiY29tcGlsZXIvUGFyc2VIZWxwZXIu aCIKKworLy8gc2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU2 MAorI2lmIGRlZmluZWQoQlVJTERJTkdfUVRfXykKKyNpbmNsdWRlICJTaGFkZXJMYW5nLmgiCisj ZWxzZQogI2luY2x1ZGUgIkdMU0xBTkcvU2hhZGVyTGFuZy5oIgorI2VuZGlmCiAKICNkZWZpbmUg WVlFTkFCTEVfTkxTIDAKICNkZWZpbmUgWVlMVFlQRV9JU19UUklWSUFMIDEKZGlmZiAtLWdpdCBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9sb2NhbGludGVybWVkaWF0ZS5o IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL2xvY2FsaW50ZXJtZWRpYXRl LmgKaW5kZXggNTY4OTBiZDU2OTk5NjYwZDEzNzg2NTEyMmVhZTc1NDM1MDJjODdmOS4uZDAyMTBl ZGYxZDVkMzI3ZGZlMTBlMDA2MDU1YWFhZjhkOTdlZGZlNSAxMDA2NDQKLS0tIGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL2xvY2FsaW50ZXJtZWRpYXRlLmgKKysrIGIvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL2xvY2FsaW50ZXJtZWRpYXRlLmgKQEAg LTcsNyArNywxMyBAQAogI2lmbmRlZiBfTE9DQUxfSU5URVJNRURJQVRFX0lOQ0xVREVEXwogI2Rl ZmluZSBfTE9DQUxfSU5URVJNRURJQVRFX0lOQ0xVREVEXwogCisvLyBzZWUgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTYwCisjaWYgZGVmaW5lZChCVUlMRElOR19R VF9fKQorI2luY2x1ZGUgIlNoYWRlckxhbmcuaCIKKyNlbHNlCiAjaW5jbHVkZSAiR0xTTEFORy9T aGFkZXJMYW5nLmgiCisjZW5kaWYKKwogI2luY2x1ZGUgImNvbXBpbGVyL2ludGVybWVkaWF0ZS5o IgogI2luY2x1ZGUgImNvbXBpbGVyL1N5bWJvbFRhYmxlLmgiCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90aW1pbmcvUmVzdHJpY3RGcmFnbWVudFNo YWRlclRpbWluZy5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RpbWlu Zy9SZXN0cmljdEZyYWdtZW50U2hhZGVyVGltaW5nLmgKaW5kZXggODk5MTY1Y2EyODdlMzMxMDI1 N2QyYzA2MGIyMGZlYzlkNGUzMDNiNy4uMjllYzIxZDg5YjI1YTUyZDJhYWU3Y2Q0YTc4ODkyMzY0 Y2JkYWZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RpbWluZy9SZXN0cmljdEZyYWdtZW50U2hhZGVyVGltaW5nLmgKKysrIGIvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RpbWluZy9SZXN0cmljdEZyYWdtZW50U2hhZGVyVGlt aW5nLmgKQEAgLTcsNyArNywxMiBAQAogI2lmbmRlZiBDT01QSUxFUl9USU1JTkdfUkVTVFJJQ1Rf RlJBR01FTlRfU0hBREVSX1RJTUlOR19IXwogI2RlZmluZSBDT01QSUxFUl9USU1JTkdfUkVTVFJJ Q1RfRlJBR01FTlRfU0hBREVSX1RJTUlOR19IXwogCisvLyBzZWUgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTYwCisjaWYgZGVmaW5lZChCVUlMRElOR19RVF9fKQor I2luY2x1ZGUgIlNoYWRlckxhbmcuaCIKKyNlbHNlCiAjaW5jbHVkZSAiR0xTTEFORy9TaGFkZXJM YW5nLmgiCisjZW5kaWYKIAogI2luY2x1ZGUgImNvbXBpbGVyL2ludGVybWVkaWF0ZS5oIgogI2lu Y2x1ZGUgImNvbXBpbGVyL2RlcGdyYXBoL0RlcGVuZGVuY3lHcmFwaC5oIgpkaWZmIC0tZ2l0IGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RpbWluZy9SZXN0cmljdFZlcnRl eFNoYWRlclRpbWluZy5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3Rp bWluZy9SZXN0cmljdFZlcnRleFNoYWRlclRpbWluZy5oCmluZGV4IDE5YTA1ZmE2OGJjOGJmZmY3 OGI2OGI0MTk2Mjg2MzEyNDhjYjZjODEuLjU0YWEzNmMzZmI0Y2NiMDkzOTA0MzA0ODFhZDAwMjVh N2FlZmYwZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxl ci90aW1pbmcvUmVzdHJpY3RWZXJ0ZXhTaGFkZXJUaW1pbmcuaAorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdGltaW5nL1Jlc3RyaWN0VmVydGV4U2hhZGVyVGltaW5n LmgKQEAgLTcsNyArNywxMiBAQAogI2lmbmRlZiBDT01QSUxFUl9USU1JTkdfUkVTVFJJQ1RfVkVS VEVYX1NIQURFUl9USU1JTkdfSF8KICNkZWZpbmUgQ09NUElMRVJfVElNSU5HX1JFU1RSSUNUX1ZF UlRFWF9TSEFERVJfVElNSU5HX0hfCiAKKy8vIHNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTU1NjAKKyNpZiBkZWZpbmVkKEJVSUxESU5HX1FUX18pCisjaW5jbHVk ZSAiU2hhZGVyTGFuZy5oIgorI2Vsc2UKICNpbmNsdWRlICJHTFNMQU5HL1NoYWRlckxhbmcuaCIK KyNlbmRpZgogCiAjaW5jbHVkZSAiY29tcGlsZXIvaW50ZXJtZWRpYXRlLmgiCiAjaW5jbHVkZSAi Y29tcGlsZXIvSW5mb1NpbmsuaCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5w cmkgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCmluZGV4IGY3MzU5YWY4ZmMxMjFmNjcwNmRk NmExMTcwMzljZDExYjBmZWJiNGQuLmNlNDQwYTk3ZDc3YmVjMTNjOGJkYTNkYTBkYWYyMDdmNDUy ZGUzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKKysrIGIvU291cmNl L1dlYkNvcmUvVGFyZ2V0LnByaQpAQCAtMzkxMCwxNyArMzkxMCwyNiBAQCBjb250YWlucyhERUZJ TkVTLCBXVEZfVVNFXzNEX0dSQVBISUNTPTEpIHsKIAogICAgIElOQ0xVREVQQVRIICs9ICQkUFdE L3BsYXRmb3JtL2dyYXBoaWNzL2dwdQogCisgICAgQU5HTEVfRElSID0gJCRyZXBsYWNlKFBXRCwg IldlYkNvcmUiLCAiVGhpcmRQYXJ0eS9BTkdMRSIpCisKICAgICBjb250YWlucyhRVF9DT05GSUcs IG9wZW5nbCkgfCBjb250YWlucyhRVF9DT05GSUcsIG9wZW5nbGVzMikgewogICAgICAgICAhY29u dGFpbnMoUVRfQ09ORklHLCBvcGVuZ2xlczIpIHsKICAgICAgICAgICAgIFNPVVJDRVMgKz0gXAog ICAgICAgICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMLmNwcCBcCiAgICAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0 ZW5zaW9uczNET3BlbkdMLmNwcAorCisgICAgICAgICAgICAgICAjIElmIHdlIGRvbid0IGhhdmUg R0xFUzIsIHVzZSBBbmdsZSdzIEdMRVMyL0VHTCBoZWFkZXJzICYgaW1wbGVtZW50YXRpb24uCisg ICAgICAgICAgICAgICBJTkNMVURFUEFUSCArPSAkJEFOR0xFX0RJUi9pbmNsdWRlCiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBTT1VSQ0VTICs9IFwKICAgICAgICAgICAgICAgIHBsYXRm b3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTEVTLmNwcCBcCiAgICAg ICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMu Y3BwCiAgICAgICAgIH0KIAorICAgICAgICAjIHJlcXVpcmVkIGZvciBTaGFkZXJMYW5nLmggaW5j bHVkZSBpbiBBTkdMRSBzb3VyY2UgY29kZQorICAgICAgICAjIHNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1NjAKKyAgICAgICAgSU5DTFVERVBBVEggKz0gJCRB TkdMRV9ESVIvaW5jbHVkZS9HTFNMQU5HCisKICAgICAgICAgSEVBREVSUyArPSBwbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMLmgKIAogICAgICAgICBTT1VSQ0VTICs9 IFwKQEAgLTM5MjgsMTIgKzM5MzcsOSBAQCBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFXzNEX0dS QVBISUNTPTEpIHsKICAgICAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGlj c0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKICAgICB9CiAKLSAgICBBTkdMRV9ESVIgPSAkJHJl cGxhY2UoUFdELCAiV2ViQ29yZSIsICJUaGlyZFBhcnR5L0FOR0xFIikKLQogICAgIElOQ0xVREVQ QVRIICs9IFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjIFwKLSAgICAgICAgJCRBTkdMRV9ESVIv c3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcgXAotICAgICAgICAkJEFOR0xFX0RJUi9pbmNs dWRlCisgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3CiAK ICAgICBBTkdMRV9IRUFERVJTICs9IFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVy L0Jhc2VUeXBlcy5oIFwK