178898 2017-10-26 16:55:21 -0700 [WPE] Upstream or stop using cairo-egl-device-create-for-egl-surface.patch 2017-11-15 12:09:37 -0800 1 1 1 Unclassified WebKit WPE WebKit Other PC Linux RESOLVED FIXED P2 Normal --- 178894 1 mcatanzaro mcatanzaro aperez bugs-noreply commit-queue mcatanzaro olivier.blin webkit-bug-importer zan oldest_to_newest 1365120 0 mcatanzaro 2017-10-26 16:55:21 -0700 We currently have Tools/wpe/patches/cairo-egl-device-create-for-egl-surface.patch. We need to either upstream that patch and wait patiently for the next cairo release, or else find a way to not require it, since we surely don't want to create a release that won't actually build on any platforms. I've done a bit of grepping and I think it may be completely unused, so this might be an easy problem to resolve. 1365165 1 mcatanzaro 2017-10-26 17:40:34 -0700 I didn't do a clean build, but reran update-webkitwpe-libs and rebuilt WPE, and it builds just fine without the patch. Let's get rid of it and see if anything breaks. But I guess it's only needed downstream or something. 1365166 2 325088 mcatanzaro 2017-10-26 17:44:50 -0700 Created attachment 325088 Patch 1365298 3 325088 aperez 2017-10-27 01:35:37 -0700 Comment on attachment 325088 Patch r+ (informal) Same opinion here, and I also checked that building without the patch seems to work fine. 1366080 4 325088 commit-queue 2017-10-30 11:14:03 -0700 Comment on attachment 325088 Patch Clearing flags on attachment: 325088 Committed r224190: <https://trac.webkit.org/changeset/224190> 1366081 5 commit-queue 2017-10-30 11:14:04 -0700 All reviewed patches have been landed. Closing bug. 1369004 6 olivier.blin 2017-11-07 07:38:49 -0800 For reference, usage of cairo_egl_device_create_for_egl_surface() has been removed in this commit (March 2017) downstream: https://github.com/WebPlatformForEmbedded/WPEWebKit/commit/8bd19fc8035813f1b7334d7ff716e85d9091c65c 325088 2017-10-26 17:44:50 -0700 2017-10-30 11:14:03 -0700 Patch bug-178898-20171026194449.patch text/plain 6540 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MDU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTliZDhlMGM4ZjZiMGNjYTA1NTljYTc0MTdkNDE0YTI0 ZTEzNzVhNS4uNDRkNGQ0MzY1MTEwZjUxZWIyNTA1MzM1ZTEwN2U4YmQyZGI2Yzk4OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE3LTEwLTI2ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbV1BFXSBVcHN0cmVhbSBvciBzdG9wIHVzaW5nIGNhaXJvLWVnbC1kZXZp Y2UtY3JlYXRlLWZvci1lZ2wtc3VyZmFjZS5wYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4ODk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBzZWVtcyB0byBiZSB1bnVzZWQuCisK KyAgICAgICAgKiB3cGUvamhidWlsZC5tb2R1bGVzOgorICAgICAgICAqIHdwZS9wYXRjaGVzL2Nh aXJvLWVnbC1kZXZpY2UtY3JlYXRlLWZvci1lZ2wtc3VyZmFjZS5wYXRjaDogUmVtb3ZlZC4KKwog MjAxNy0xMC0yNiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAg ICAgICBOb3dQbGF5aW5nSW5mbyBzaG91bGQgY29udGFpbiBhIHVuaXF1ZSBpZGVudGlmaWVyCmRp ZmYgLS1naXQgYS9Ub29scy93cGUvamhidWlsZC5tb2R1bGVzIGIvVG9vbHMvd3BlL2poYnVpbGQu bW9kdWxlcwppbmRleCBhMTIyZWI3YTk0Yzc4MjlhYjBmMDJjY2Q2NmVmMTkxY2YzNmFlM2NiLi5m ZGQ2ZTkxNjA4OWJiM2I3MDdiMDRlNTlmMTA5MGZiMTYwZDk2OTM2IDEwMDY0NAotLS0gYS9Ub29s cy93cGUvamhidWlsZC5tb2R1bGVzCisrKyBiL1Rvb2xzL3dwZS9qaGJ1aWxkLm1vZHVsZXMKQEAg LTE1MSw5ICsxNTEsNyBAQAogICAgIDwvZGVwZW5kZW5jaWVzPgogICAgIDxicmFuY2ggbW9kdWxl PSJyZWxlYXNlcy9jYWlyby0xLjE0LjgudGFyLnh6IiB2ZXJzaW9uPSIxLjE0LjgiCiAgICAgICAg ICAgICByZXBvPSJjYWlyb2dyYXBoaWNzLm9yZyIKLSAgICAgICAgICAgIGhhc2g9InNoYTE6YzZm N2I5OTk4NmY5M2M5ZGY3ODY1M2MzZTZhM2I1MDQzZjY1MTQ1ZSI+Ci0gICAgICA8cGF0Y2ggZmls ZT0iY2Fpcm8tZWdsLWRldmljZS1jcmVhdGUtZm9yLWVnbC1zdXJmYWNlLnBhdGNoIiBzdHJpcD0i MSIvPgotICAgIDwvYnJhbmNoPgorICAgICAgICAgICAgaGFzaD0ic2hhMTpjNmY3Yjk5OTg2Zjkz YzlkZjc4NjUzYzNlNmEzYjUwNDNmNjUxNDVlIi8+CiAgIDwvYXV0b3Rvb2xzPgogCiAgIDxhdXRv dG9vbHMgaWQ9InhrYmNvbW1vbiIKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9wYXRjaGVzL2NhaXJv LWVnbC1kZXZpY2UtY3JlYXRlLWZvci1lZ2wtc3VyZmFjZS5wYXRjaCBiL1Rvb2xzL3dwZS9wYXRj aGVzL2NhaXJvLWVnbC1kZXZpY2UtY3JlYXRlLWZvci1lZ2wtc3VyZmFjZS5wYXRjaApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZDQ2ZGY0NWI2ZjNmOWQ1MDNjMzM3MzhiZDU0MTA1M2Y4 MWI1NDllOC4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9U b29scy93cGUvcGF0Y2hlcy9jYWlyby1lZ2wtZGV2aWNlLWNyZWF0ZS1mb3ItZWdsLXN1cmZhY2Uu cGF0Y2gKKysrIC9kZXYvbnVsbApAQCAtMSwxMzMgKzAsMCBAQAotRnJvbSBhNGUwZGFmMThiZjgy NTI0NjNmNjZkNzVlZWY0OTljZmZmYTMyNTY1IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQotRnJv bTogWmFuIERvYmVyc2VrIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KLURhdGU6IE1vbiwgMTcgTm92 IDIwMTQgMDE6MjM6MTUgLTA4MDAKLVN1YmplY3Q6IFtQQVRDSF0gQWRkIGNhaXJvX2VnbF9kZXZp Y2VfY3JlYXRlX2Zvcl9lZ2xfc3VyZmFjZSgpLgotCi0tLS0KLSBzcmMvY2Fpcm8tZWdsLWNvbnRl eHQuYyB8IDY2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0KLSBzcmMvY2Fpcm8tZ2wuaCAgICAgICAgICB8ICAzICsrKwotIDIgZmlsZXMgY2hhbmdlZCwg NjAgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKLQotZGlmZiAtLWdpdCBhL3NyYy9jYWly by1lZ2wtY29udGV4dC5jIGIvc3JjL2NhaXJvLWVnbC1jb250ZXh0LmMKLWluZGV4IGJmNzA0YzYu LmJlMmJjZjkgMTAwNjQ0Ci0tLS0gYS9zcmMvY2Fpcm8tZWdsLWNvbnRleHQuYwotKysrIGIvc3Jj L2NhaXJvLWVnbC1jb250ZXh0LmMKLUBAIC00OCw3ICs0OCw4IEBAIHR5cGVkZWYgc3RydWN0IF9j YWlyb19lZ2xfY29udGV4dCB7Ci0gICAgIEVHTERpc3BsYXkgZGlzcGxheTsKLSAgICAgRUdMQ29u dGV4dCBjb250ZXh0OwotIAotLSAgICBFR0xTdXJmYWNlIGR1bW15X3N1cmZhY2U7Ci0rICAgIEVH TFN1cmZhY2Ugc3VyZmFjZTsKLSsgICAgY2Fpcm9fYm9vbF90IGlzX2R1bW15X3N1cmZhY2U7Ci0g Ci0gICAgIEVHTENvbnRleHQgcHJldmlvdXNfY29udGV4dDsKLSAgICAgRUdMU3VyZmFjZSBwcmV2 aW91c19zdXJmYWNlOwotQEAgLTc0LDcgKzc1LDcgQEAgX2VnbF9nZXRfY3VycmVudF9zdXJmYWNl IChjYWlyb19lZ2xfY29udGV4dF90ICpjdHgpCi0gewotICAgICBpZiAoY3R4LT5iYXNlLmN1cnJl bnRfdGFyZ2V0ID09IE5VTEwgfHwKLSAgICAgICAgIF9jYWlyb19nbF9zdXJmYWNlX2lzX3RleHR1 cmUgKGN0eC0+YmFzZS5jdXJyZW50X3RhcmdldCkpIHsKLS0JcmV0dXJuICBjdHgtPmR1bW15X3N1 cmZhY2U7Ci0rCXJldHVybiAgY3R4LT5zdXJmYWNlOwotICAgICB9Ci0gCi0gICAgIHJldHVybiAo KGNhaXJvX2VnbF9zdXJmYWNlX3QgKikgY3R4LT5iYXNlLmN1cnJlbnRfdGFyZ2V0KS0+ZWdsOwot QEAgLTE1MSw4ICsxNTIsOCBAQCBfZWdsX2Rlc3Ryb3kgKHZvaWQgKmFic3RyYWN0X2N0eCkKLSAK LSAgICAgZWdsTWFrZUN1cnJlbnQgKGN0eC0+ZGlzcGxheSwKLSAJCSAgICBFR0xfTk9fU1VSRkFD RSwgRUdMX05PX1NVUkZBQ0UsIEVHTF9OT19DT05URVhUKTsKLS0gICAgaWYgKGN0eC0+ZHVtbXlf c3VyZmFjZSAhPSBFR0xfTk9fU1VSRkFDRSkKLS0gICAgICAgIGVnbERlc3Ryb3lTdXJmYWNlIChj dHgtPmRpc3BsYXksIGN0eC0+ZHVtbXlfc3VyZmFjZSk7Ci0rICAgIGlmIChjdHgtPmlzX2R1bW15 X3N1cmZhY2UgJiYgY3R4LT5zdXJmYWNlICE9IEVHTF9OT19TVVJGQUNFKQotKyAgICAgICAgZWds RGVzdHJveVN1cmZhY2UgKGN0eC0+ZGlzcGxheSwgY3R4LT5zdXJmYWNlKTsKLSB9Ci0gCi0gc3Rh dGljIGNhaXJvX2Jvb2xfdAotQEAgLTIxOCwxMyArMjE5LDE0IEBAIGNhaXJvX2VnbF9kZXZpY2Vf Y3JlYXRlIChFR0xEaXNwbGF5IGRweSwgRUdMQ29udGV4dCBlZ2wpCi0gCWVnbFF1ZXJ5Q29udGV4 dCAoZHB5LCBlZ2wsIEVHTF9DT05GSUdfSUQsICZjb25maWdfYXR0cmlic1sxXSk7Ci0gCWVnbENo b29zZUNvbmZpZyAoZHB5LCBjb25maWdfYXR0cmlicywgJmNvbmZpZywgMSwgJm51bUNvbmZpZ3Mp OwotIAotLQljdHgtPmR1bW15X3N1cmZhY2UgPSBlZ2xDcmVhdGVQYnVmZmVyU3VyZmFjZSAoZHB5 LCBjb25maWcsIGF0dHJpYnMpOwotLQlpZiAoY3R4LT5kdW1teV9zdXJmYWNlID09IE5VTEwpIHsK LSsJY3R4LT5pc19kdW1teV9zdXJmYWNlID0gVFJVRTsKLSsJY3R4LT5zdXJmYWNlID0gZWdsQ3Jl YXRlUGJ1ZmZlclN1cmZhY2UgKGRweSwgY29uZmlnLCBhdHRyaWJzKTsKLSsJaWYgKGN0eC0+c3Vy ZmFjZSA9PSBOVUxMKSB7Ci0gCSAgICBmcmVlIChjdHgpOwotIAkgICAgcmV0dXJuIF9jYWlyb19n bF9jb250ZXh0X2NyZWF0ZV9pbl9lcnJvciAoQ0FJUk9fU1RBVFVTX05PX01FTU9SWSk7Ci0gCX0K LSAKLS0JaWYgKCFlZ2xNYWtlQ3VycmVudCAoZHB5LCBjdHgtPmR1bW15X3N1cmZhY2UsIGN0eC0+ ZHVtbXlfc3VyZmFjZSwgZWdsKSkgewotKwlpZiAoIWVnbE1ha2VDdXJyZW50IChkcHksIGN0eC0+ c3VyZmFjZSwgY3R4LT5zdXJmYWNlLCBlZ2wpKSB7Ci0gCSAgICBmcmVlIChjdHgpOwotIAkgICAg cmV0dXJuIF9jYWlyb19nbF9jb250ZXh0X2NyZWF0ZV9pbl9lcnJvciAoQ0FJUk9fU1RBVFVTX05P X01FTU9SWSk7Ci0gCX0KLUBAIC0yMzgsOCArMjQwLDU0IEBAIGNhaXJvX2VnbF9kZXZpY2VfY3Jl YXRlIChFR0xEaXNwbGF5IGRweSwgRUdMQ29udGV4dCBlZ2wpCi0gCi0gICAgIHN0YXR1cyA9IF9j YWlyb19nbF9jb250ZXh0X2luaXQgKCZjdHgtPmJhc2UpOwotICAgICBpZiAodW5saWtlbHkgKHN0 YXR1cykpIHsKLS0JaWYgKGN0eC0+ZHVtbXlfc3VyZmFjZSAhPSBFR0xfTk9fU1VSRkFDRSkKLS0J ICAgIGVnbERlc3Ryb3lTdXJmYWNlIChkcHksIGN0eC0+ZHVtbXlfc3VyZmFjZSk7Ci0rCWlmIChj dHgtPnN1cmZhY2UgIT0gRUdMX05PX1NVUkZBQ0UpCi0rCSAgICBlZ2xEZXN0cm95U3VyZmFjZSAo ZHB5LCBjdHgtPnN1cmZhY2UpOwotKwlmcmVlIChjdHgpOwotKwlyZXR1cm4gX2NhaXJvX2dsX2Nv bnRleHRfY3JlYXRlX2luX2Vycm9yIChzdGF0dXMpOwotKyAgICB9Ci0rCi0rICAgIGVnbE1ha2VD dXJyZW50IChkcHksIEVHTF9OT19TVVJGQUNFLCBFR0xfTk9fU1VSRkFDRSwgRUdMX05PX0NPTlRF WFQpOwotKwotKyAgICByZXR1cm4gJmN0eC0+YmFzZS5iYXNlOwotK30KLSsKLStjYWlyb19kZXZp Y2VfdCAqCi0rY2Fpcm9fZWdsX2RldmljZV9jcmVhdGVfZm9yX2VnbF9zdXJmYWNlIChFR0xEaXNw bGF5IGRweSwgRUdMQ29udGV4dCBlZ2wsIEVHTFN1cmZhY2Ugc3VyZmFjZSkKLSt7Ci0rICAgIGNh aXJvX2VnbF9jb250ZXh0X3QgKmN0eDsKLSsgICAgY2Fpcm9fc3RhdHVzX3Qgc3RhdHVzOwotKwot KyAgICBjdHggPSBjYWxsb2MgKDEsIHNpemVvZiAoY2Fpcm9fZWdsX2NvbnRleHRfdCkpOwotKyAg ICBpZiAodW5saWtlbHkgKGN0eCA9PSBOVUxMKSkKLSsJcmV0dXJuIF9jYWlyb19nbF9jb250ZXh0 X2NyZWF0ZV9pbl9lcnJvciAoQ0FJUk9fU1RBVFVTX05PX01FTU9SWSk7Ci0rCi0rICAgIGN0eC0+ ZGlzcGxheSA9IGRweTsKLSsgICAgY3R4LT5jb250ZXh0ID0gZWdsOwotKyAgICBjdHgtPnN1cmZh Y2UgPSBzdXJmYWNlOwotKwotKyAgICBjdHgtPmJhc2UuYWNxdWlyZSA9IF9lZ2xfYWNxdWlyZTsK LSsgICAgY3R4LT5iYXNlLnJlbGVhc2UgPSBfZWdsX3JlbGVhc2U7Ci0rICAgIGN0eC0+YmFzZS5t YWtlX2N1cnJlbnQgPSBfZWdsX21ha2VfY3VycmVudDsKLSsgICAgY3R4LT5iYXNlLnN3YXBfYnVm ZmVycyA9IF9lZ2xfc3dhcF9idWZmZXJzOwotKyAgICBjdHgtPmJhc2UuZGVzdHJveSA9IF9lZ2xf ZGVzdHJveTsKLSsKLSsgICAgLyogV2UgYXJlIGFib3V0IHRoZSBjaGFuZ2UgdGhlIGN1cnJlbnQg c3RhdGUgb2YgRUdMLCBzbyB3ZSBzaG91bGQKLSsgICAgICogcXVlcnkgdGhlIHByZS1leGlzdGlu ZyBzdXJmYWNlIG5vdyBpbnN0ZWFkIG9mIGxhdGVyLiAqLwotKyAgICBfZWdsX3F1ZXJ5X2N1cnJl bnRfc3RhdGUgKGN0eCk7Ci0rCi0rCWlmICghZWdsTWFrZUN1cnJlbnQgKGRweSwgc3VyZmFjZSwg c3VyZmFjZSwgZWdsKSkgewotKwkgICAgZnJlZSAoY3R4KTsKLSsJICAgIHJldHVybiBfY2Fpcm9f Z2xfY29udGV4dF9jcmVhdGVfaW5fZXJyb3IgKENBSVJPX1NUQVRVU19OT19NRU1PUlkpOwotKwl9 Ci0rCi0rICAgIHN0YXR1cyA9IF9jYWlyb19nbF9kaXNwYXRjaF9pbml0ICgmY3R4LT5iYXNlLmRp c3BhdGNoLCBlZ2xHZXRQcm9jQWRkcmVzcyk7Ci0rICAgIGlmICh1bmxpa2VseSAoc3RhdHVzKSkg ewotKwlmcmVlIChjdHgpOwotKwlyZXR1cm4gX2NhaXJvX2dsX2NvbnRleHRfY3JlYXRlX2luX2Vy cm9yIChzdGF0dXMpOwotKyAgICB9Ci0rCi0rICAgIHN0YXR1cyA9IF9jYWlyb19nbF9jb250ZXh0 X2luaXQgKCZjdHgtPmJhc2UpOwotKyAgICBpZiAodW5saWtlbHkgKHN0YXR1cykpIHsKLSAJZnJl ZSAoY3R4KTsKLSAJcmV0dXJuIF9jYWlyb19nbF9jb250ZXh0X2NyZWF0ZV9pbl9lcnJvciAoc3Rh dHVzKTsKLSAgICAgfQotZGlmZiAtLWdpdCBhL3NyYy9jYWlyby1nbC5oIGIvc3JjL2NhaXJvLWds LmgKLWluZGV4IDlmZDc2MDguLmE5NGY1ODEgMTAwNjQ0Ci0tLS0gYS9zcmMvY2Fpcm8tZ2wuaAot KysrIGIvc3JjL2NhaXJvLWdsLmgKLUBAIC0xMzIsNiArMTMyLDkgQEAgY2Fpcm9fZ2xfc3VyZmFj ZV9jcmVhdGVfZm9yX2RjIChjYWlyb19kZXZpY2VfdAkJKmRldmljZSwKLSBjYWlyb19wdWJsaWMg Y2Fpcm9fZGV2aWNlX3QgKgotIGNhaXJvX2VnbF9kZXZpY2VfY3JlYXRlIChFR0xEaXNwbGF5IGRw eSwgRUdMQ29udGV4dCBlZ2wpOwotIAotK2NhaXJvX3B1YmxpYyBjYWlyb19kZXZpY2VfdCAqCi0r Y2Fpcm9fZWdsX2RldmljZV9jcmVhdGVfZm9yX2VnbF9zdXJmYWNlIChFR0xEaXNwbGF5IGRweSwg RUdMQ29udGV4dCBlZ2wsIEVHTFN1cmZhY2Ugc3VyZmFjZSk7Ci0rCi0gY2Fpcm9fcHVibGljIGNh aXJvX3N1cmZhY2VfdCAqCi0gY2Fpcm9fZ2xfc3VyZmFjZV9jcmVhdGVfZm9yX2VnbCAoY2Fpcm9f ZGV2aWNlX3QJKmRldmljZSwKLSAJCQkJIEVHTFN1cmZhY2UJIGVnbCwK