88677 2012-06-08 11:38:14 -0700 [GTK] build accelerated compositing on by default if OpenGL is present 2012-06-08 15:25:03 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson alex cgarcia naginenis oldest_to_newest 644890 0 mrobinson 2012-06-08 11:38:14 -0700 If OpenGL is present, we should build accelerated compositing on by default, just like WebGL. We also should improve the build script to be smarter about Clutter support (it should disable WebGL). 644902 1 146620 mrobinson 2012-06-08 11:44:28 -0700 Created attachment 146620 Patch 644943 2 146620 alex 2012-06-08 12:37:26 -0700 Comment on attachment 146620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146620&action=review Looks good to me, just added some proposals. > ChangeLog:9 > + Also prevent enabling WebGL is Clutter is turned on. nit: s/is/if/ > configure.ac:533 > + [Select accelerated backend (Clutter currently unsupported) [default=autodetect]]), [], This message could be confusing because clutter is supported but no in the detection if I understand correctly. > configure.ac:554 > OPENGL_LIBS="-lGL -ldl" Would it make sense to use PKG_CHECK_MODULES with gl? > configure.ac:572 > +if test "$enable_webgl" = "yes" && test "$with_acceleration_backend" != "opengl"; then Should we use '= "clutter"' better? > configure.ac:1262 > +if test "$with_acceleration_backend" = "clutter"; then > PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) > PKG_CHECK_MODULES([CLUTTER_GTK], > [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION]) Isn't this if repeated? 645064 3 146620 mrobinson 2012-06-08 15:10:47 -0700 Comment on attachment 146620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146620&action=review >> configure.ac:533 >> + [Select accelerated backend (Clutter currently unsupported) [default=autodetect]]), [], > > This message could be confusing because clutter is supported but no in the detection if I understand correctly. Hrm. I guess I'll write "(Clutter currently unsupported, OpenGL will be autodetected)" >> configure.ac:554 >> OPENGL_LIBS="-lGL -ldl" > > Would it make sense to use PKG_CHECK_MODULES with gl? Mesa OpenGL doesn't ship with a pkgconfig files, sadly and some systems have funky proprietary drivers. >> configure.ac:572 >> +if test "$enable_webgl" = "yes" && test "$with_acceleration_backend" != "opengl"; then > > Should we use '= "clutter"' better? I also want this to trigger for with_acceleration_backend = 'none' >> configure.ac:1262 >> [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION]) > > Isn't this if repeated? Yes it is! I'll fix this up. 645073 4 mrobinson 2012-06-08 15:25:03 -0700 Committed r119869: <http://trac.webkit.org/changeset/119869> 146620 2012-06-08 11:44:28 -0700 2012-06-08 15:10:47 -0700 Patch bug-88677-20120608114427.patch text/plain 8786 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MTcwCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFu Z2VMb2cKaW5kZXggMjhiYTViMGRiNDhkZDQ3YWI2Y2ZjZTMzMWJjMzdlZDdiOGE1OGY1ZC4uMGE2 MTE0OTZjNjQ1NGQ5YzRkZTVmZmM2YzE0MzBmMDQ5YjU1NDViNSAxMDA2NDQKLS0tIGEvQ2hhbmdl TG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTA4ICBNYXJ0aW4g Um9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBidWlsZCBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZyBvbiBieSBkZWZhdWx0IGlmIE9wZW5HTCBpcyBwcmVzZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODY3Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1aWxkIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIGJ5IGRlZmF1bHQgaWYgT3BlbkdMIGlzIHByZXNlbnQsIGp1 c3QgbGlrZSBXZWJHTC4KKyAgICAgICAgQWxzbyBwcmV2ZW50IGVuYWJsaW5nIFdlYkdMIGlzIENs dXR0ZXIgaXMgdHVybmVkIG9uLgorCisgICAgICAgICogY29uZmlndXJlLmFjOiBCdWlsZCBBQyBi eSBkZWZhdWx0LgorCiAyMDEyLTA1LTMxICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5k dW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRW5hYmxlIENTU19JTUFHRV9TRVQgZmxh ZwpkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDYyODJiMTZk NzFiYWIxODExZDY1NGJjODMxYmFhZmM5NGY0YjYzOTIuLjA4YWE4YzVhZDFmMjY2ZGY3NTVmNDNk MGU4MTRmY2VmOTQ1N2E2MzQgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1 cmUuYWMKQEAgLTUyMiw0MCArNTIyLDc0IEBAIEFDX0FSR19FTkFCTEUob3B0aW1pemF0aW9ucywK ICAgICAgICAgICAgICAgW2lmIHRlc3QgIiRlbmFibGVfZGVidWciID0gInllcyI7IHRoZW4gZW5h YmxlX29wdGltaXphdGlvbnM9Im5vIjsgZWxzZSBlbmFibGVfb3B0aW1pemF0aW9ucz0ieWVzIjsg ZmldKQogQUNfTVNHX1JFU1VMVChbJGVuYWJsZV9vcHRpbWl6YXRpb25zXSkKIAotIyBjaGVjayB3 aGV0aGVyIHRvIGVuYWJsZSBXZWJHTCBzdXBwb3J0Ci1BQ19NU0dfQ0hFQ0tJTkcoW3doZXRoZXIg dG8gZW5hYmxlIFdlYkdMIHN1cHBvcnRdKQotQUNfQVJHX0VOQUJMRSh3ZWJnbCwKLSAgICAgICAg ICAgICAgQUNfSEVMUF9TVFJJTkcoWy0tZW5hYmxlLXdlYmdsXSwgW2VuYWJsZSBzdXBwb3J0IGZv ciBXZWJHTCBbZGVmYXVsdD15ZXNdXSksCi0gICAgICAgICAgICAgIFtdLCBbaWYgdGVzdCAiJHdp dGhfdGFyZ2V0IiA9ICJ4MTEiOyB0aGVuIGVuYWJsZV93ZWJnbD0ieWVzIjsgZWxzZSBlbmFibGVf d2ViZ2w9Im5vIjsgZmldKQotQUNfTVNHX1JFU1VMVChbJGVuYWJsZV93ZWJnbF0pCitmb3VuZF9v cGVuZ2w9Im5vIgoraWYgdGVzdCAiJHdpdGhfdGFyZ2V0IiA9ICJ4MTEiOyB0aGVuCisgICAgQUNf Q0hFQ0tfSEVBREVSUyhbR0wvZ2wuaF0sIFtmb3VuZF9vcGVuZ2w9InllcyJdLCBbXSkKKyAgICBB Q19DSEVDS19IRUFERVJTKFtHTC9nbHguaF0sIFtdLCBbZm91bmRfb3BlbmdsPSJubyJdKQorZmkK K0FDX01TR19DSEVDS0lORyhbd2hpY2ggR1BVIGFjY2VsZXJhdGlvbiBiYWNrZW5kIHRvIHVzZV0p CitBQ19BUkdfV0lUSChhY2NlbGVyYXRpb25fYmFja2VuZCwKKyAgICAgICAgICAgIEFDX0hFTFBf U1RSSU5HKFstLXdpdGgtYWNjZWxlcmF0aW9uLWJhY2tlbmQ9QDw6QG9wZW5nbC9jbHV0dGVyL25v bmVAOj5AXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIFtTZWxlY3QgYWNjZWxlcmF0ZWQg YmFja2VuZCAoQ2x1dHRlciBjdXJyZW50bHkgdW5zdXBwb3J0ZWQpIFtkZWZhdWx0PWF1dG9kZXRl Y3RdXSksIFtdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgWworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpZiB0ZXN0ICIkZm91bmRfb3BlbmdsIiA9ICJ5ZXMiOyB0aGVuCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpdGhfYWNjZWxlcmF0aW9uX2JhY2tl bmQ9Im9wZW5nbCI7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2l0aF9hY2NlbGVyYXRpb25fYmFja2VuZD0i bm9uZSI7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICBdKQorQUNfTVNHX1JFU1VMVChbJHdpdGhfYWNjZWxlcmF0aW9uX2JhY2tl bmRdKQorCitpZiB0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25fYmFja2VuZCIgPSAiY2x1dHRlciI7 IHRoZW4KKyAgICBQS0dfQ0hFQ0tfTU9EVUxFUyhDTFVUVEVSLCBjbHV0dGVyLTEuMCA+PSAkQ0xV VFRFUl9SRVFVSVJFRF9WRVJTSU9OKQorICAgIFBLR19DSEVDS19NT0RVTEVTKFtDTFVUVEVSX0dU S10sIFtjbHV0dGVyLWd0ay0xLjAgPj0gJENMVVRURVJfR1RLX1JFUVVJUkVEX1ZFUlNJT05dKQor CisgICAgQUNfU1VCU1QoQ0xVVFRFUl9DRkxBR1MpCisgICAgQUNfU1VCU1QoQ0xVVFRFUl9MSUJT KQorICAgIEFDX1NVQlNUKENMVVRURVJfR1RLX0NGTEFHUykKKyAgICBBQ19TVUJTVChDTFVUVEVS X0dUS19MSUJTKQorZmkKIAotIyBjaGVjayB3aGV0aGVyIHRvIGVuYWJsZSBhY2NlbGVyYXRlZCBj b21wb3NpdGluZyBzdXBwb3J0Ci1BQ19NU0dfQ0hFQ0tJTkcoW3doZXRoZXIgdG8gZW5hYmxlIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIHN1cHBvcnRdKQotQUNfQVJHX1dJVEgoYWNjZWxlcmF0ZWRf Y29tcG9zaXRpbmcsCi0gICAgICAgICAgICBBQ19IRUxQX1NUUklORyhbLS13aXRoLWFjY2VsZXJh dGVkLWNvbXBvc2l0aW5nPUA8OkBuby9vcGVuZ2wvY2Fpcm8vY2x1dHRlckA6PkBdLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgW3VzZSBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyAoZXhwZXJp bWVudGFsKSBbZGVmYXVsdD1ub11dKSwKLSAgICAgICAgICAgIFtdLCBbd2l0aF9hY2NlbGVyYXRl ZF9jb21wb3NpdGluZz0ibm8iXSkKLUFDX01TR19SRVNVTFQoWyR3aXRoX2FjY2VsZXJhdGVkX2Nv bXBvc2l0aW5nXSkKLQotaWYgdGVzdCAiJGVuYWJsZV93ZWJnbCIgPSAieWVzIiB8fCAgdGVzdCAi JHdpdGhfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmciID0gIm9wZW5nbCIgOyB0aGVuCi0gICAgaWYg dGVzdCAiJHdpdGhfdGFyZ2V0IiAhPSAieDExIjsgdGhlbgotICAgICAgICBBQ19NU0dfRVJST1Io W09wZW5HTCBzdXBwb3J0IGlzIG9ubHkgYXZhaWxhYmxlIG9uIFgxMSBjdXJyZW50bHkuXSkKLSAg ICBmaQotICAgIEFDX0NIRUNLX0hFQURFUlMoW0dML2dsLmhdLCBbXSwgQUNfTVNHX0VSUk9SKFtP cGVuR0wgaGVhZGVyIG5vdCBmb3VuZF0pKQotICAgIEFDX0NIRUNLX0hFQURFUlMoW0dML2dseC5o XSwgW10sIEFDX01TR19FUlJPUihbR0xYIGhlYWRlciBub3QgZm91bmRdKSkKK2lmIHRlc3QgIiR3 aXRoX2FjY2VsZXJhdGlvbl9iYWNrZW5kIiA9ICJvcGVuZ2wiOyB0aGVuCiAgICAgT1BFTkdMX0xJ QlM9Ii1sR0wgLWxkbCIKIGZpCiBBQ19TVUJTVChbT1BFTkdMX0xJQlNdKQogCi1pZiB0ZXN0ICIk d2l0aF9hY2NlbGVyYXRlZF9jb21wb3NpdGluZyIgPSAiY2x1dHRlciI7IHRoZW4KLSAgIFBLR19D SEVDS19NT0RVTEVTKENMVVRURVIsIGNsdXR0ZXItMS4wID49ICRDTFVUVEVSX1JFUVVJUkVEX1ZF UlNJT04pCi0gICBQS0dfQ0hFQ0tfTU9EVUxFUyhbQ0xVVFRFUl9HVEtdLCBbY2x1dHRlci1ndGst MS4wID49ICRDTFVUVEVSX0dUS19SRVFVSVJFRF9WRVJTSU9OXSkKKyMgT3BlbkdMIGlzIHR1cm5l ZCBvbiBieSBkZWZhdWx0IChhbG9uZyB3aXRoIFdlYkdMIGFuZCBhY2NlbGVyYXRlZCBjb21wb3Np dGluZyksIGJ1dCBpZgorIyBDbHV0dGVyIGlzIGNob3NlbiBhcyB0aGUgYWNjZWxlcmF0ZWQgZHJh d2luZyBiYWNrZW5kLCB3ZSB3YW50IHRvIGRpc2FibGUgaXQuIENPR0wgZG9lcyAKKyMgbm90IHBs YXkgd2VsbCB3aXRoIE9wZW5HTC4KK0FDX01TR19DSEVDS0lORyhbd2hldGhlciB0byBlbmFibGUg V2ViR0wgc3VwcG9ydF0pCitBQ19BUkdfRU5BQkxFKHdlYmdsLAorICAgICAgICAgICAgICBBQ19I RUxQX1NUUklORyhbLS1lbmFibGUtd2ViZ2xdLCBbZW5hYmxlIHN1cHBvcnQgZm9yIFdlYkdMIFtk ZWZhdWx0PWNoZWNrXV0pLCBbXSwKKyAgICAgICAgICAgICAgWworICAgICAgICAgICAgICAgIGlm IHRlc3QgIiR3aXRoX2FjY2VsZXJhdGlvbl9iYWNrZW5kIiA9ICJvcGVuZ2wiOyB0aGVuCisgICAg ICAgICAgICAgICAgICAgIGVuYWJsZV93ZWJnbD0ieWVzIjsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIGVuYWJsZV93ZWJnbD0ibm8iOworICAgICAgICAgICAgICAg IGZpCisgICAgICAgICAgICAgXSkKK0FDX01TR19SRVNVTFQoWyRlbmFibGVfd2ViZ2xdKQoraWYg dGVzdCAiJGVuYWJsZV93ZWJnbCIgPSAieWVzIiAmJiB0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25f YmFja2VuZCIgIT0gIm9wZW5nbCI7IHRoZW4KKyAgICBBQ19NU0dfRVJST1IoW09wZW5HTCBtdXN0 IGJlIGFjdGl2ZSAoYW5kIENsdXR0ZXIgZGlzYWJsZWQpIHRvIHVzZSBXZWJHTC5dKQorZmk7CiAK LSAgIEFDX1NVQlNUKENMVVRURVJfQ0ZMQUdTKQotICAgQUNfU1VCU1QoQ0xVVFRFUl9MSUJTKQot ICAgQUNfU1VCU1QoQ0xVVFRFUl9HVEtfQ0ZMQUdTKQotICAgQUNfU1VCU1QoQ0xVVFRFUl9HVEtf TElCUykKLWZpCitBQ19NU0dfQ0hFQ0tJTkcoW3doZXRoZXIgdG8gZW5hYmxlIGFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIHN1cHBvcnRdKQorQUNfQVJHX0VOQUJMRShhY2NlbGVyYXRlZF9jb21wb3Np dGluZywKKyAgICAgICAgICAgIEFDX0hFTFBfU1RSSU5HKFstLWVuYWJsZS1hY2NlbGVyYXRlZC1j b21wb3NpdGluZ10sIFtlbmFibGUgc3VwcG9ydCBmb3IgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcg W2RlZmF1bHQ9Y2hlY2tdXSksCisgICAgICAgICAgICBbCisgICAgICAgICAgICAgICAgaWYgdGVz dCAiJGVuYWJsZXZhbCIgPSAieWVzIiAmJiB0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25fYmFja2Vu ZCIgPSAibm9uZSI7IHRoZW4KKyAgICAgICAgICAgICAgICAgICAgQUNfTVNHX0VSUk9SKFtPcGVu R0wgb3IgQ2x1dHRlciBtdXN0IGJlIGFjdGl2ZSB0byB1c2UgYWNjZWxlcmF0ZWQgY29tcG9zaXRp bmcuXSkKKyAgICAgICAgICAgICAgICBmaQorICAgICAgICAgICAgICAgIGVuYWJsZV9hY2NlbGVy YXRlZF9jb21wb3NpdGluZz0kZW5hYmxldmFsOworICAgICAgICAgICAgXSwKKyAgICAgICAgICAg IFsKKyAgICAgICAgICAgICAgICBpZiB0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25fYmFja2VuZCIg IT0gIm5vbmUiOyB0aGVuCisgICAgICAgICAgICAgICAgICAgIGVuYWJsZV9hY2NlbGVyYXRlZF9j b21wb3NpdGluZz0ieWVzIjsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg ICAgIGVuYWJsZV9hY2NlbGVyYXRlZF9jb21wb3NpdGluZz0ibm8iOworICAgICAgICAgICAgICAg IGZpCisgICAgICAgICAgICBdKQorQUNfTVNHX1JFU1VMVChbJGVuYWJsZV9hY2NlbGVyYXRlZF9j b21wb3NpdGluZ10pCiAKICMgY2hlY2sgd2hldGhlciB0byBlbmFibGUgY2hhbm5lbCBtZXNzYWdp bmcgc3VwcG9ydAogQUNfTVNHX0NIRUNLSU5HKFt3aGV0aGVyIHRvIGVuYWJsZSBIVE1MNSBDaGFu bmVsIE1lc3NhZ2luZyBzdXBwb3J0XSkKQEAgLTEyMjIsNyArMTI1Niw3IEBAIGlmIHRlc3QgIiRl bmFibGVfdmlkZW8iID0gInllcyIgfHwgdGVzdCAiJGVuYWJsZV93ZWJfYXVkaW8iID0gInllcyI7 IHRoZW4KIGZpCiAKIAotaWYgdGVzdCAiJHdpdGhfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmciID0g ImNsdXR0ZXIiOyB0aGVuCitpZiB0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25fYmFja2VuZCIgPSAi Y2x1dHRlciI7IHRoZW4KICAgIFBLR19DSEVDS19NT0RVTEVTKENMVVRURVIsIGNsdXR0ZXItMS4w ID49ICRDTFVUVEVSX1JFUVVJUkVEX1ZFUlNJT04pCiAgICBQS0dfQ0hFQ0tfTU9EVUxFUyhbQ0xV VFRFUl9HVEtdLAogICAgICAgICAgICAgICAgICAgICAgW2NsdXR0ZXItZ3RrLTEuMCA+PSAkQ0xV VFRFUl9HVEtfUkVRVUlSRURfVkVSU0lPTl0pCkBAIC0xMzMwLDE0ICsxMzY0LDE0IEBAIEFNX0NP TkRJVElPTkFMKFtVU0VfV0VCQVVESU9fR1NUUkVBTUVSXSwgW3Rlc3QgIiRlbmFibGVfd2ViX2F1 ZGlvIiA9ICJ5ZXMiXSkKIEFNX0NPTkRJVElPTkFMKFtIQVZFX0FUU1BJMl0sIFt0ZXN0ICIkaGF2 ZV9hdHNwaTIiID0gInllcyJdKQogCiAjIEFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGNvbmRpdGlv bmFsCi1BTV9DT05ESVRJT05BTChbVVNFX0FDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HXSwgW3Rlc3Qg IiR3aXRoX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nIiA9ICJjYWlybyIgfHwgdGVzdCAiJHdpdGhf YWNjZWxlcmF0ZWRfY29tcG9zaXRpbmciID0gIm9wZW5nbCIgfHwgdGVzdCAiJHdpdGhfYWNjZWxl cmF0ZWRfY29tcG9zaXRpbmciID0gImNsdXR0ZXIiXSkKLUFNX0NPTkRJVElPTkFMKFtVU0VfVEVY VFVSRV9NQVBQRVJfQ0FJUk9dLCBbdGVzdCAiJHdpdGhfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmci ID0gImNhaXJvIl0pCi1BTV9DT05ESVRJT05BTChbVVNFX1RFWFRVUkVfTUFQUEVSX0dMXSwgW3Rl c3QgIiR3aXRoX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nIiA9ICJvcGVuZ2wiXSkKLUFNX0NPTkRJ VElPTkFMKFtVU0VfQ0xVVFRFUl0sIFt0ZXN0ICIkd2l0aF9hY2NlbGVyYXRlZF9jb21wb3NpdGlu ZyIgPSAiY2x1dHRlciJdKQorQU1fQ09ORElUSU9OQUwoW1VTRV9BQ0NFTEVSQVRFRF9DT01QT1NJ VElOR10sIFt0ZXN0ICIkZW5hYmxlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nIiA9ICJ5ZXMiXSkK K0FNX0NPTkRJVElPTkFMKFtVU0VfVEVYVFVSRV9NQVBQRVJfQ0FJUk9dLCBbdGVzdCAiJGVuYWJs ZV9hY2NlbGVyYXRlZF9jb21wb3NpdGluZyIgPSAieWVzIiAmJiB0ZXN0ICIkd2l0aF9hY2NlbGVy YXRpb25fYmFja2VuZCIgPSAibm9uZSJdKQorQU1fQ09ORElUSU9OQUwoW1VTRV9URVhUVVJFX01B UFBFUl9HTF0sIFt0ZXN0ICIkZW5hYmxlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nIiA9ICJ5ZXMi ICYmIHRlc3QgIiR3aXRoX2FjY2VsZXJhdGlvbl9iYWNrZW5kIiA9ICJvcGVuZ2wiXSkKK0FNX0NP TkRJVElPTkFMKFtVU0VfQ0xVVFRFUl0sIFt0ZXN0ICIkd2l0aF9hY2NlbGVyYXRpb25fYmFja2Vu ZCIgPSAiY2x1dHRlciJdKQogCiAjIFRoZXNlIGFyZSB0aGUgc2FtZSBub3csIGJ1dCB0aGV5IHdp bGwgc29vbiBiZSBzZXBhcmF0ZS4KLUFNX0NPTkRJVElPTkFMKFtVU0VfR0xYXSwgW3Rlc3QgIiR3 aXRoX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nIiA9ICJvcGVuZ2wiIHx8IHRlc3QgIiRlbmFibGVf d2ViZ2wiID0gInllcyJdKQotQU1fQ09ORElUSU9OQUwoW1VTRV9PUEVOR0xdLCBbdGVzdCAiJHdp dGhfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmciID0gIm9wZW5nbCIgfHwgdGVzdCAiJGVuYWJsZV93 ZWJnbCIgPSAieWVzIl0pCitBTV9DT05ESVRJT05BTChbVVNFX0dMWF0sIFt0ZXN0ICIkZW5hYmxl X29wZW5nbCIgPSAieWVzIl0pCitBTV9DT05ESVRJT05BTChbVVNFX09QRU5HTF0sIFt0ZXN0ICIk ZW5hYmxlX29wZW5nbCIgPSAieWVzIl0pCiAKICMgSW5kZXhlZERCIGltcGxpZXMgTGV2ZWxEQiwg YnV0IG90aGVyIGZlYXR1cmVzIG1heSBvbmUgZGF5IHJlcXVpcmUgTGV2ZWxEQi4KIEFNX0NPTkRJ VElPTkFMKFtFTkFCTEVfSU5ERVhFRF9EQVRBQkFTRV0sW3Rlc3QgIiRlbmFibGVfaW5kZXhlZF9k YXRhYmFzZSIgPSAieWVzIl0pCkBAIC0xNDUzLDEwICsxNDg3LDExIEBAIEJ1aWxkIGNvbmZpZ3Vy YXRpb246CiAgVW5pY29kZSBiYWNrZW5kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgOiAkd2l0aF91bmljb2RlX2JhY2tlbmQKICBGb250IGJhY2tlbmQgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICR3aXRoX2ZvbnRfYmFja2VuZAog IE9wdGltaXplZCBtZW1vcnkgYWxsb2NhdG9yICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDogJGVuYWJsZV9mYXN0X21hbGxvYwotIEFjY2VsZXJhdGVkIENvbXBvc2l0aW5nICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDogJHdpdGhfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmcK KyBBY2NlbGVyYXRlZCByZW5kZXJpbmcgYmFja2VuZCAgICAgICAgICAgICAgICAgICAgICAgICAg ICA6ICR3aXRoX2FjY2VsZXJhdGlvbl9iYWNrZW5kCiAKIEZlYXR1cmVzOgogIFdlYkdMICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJsZV93 ZWJnbAorIEFjY2VsZXJhdGVkIENvbXBvc2l0aW5nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDogJGVuYWJsZV9hY2NlbGVyYXRlZF9jb21wb3NpdGluZwogIEJsb2Igc3VwcG9ydCAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJsZV9ibG9i CiAgQ1NTMyBGbGV4Ym94IHN1cHBvcnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgOiAkZW5hYmxlX2NzczNfZmxleGJveAogIExlZ2FjeSBXZWJLaXRCbG9iQnVpbGRlciBzdXBw b3J0ICAgICAgICAgICAgICAgICAgICAgICAgIDogJGVuYWJsZV9sZWdhY3lfd2Via2l0X2Jsb2Jf YnVpbGRlcgo=