198621 2019-06-06 13:14:55 -0700 [GTK] ANGLE's eglplatform.h is build broken with -DENABLE_X11_PLATFORM=OFF 2019-09-24 07:58:59 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197676 P2 Normal --- 1 mcatanzaro aperez annulen aperez bugs-noreply cgarcia commit-queue dino don.olmstead ews-watchlist graouts gyuyoung.kim kondapallykalyan mcatanzaro rakuco ryuan.choi sergio oldest_to_newest 1542536 0 mcatanzaro 2019-06-06 13:14:55 -0700 Looks like ANGLE's eglplatform.h is broken: In file included from /home/mcatanzaro/buildroot-2019.05/output/build/webkitgtk-2.25.1/Source/ThirdParty/ANGLE/include/EGL/egl.h:39:0, from /home/mcatanzaro/buildroot-2019.05/output/build/webkitgtk-2.25.1/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h:15, from /home/mcatanzaro/buildroot-2019.05/output/build/webkitgtk-2.25.1/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.cpp:12: /home/mcatanzaro/buildroot-2019.05/output/build/webkitgtk-2.25.1/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h:122:10: fatal error: X11/Xlib.h: No such file or directory #include <X11/Xlib.h> ^~~~~~~~~~~~ compilation terminated. eglplatform.h has this braindead code: #elif defined(__unix__) || defined(USE_X11) /* X11 (tentative) */ #include <X11/Xlib.h> #include <X11/Xutil.h> typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; which is clearly wrong since defined(__unix__) doesn't imply X11 is available. I don't know how to be fix because I don't know how eglplatform.h is supposed to work. Defining the EGL types to use either Wayland types or X11 types at compile time seems very strange, considering we have to support both of them at runtime. 1542548 1 aperez 2019-06-06 13:50:55 -0700 The update to ANGLE done in r245155 has re-imported a version of the “eglplatform.h” from the upstream sources which is missing the needed definitions for Wayland. That revision has this part in the diff: -#elif defined(WL_EGL_PLATFORM) - -typedef struct wl_display *EGLNativeDisplayType; -typedef struct wl_egl_pixmap *EGLNativePixmapType; -typedef struct wl_egl_window *EGLNativeWindowType; - -#elif defined(__unix__) - -#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS) +#elif defined(__unix__) || defined(USE_X11) …which is what caused the problem. I will check a bit more thoroughly the changes introduced in r245155 before making a patch to re-enable building without X11. 1542552 2 mcatanzaro 2019-06-06 13:58:48 -0700 Hm, so this works because we only use GLX and never use EGL at all in the X11 codepath? 1542554 3 mcatanzaro 2019-06-06 14:00:29 -0700 Checking the code pre-r245155, I don't see any Wayland-related changes in the changes.diff. Remember when editing ANGLE that your changes will be lost in the next update if you don't also update the changes.diff. 1542593 4 aperez 2019-06-06 16:08:11 -0700 (In reply to Michael Catanzaro from comment #3) > Checking the code pre-r245155, I don't see any Wayland-related changes in > the changes.diff. Remember when editing ANGLE that your changes will be lost > in the next update if you don't also update the changes.diff. In bug #189844 there was a fix for yet one more instance of this issue, and in that case I did update “changes.diff” — I wonder when did they get lost afterwards. Anyway, I will make a new patch for this tomorrow. 1571855 5 aperez 2019-09-18 01:17:31 -0700 Ouch, I ended up dropping the ball on this one. I'll get to it now because we need this fixed to import 2.26.x into Buildroot (where non-X11 builds are common). 1572345 6 379129 aperez 2019-09-19 07:02:51 -0700 Created attachment 379129 Patch 1572346 7 ews-watchlist 2019-09-19 07:03:47 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1572347 8 aperez 2019-09-19 07:04:45 -0700 (In reply to Adrian Perez from comment #6) > Created attachment 379129 [details] > Patch This approach avoids needing to do modifications in ANGLE, which makes it much less likely to re-introduce this kind of build issues whenever a new version of ANGLE is imported into the tree. 1572680 9 379129 cgarcia 2019-09-20 00:52:08 -0700 Comment on attachment 379129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379129&action=review > Source/ThirdParty/ANGLE/PlatformGTK.cmake:8 > +if (ENABLE_WAYLAND_TARGET) > + # Explicitly prefer the Wayland platform, otherwise if we are building > + # in a system without X11 ANGLE will still try to use the X11 headers. > + list(APPEND ANGLE_DEFINITIONS WL_EGL_PLATFORM) > +elseif (NOT ENABLE_X11_TARGET) what happens when we build with both x11 and wayland targets enabled? 1572720 10 aperez 2019-09-20 05:14:25 -0700 (In reply to Carlos Garcia Campos from comment #9) > Comment on attachment 379129 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=379129&action=review > > > Source/ThirdParty/ANGLE/PlatformGTK.cmake:8 > > +if (ENABLE_WAYLAND_TARGET) > > + # Explicitly prefer the Wayland platform, otherwise if we are building > > + # in a system without X11 ANGLE will still try to use the X11 headers. > > + list(APPEND ANGLE_DEFINITIONS WL_EGL_PLATFORM) > > +elseif (NOT ENABLE_X11_TARGET) > > what happens when we build with both x11 and wayland targets enabled? In that case ANGLE_USE_X11 is defined and the X11 headers are used by ANGLE's “eglplatform.h” header — that is the current behaviour already when building with support for both Wayland and X11. 1573627 11 379129 cgarcia 2019-09-24 06:20:47 -0700 Comment on attachment 379129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379129&action=review >>> Source/ThirdParty/ANGLE/PlatformGTK.cmake:8 >>> +elseif (NOT ENABLE_X11_TARGET) >> >> what happens when we build with both x11 and wayland targets enabled? > > In that case ANGLE_USE_X11 is defined and the X11 headers are used > by ANGLE's “eglplatform.h” header — that is the current behaviour > already when building with support for both Wayland and X11. Please, add a comment here explaining why x11 is not broken even if the wayland define is set unconditionally when building with both targets enabled. 1573631 12 379444 aperez 2019-09-24 06:29:47 -0700 Created attachment 379444 Patch As per a chat with Carlos García, updated to use WL_EGL_PLATFORM if only Wayland is enabled (and X11 is disabled), plus a comment clarifying why a Wayland+X11 build works even if only one version of the EGL types is used. 1573637 13 379446 aperez 2019-09-24 06:42:37 -0700 Created attachment 379446 Patch for landing 1573657 14 379446 commit-queue 2019-09-24 07:58:56 -0700 Comment on attachment 379446 Patch for landing Clearing flags on attachment: 379446 Committed r250298: <https://trac.webkit.org/changeset/250298> 1573658 15 commit-queue 2019-09-24 07:58:59 -0700 All reviewed patches have been landed. Closing bug. 379129 2019-09-19 07:02:51 -0700 2019-09-24 06:29:43 -0700 Patch bug-198621-20190919170249.patch text/plain 1641 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNDJkY2MzMjg3NTIxMzU0MjdmOGE5NjI2ZmI1MzU4YmU2NTU1ZWE2MS4uMDdmMzQ4YTVkYzQw MTVhNTdiZTQ0NzIwZDExMjA0MDg0MzYxYmM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTE5ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8 YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQU5HTEUncyBlZ2xwbGF0Zm9ybS5o IGlzIGJ1aWxkIGJyb2tlbiB3aXRoIC1ERU5BQkxFX1gxMV9QTEFURk9STT1PRkYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODYyMQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm1HVEsuY21h a2U6IFVzZSBXTF9FR0xfUExBVEZPUk0gdG8gcHJlZmVyIFdheWxhbmQgdHlwZQorICAgICAgICBk ZWZpbml0aW9ucyB3aXRoIEVOQUJMRV9XQVlMQU5EX1RBUkdFVCwgYW5kIFVTRV9TWVNURU1fRUdM IG90aGVyd2lzZQorICAgICAgICB3aGVuIEVOQUJMRV9YMTFfVEFSR0VUIGlzIG5vdCBlbmFibGVk LgorCiAyMDE5LTA5LTE2ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGluaWFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZW1vdmUgY29tbWl0LmggY29weWluZyBidWlsZCBzdGVwcwpkaWZmIC0t Z2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9QbGF0Zm9ybUdUSy5jbWFrZQppbmRleCA3NGYzNWUyOTIzNDY3MTNk NTUwZTA0NDE2MDIxMGMyODE4NGEyNThiLi43MjI5YjBlMDljYzMxYWViNzRiNjE2ZDU0MDJhMzAz NTUwZjQ5NzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9QbGF0Zm9ybUdUSy5jbWFrZQpA QCAtMSwyICsxLDExIEBACiAjIEVuYWJsZSBHTFNMIGNvbXBpbGVyIG91dHB1dC4KIGxpc3QoQVBQ RU5EIEFOR0xFX0RFRklOSVRJT05TIEFOR0xFX0VOQUJMRV9HTFNMKQorCitpZiAoRU5BQkxFX1dB WUxBTkRfVEFSR0VUKQorICAgICMgRXhwbGljaXRseSBwcmVmZXIgdGhlIFdheWxhbmQgcGxhdGZv cm0sIG90aGVyd2lzZSBpZiB3ZSBhcmUgYnVpbGRpbmcKKyAgICAjIGluIGEgc3lzdGVtIHdpdGhv dXQgWDExIEFOR0xFIHdpbGwgc3RpbGwgdHJ5IHRvIHVzZSB0aGUgWDExIGhlYWRlcnMuCisgICAg bGlzdChBUFBFTkQgQU5HTEVfREVGSU5JVElPTlMgV0xfRUdMX1BMQVRGT1JNKQorZWxzZWlmIChO T1QgRU5BQkxFX1gxMV9UQVJHRVQpCisgICAgIyBBbGxvdyBidWlsZGluZyBBTkdMRSBvbiBwbGF0 Zm9ybXMgd2hpY2ggbWF5IG5vdCBwcm92aWRlIFgxMSBoZWFkZXJzLgorICAgIGxpc3QoQVBQRU5E IEFOR0xFX0RFRklOSVRJT05TIFVTRV9TWVNURU1fRUdMKQorZW5kaWYgKCkK 379444 2019-09-24 06:29:47 -0700 2019-09-24 06:42:33 -0700 Patch bug-198621-20190924162946.patch text/plain 1849 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNDJkY2MzMjg3NTIxMzU0MjdmOGE5NjI2ZmI1MzU4YmU2NTU1ZWE2MS4uZWIxMDU5ZmE0NjIw NTQzZDEzNzJiMzhhZDdjNzE3MzQyNjNhODE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTE5ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8 YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQU5HTEUncyBlZ2xwbGF0Zm9ybS5o IGlzIGJ1aWxkIGJyb2tlbiB3aXRoIC1ERU5BQkxFX1gxMV9QTEFURk9STT1PRkYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODYyMQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm1HVEsuY21h a2U6IERlZmluZSBXTF9FR0xfUExBVEZPUk0gdG8gcHJlZmVyIFdheWxhbmQgdHlwZQorICAgICAg ICBkZWZpbml0aW9ucyB3aXRoIEVOQUJMRV9XQVlMQU5EX1RBUkdFVD1PTiBhbmQgRU5BQkxFX1gx MV9UQVJHRVQ9T0ZGCisgICAgICAgIHRvIGF2b2lkIEFOR0xFJ3MgZWdscGxhdGZvcm0uaCBmcm9t IHRyeWluZyB0byBpbmNsdWRlIHRoZSBYMTEgaGVhZGVycy4KKwogMjAxOS0wOS0xNiAgSmFtZXMg RGFycGluaWFuICA8amRhcnBpbmlhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIGNv bW1pdC5oIGNvcHlpbmcgYnVpbGQgc3RlcHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZv cm1HVEsuY21ha2UKaW5kZXggNzRmMzVlMjkyMzQ2NzEzZDU1MGUwNDQxNjAyMTBjMjgxODRhMjU4 Yi4uZTM1Y2RiMTc2ODAyNjA4ZjUzNzNjZjAxZWRlNDEyMDU4NTMyYmEwYSAxMDA2NDQKLS0tIGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTEsMiArMSwxNSBAQAogIyBFbmFi bGUgR0xTTCBjb21waWxlciBvdXRwdXQuCiBsaXN0KEFQUEVORCBBTkdMRV9ERUZJTklUSU9OUyBB TkdMRV9FTkFCTEVfR0xTTCkKKworIyBOT1RFOiBXaGVuIGJvdGggV2F5bGFuZCBhbmQgWDExIGFy ZSBlbmFibGVkLCBBTkdMRV9VU0VfWDExIHdpbGwgYmUKKyMgZGVmaW5lZCBhbmQgdGhlIFgxMSB0 eXBlIGRlZmluaXRpb25zIHdpbGwgYmUgdXNlZCBmb3IgY29kZSBpbnZvbHZpbmcKKyMgYm90aC4g VGhhdCB3b3JrcyBiZWNhdXNlIHR5cGVzIGZvciBib3RoIFdheWxhbmQgYW5kIFgxMSBoYXZlIHRo ZSBzYW1lCisjIHNpemVzIGFuZCB0aGUgY29kZSBpbiBXZWJLaXQgY2FzdHMgdGhlIHZhbHVlcyB0 byB0aGUgcHJvcGVyIHR5cGVzIGFzCisjIG5lZWRlZC4KKworaWYgKEVOQUJMRV9XQVlMQU5EX1RB UkdFVCBBTkQgTk9UIEVOQUJMRV9YMTFfVEFSR0VUKQorICAgIGxpc3QoQVBQRU5EIEFOR0xFX0RF RklOSVRJT05TIFdMX0VHTF9QTEFURk9STSkKK2Vsc2VpZiAoTk9UIEVOQUJMRV9YMTFfVEFSR0VU KQorICAgICMgQWxsb3cgYnVpbGRpbmcgQU5HTEUgb24gcGxhdGZvcm1zIHdoaWNoIG1heSBub3Qg cHJvdmlkZSBYMTEgaGVhZGVycy4KKyAgICBsaXN0KEFQUEVORCBBTkdMRV9ERUZJTklUSU9OUyBV U0VfU1lTVEVNX0VHTCkKK2VuZGlmICgpCg== 379446 2019-09-24 06:42:37 -0700 2019-09-24 07:58:56 -0700 Patch for landing bug-198621-20190924164236.patch text/plain 1855 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNDJkY2MzMjg3NTIxMzU0MjdmOGE5NjI2ZmI1MzU4YmU2NTU1ZWE2MS4uMjFkMDI2YWVlNDMz NDZmZjgzZDQ4M2U4MWE4M2U2OWRhNjk2MTQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTI0ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8 YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQU5HTEUncyBlZ2xwbGF0Zm9ybS5o IGlzIGJ1aWxkIGJyb2tlbiB3aXRoIC1ERU5BQkxFX1gxMV9QTEFURk9STT1PRkYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODYyMQorCisgICAgICAg IFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAgICAgICogUGxhdGZvcm1H VEsuY21ha2U6IERlZmluZSBXTF9FR0xfUExBVEZPUk0gdG8gcHJlZmVyIFdheWxhbmQgdHlwZQor ICAgICAgICBkZWZpbml0aW9ucyB3aXRoIEVOQUJMRV9XQVlMQU5EX1RBUkdFVD1PTiBhbmQgRU5B QkxFX1gxMV9UQVJHRVQ9T0ZGCisgICAgICAgIHRvIGF2b2lkIEFOR0xFJ3MgZWdscGxhdGZvcm0u aCBmcm9tIHRyeWluZyB0byBpbmNsdWRlIHRoZSBYMTEgaGVhZGVycy4KKwogMjAxOS0wOS0xNiAg SmFtZXMgRGFycGluaWFuICA8amRhcnBpbmlhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVt b3ZlIGNvbW1pdC5oIGNvcHlpbmcgYnVpbGQgc3RlcHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggNzRmMzVlMjkyMzQ2NzEzZDU1MGUwNDQxNjAyMTBjMjgx ODRhMjU4Yi4uZTM1Y2RiMTc2ODAyNjA4ZjUzNzNjZjAxZWRlNDEyMDU4NTMyYmEwYSAxMDA2NDQK LS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTEsMiArMSwxNSBAQAog IyBFbmFibGUgR0xTTCBjb21waWxlciBvdXRwdXQuCiBsaXN0KEFQUEVORCBBTkdMRV9ERUZJTklU SU9OUyBBTkdMRV9FTkFCTEVfR0xTTCkKKworIyBOT1RFOiBXaGVuIGJvdGggV2F5bGFuZCBhbmQg WDExIGFyZSBlbmFibGVkLCBBTkdMRV9VU0VfWDExIHdpbGwgYmUKKyMgZGVmaW5lZCBhbmQgdGhl IFgxMSB0eXBlIGRlZmluaXRpb25zIHdpbGwgYmUgdXNlZCBmb3IgY29kZSBpbnZvbHZpbmcKKyMg Ym90aC4gVGhhdCB3b3JrcyBiZWNhdXNlIHR5cGVzIGZvciBib3RoIFdheWxhbmQgYW5kIFgxMSBo YXZlIHRoZSBzYW1lCisjIHNpemVzIGFuZCB0aGUgY29kZSBpbiBXZWJLaXQgY2FzdHMgdGhlIHZh bHVlcyB0byB0aGUgcHJvcGVyIHR5cGVzIGFzCisjIG5lZWRlZC4KKworaWYgKEVOQUJMRV9XQVlM QU5EX1RBUkdFVCBBTkQgTk9UIEVOQUJMRV9YMTFfVEFSR0VUKQorICAgIGxpc3QoQVBQRU5EIEFO R0xFX0RFRklOSVRJT05TIFdMX0VHTF9QTEFURk9STSkKK2Vsc2VpZiAoTk9UIEVOQUJMRV9YMTFf VEFSR0VUKQorICAgICMgQWxsb3cgYnVpbGRpbmcgQU5HTEUgb24gcGxhdGZvcm1zIHdoaWNoIG1h eSBub3QgcHJvdmlkZSBYMTEgaGVhZGVycy4KKyAgICBsaXN0KEFQUEVORCBBTkdMRV9ERUZJTklU SU9OUyBVU0VfU1lTVEVNX0VHTCkKK2VuZGlmICgpCg==