163000 2016-10-06 00:13:17 -0700 [GTK] Build fix for X11 and GStreamerGL after r183731 2016-10-06 03:47:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yoon yoon cgarcia commit-queue gustavo mario pnormand oldest_to_newest 1236930 0 yoon 2016-10-06 00:13:17 -0700 [GTK] Build fix for X11 and GStreamerGL after r183731 1236931 1 290788 yoon 2016-10-06 00:14:15 -0700 Created attachment 290788 Patch 1236942 2 290788 cgarcia 2016-10-06 00:58:11 -0700 Comment on attachment 290788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290788&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:267 > -#endif > - > -#if PLATFORM(WAYLAND) > +#elif PLATFORM(WAYLAND) What's exactly the build failure? I don't think this change is correct, X11 and Wayland are not mutually exclusive, so the ifdefs are correct here. Why is the display created twice? if both X11 and wayland are enabled, shared display will be either X11 or wayland. 1236946 3 yoon 2016-10-06 01:08:04 -0700 (In reply to comment #2) > Comment on attachment 290788 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=290788&action=review > > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:267 > > -#endif > > - > > -#if PLATFORM(WAYLAND) > > +#elif PLATFORM(WAYLAND) > > What's exactly the build failure? I don't think this change is correct, X11 > and Wayland are not mutually exclusive, so the ifdefs are correct here. Why > is the display created twice? if both X11 and wayland are enabled, shared > display will be either X11 or wayland. As you mentioned, PlatformDisplay is only created just for once. And I misunderstood that gst_gl_display_x11_new_with_display and gst_gl_display_egl_new_with_egl_display would be executed at same time. The build problem is, MediaPlayerPrivateGStreamerBase does not include gstgldisplay_egl.h if we are using GLX. So gst_gl_display_egl_new_with_egl_display is not visible from GSteamerBase. I'll take a look if there is no problem to include both of gstgldisplay_x11 and gstgldisplay_egl 1236952 4 yoon 2016-10-06 01:27:16 -0700 (In reply to comment #3) > (In reply to comment #2) > As you mentioned, PlatformDisplay is only created just for once. > And I misunderstood that gst_gl_display_x11_new_with_display and > gst_gl_display_egl_new_with_egl_display would be executed at same time. > > The build problem is, MediaPlayerPrivateGStreamerBase does not include > gstgldisplay_egl.h if we are using GLX. So > gst_gl_display_egl_new_with_egl_display is not visible from GSteamerBase. > > I'll take a look if there is no problem to include both of gstgldisplay_x11 > and gstgldisplay_egl There could be a build problem if the platform has only X11 or EGL. Since gstgldisplay_x11.h includes headers of X11 and gstgldisplay_egl.h includes headers of EGL, we cannot include both of them at same time if the target does not have both. 1236953 5 290788 pnormand 2016-10-06 01:28:35 -0700 Comment on attachment 290788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290788&action=review >>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:267 >>> +#elif PLATFORM(WAYLAND) >> >> What's exactly the build failure? I don't think this change is correct, X11 and Wayland are not mutually exclusive, so the ifdefs are correct here. Why is the display created twice? if both X11 and wayland are enabled, shared display will be either X11 or wayland. > > As you mentioned, PlatformDisplay is only created just for once. > And I misunderstood that gst_gl_display_x11_new_with_display and gst_gl_display_egl_new_with_egl_display would be executed at same time. > > The build problem is, MediaPlayerPrivateGStreamerBase does not include gstgldisplay_egl.h if we are using GLX. So gst_gl_display_egl_new_with_egl_display is not visible from GSteamerBase. > > I'll take a look if there is no problem to include both of gstgldisplay_x11 and gstgldisplay_egl This is wrong because we can have both X11 and WAYLAND enabled. IIUC anyway :) 1236987 6 290807 yoon 2016-10-06 03:17:46 -0700 Created attachment 290807 Patch 1236988 7 yoon 2016-10-06 03:18:58 -0700 (In reply to comment #6) > Created attachment 290807 [details] > Patch Found much simpler solution. Just include gstdisplay_egl.h if we have EGL. Ready for review. 1236994 8 290807 commit-queue 2016-10-06 03:47:01 -0700 Comment on attachment 290807 Patch Clearing flags on attachment: 290807 Committed r206861: <http://trac.webkit.org/changeset/206861> 1236995 9 commit-queue 2016-10-06 03:47:06 -0700 All reviewed patches have been landed. Closing bug. 290788 2016-10-06 00:14:15 -0700 2016-10-06 03:17:39 -0700 Patch bug-163000-20161006161101.patch text/plain 1758 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdlYzNhOGI5OGM3OGNh ZTc4ZGQ0NWY4MjBlNGM0MzY0ZTUyZjk5Yi4uNmM3YzE2MTczY2Y0ZmY0MjE3ZmE1NmIwZTFhNjI3 NGY1NDRkYTk5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE2LTEwLTA2ICBHd2Fu ZyBZb29uIEh3YW5nICA8eW9vbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJ1aWxkIGZp eCBmb3IgWDExIGFuZCBHU3RyZWFtZXJHTCBhZnRlciByMTgzNzMxCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMwMDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmVuc3VyZUdzdEdMQ29udGV4dCk6 CisgICAgICAgIEdzdEdMRGlzcGxheSBzaG91bGQgYmUgY3JlYXRlZCBqdXN0IG9uY2UuCisKIDIw MTYtMTAtMDUgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMDY4NDUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggYjJmZWRiMGI2N2Ri ZmQ0ZjMyZmRkZjI1OTEyZWZjNWMyNWRkZTVjZC4uNGRlODM5ZDljNWYzMmZmZDgzNWE0N2IwYmNi MzdlNmQ3NGE0ODg2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMjY0LDkgKzI2NCw3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyQmFzZTo6ZW5zdXJlR3N0R0xDb250ZXh0KCkKICAgICAgICAgaWYgKGlz PFBsYXRmb3JtRGlzcGxheVgxMT4oc2hhcmVkRGlzcGxheSkpCiAgICAgICAgICAgICBtX2dsRGlz cGxheSA9IEdTVF9HTF9ESVNQTEFZKGdzdF9nbF9kaXNwbGF5X2VnbF9uZXdfd2l0aF9lZ2xfZGlz cGxheShkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KHNoYXJlZERpc3BsYXkpLm5hdGl2ZSgp KSk7CiAjZW5kaWYKLSNlbmRpZgotCi0jaWYgUExBVEZPUk0oV0FZTEFORCkKKyNlbGlmIFBMQVRG T1JNKFdBWUxBTkQpCiAgICAgICAgIGlmIChpczxQbGF0Zm9ybURpc3BsYXlXYXlsYW5kPihzaGFy ZWREaXNwbGF5KSkKICAgICAgICAgICAgIG1fZ2xEaXNwbGF5ID0gR1NUX0dMX0RJU1BMQVkoZ3N0 X2dsX2Rpc3BsYXlfZWdsX25ld193aXRoX2VnbF9kaXNwbGF5KGRvd25jYXN0PFBsYXRmb3JtRGlz cGxheVdheWxhbmQ+KHNoYXJlZERpc3BsYXkpLm5hdGl2ZSgpKSk7CiAjZW5kaWYK 290807 2016-10-06 03:17:46 -0700 2016-10-06 03:47:01 -0700 Patch bug-163000-20161006191432.patch text/plain 1404 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ1MTk1NTUzNzIwMWUz OWQ2MWI1NjZmMjhjM2U1NjA5MzJiODA0ZS4uNTE1ZmVkMjA3ZGVkZDdjN2Q2ZDU0MDVmNWY4ZjI4 MzU5OTFiN2JlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEwLTA2ICBHd2Fu ZyBZb29uIEh3YW5nICA8eW9vbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJ1aWxkIGZp eCBmb3IgWDExIGFuZCBHU3RyZWFtZXJHTCBhZnRlciByMTgzNzMxCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMwMDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcDoKKyAgICAgICAgSW5jbHVk ZSBnc3RnbGRpc3BsYXlfZWdsLmggaWYgcGxhdGZvcm0gdXNlcyBFR0wuCisKIDIwMTYtMTAtMDYg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFtGZXRjaCBBUEld IEZvcmJpZCByZWRpcmVjdGlvbiB0byBub24tSFRUUChzKSBVUkwgaW4gbm9uLW5hdmlnYXRpb24g bW9kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlLmNwcAppbmRleCBiMmZlZGIwYjY3ZGJmZDRmMzJmZGRmMjU5MTJlZmM1YzI1ZGRlNWNkLi43 NmRlZmI0MzA1OTgxMjU0YzFmNTc5M2UzNTk0M2I1NzIyYzA3Y2M4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCkBAIC01NCw3ICs1 NCw5IEBACiAjaWYgVVNFKEdMWCkKICNpbmNsdWRlICJHTENvbnRleHRHTFguaCIKICNpbmNsdWRl IDxnc3QvZ2wveDExL2dzdGdsZGlzcGxheV94MTEuaD4KLSNlbGlmIFVTRShFR0wpCisjZW5kaWYK KworI2lmIFVTRShFR0wpCiAjaW5jbHVkZSAiR0xDb250ZXh0RUdMLmgiCiAjaW5jbHVkZSA8Z3N0 L2dsL2VnbC9nc3RnbGRpc3BsYXlfZWdsLmg+CiAjZW5kaWYK