45876 2023-04-15 20:02:54 +0300 Падает с ошибкой ...GLViewer.cpp:133) SetUpContext(): Error initialising GLEW 2023-06-08 02:51:34 +0300 1 1 4 Development Sisyphus hugin unstable x86_64 Linux CLOSED FIXED P5 normal --- 1 slava aris alexei.mezin boyarsh grenka respublica rider qa-sisyphus oldest_to_newest 224550 0 slava 2023-04-15 20:02:54 +0300 Похоже, что это известная проблема: https://www.mail-archive.com/hugin-bug-hunters@lists.launchpad.net/msg07855.html https://bbs.archlinux.org/viewtopic.php?id=278127 227154 1 13414 alexei.mezin 2023-06-07 00:34:38 +0300 Created attachment 13414 Патч замены GLEW на Epoxy 227155 2 alexei.mezin 2023-06-07 00:38:37 +0300 Не смотря на закрытый баг 46138 по добавлению поддержки EGL в GLEW, у меня hugin все равно валится с той же ошибкой. Пересобрал, в том числе с опцией BUILD_WITH_EGL - не помогло. Или я что-то делаю не так, или оно у нас сломано иначе, чем у других. Но апстриму предложили сменить GLEW на Epoxy (шутники, блин!) https://bugs.launchpad.net/hugin/+bug/2007178 И, кажется, апстрим согласился. Я применил патчи вот отсюда https://sourceforge.net/u/cjmayo/hugin/ci/9d079ffe99fdae56dee8dc2f7762e90d6f826cc7/ и hugin у меня локально собрался, запускается и работает. Во всяком случае файлы в него загружаются, и панорама из них собирается. 227156 3 aris 2023-06-07 00:57:39 +0300 Уже закоммичено. https://sourceforge.net/p/hugin/hugin/ci/4a3fe139b64b06f95c80db9d24a1a5a35e7abb60/ Подождем релиза? 227161 4 alexei.mezin 2023-06-07 11:13:41 +0300 Смотря когда релиз. Если долго ждать, то может лучше починить? У нас оно давно сломано, а программа очень полезная. Лето, отпуска, народ потянется с фотографиям. 227194 5 aris 2023-06-07 14:14:28 +0300 [#322562] POSTPONED hugin.git=2022.0.0-alt2 Ждем новый питон. 227270 6 repository-robot 2023-06-08 02:51:34 +0300 hugin-2022.0.0-alt2 -> sisyphus: Wed Jun 07 2023 Yuri N. Sedunov <aris@altlinux> 2022.0.0-alt2 - build with libepoxy instead of GLEW for OpenGL pointer management (ALT #45876) 13414 2023-06-07 00:34:38 +0300 2023-06-07 00:34:38 +0300 Патч замены GLEW на Epoxy glew_to_epoxy.patch text/plain 10761 alexei.mezin LS0tIGEvc3JjL2h1Z2luMS9odWdpbi9Qcm9qZWN0aW9uR3JpZFRvb2wuY3BwCisrKyBiL3NyYy9o dWdpbjEvaHVnaW4vUHJvamVjdGlvbkdyaWRUb29sLmNwcApAQCAtMjQsMTIgKzI0LDEwIEBACiAj aWZkZWYgX1dJTjMyCiAjaW5jbHVkZSAid3gvbXN3L3dyYXB3aW4uaCIKICNlbmRpZgotI2luY2x1 ZGUgPEdML2dsZXcuaD4KKyNpbmNsdWRlIDxlcG94eS9nbC5oPgogI2lmZGVmIF9fV1hNQUNfXwot I2luY2x1ZGUgPE9wZW5HTC9nbC5oPgogI2luY2x1ZGUgPE9wZW5HTC9nbHUuaD4KICNlbHNlCi0j aW5jbHVkZSA8R0wvZ2wuaD4KICNpbmNsdWRlIDxHTC9nbHUuaD4KICNlbmRpZgogI2lmZGVmIF9f QVBQTEVfXwpAQCAtMzIzLDcgKzMyMSw3IEBACiAgICAgaWYgKCFjaGVja2VkX2FuaXNvdHJvcGlj KQogICAgIHsKICAgICAgICAgLy8gY2hlY2sgaWYgaXQgaXMgc3VwcG9ydGVkCi0gICAgICAgIGlm IChHTEVXX0VYVF90ZXh0dXJlX2ZpbHRlcl9hbmlzb3Ryb3BpYykKKyAgICAgICAgaWYgKGVwb3h5 X2hhc19nbF9leHRlbnNpb24oIkdMX0VYVF90ZXh0dXJlX2ZpbHRlcl9hbmlzb3Ryb3BpYyIpKQog ICAgICAgICB7CiAgICAgICAgICAgICBoYXNfYW5pc290cm9waWMgPSB0cnVlOwogICAgICAgICAg ICAgZ2xHZXRGbG9hdHYoR0xfTUFYX1RFWFRVUkVfTUFYX0FOSVNPVFJPUFlfRVhULCAmYW5pc290 cm9weSk7Ci0tLSBhL3NyYy9odWdpbjEvaHVnaW4vVGV4dHVyZU1hbmFnZXIuY3BwCisrKyBiL3Ny Yy9odWdpbjEvaHVnaW4vVGV4dHVyZU1hbmFnZXIuY3BwCkBAIC00OCwxNSArNDgsMTMgQEAKIAog Ly8gVGhlIE9wZW5HTCBFeHRlbnNpb24gd3JhbmdsZXIgbGlicmF5IHdpbGwgZmluZCBleHRlbnNp b25zIGFuZCB0aGUgbGF0ZXN0CiAvLyBzdXBwb3J0ZWQgT3BlbkdMIHZlcnNpb24gb24gYWxsIHBs YXRmb3Jtcy4KLSNpbmNsdWRlIDxHTC9nbGV3Lmg+CisjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KICNp bmNsdWRlIDx3eC9wbGF0Zm9ybS5oPgogI2luY2x1ZGUgPHd4L2Rpc3BsYXkuaD4KIAogI2lmZGVm IF9fV1hNQUNfXwotI2luY2x1ZGUgPE9wZW5HTC9nbC5oPgogI2luY2x1ZGUgPE9wZW5HTC9nbHUu aD4KICNlbHNlCi0jaW5jbHVkZSA8R0wvZ2wuaD4KICNpbmNsdWRlIDxHTC9nbHUuaD4KICNlbmRp ZgogCkBAIC02MjgsNyArNjI2LDcgQEAKICAgICBpZiAoIWNoZWNrZWRfYW5pc290cm9waWMpCiAg ICAgewogICAgICAgICAvLyBjaGVjayBpZiBpdCBpcyBzdXBwb3J0ZWQKLSAgICAgICAgaWYgKEdM RVdfRVhUX3RleHR1cmVfZmlsdGVyX2FuaXNvdHJvcGljKQorICAgICAgICBpZiAoZXBveHlfaGFz X2dsX2V4dGVuc2lvbigiR0xfRVhUX3RleHR1cmVfZmlsdGVyX2FuaXNvdHJvcGljIikpCiAgICAg ICAgIHsKICAgICAgICAgICAgIGhhc19hbmlzb3Ryb3BpYyA9IHRydWU7CiAgICAgICAgICAgICBn bEdldEZsb2F0dihHTF9NQVhfVEVYVFVSRV9NQVhfQU5JU09UUk9QWV9FWFQsICZhbmlzb3Ryb3B5 KTsKLS0tIGEvc3JjL2h1Z2luX2Jhc2UvaHVnaW5fdXRpbHMvdXRpbHMuY3BwCisrKyBiL3NyYy9o dWdpbl9iYXNlL2h1Z2luX3V0aWxzL3V0aWxzLmNwcApAQCAtNTcsOSArNTcsOSBAQAogI2luY2x1 ZGUgPGxpYmdlbi5oPiAgICAgICAvKiBkaXJuYW1lICovCiAjZW5kaWYKIAotI2luY2x1ZGUgPEdM L2dsZXcuaD4KKyNpbmNsdWRlIDxlcG94eS9nbC5oPgogI2lmZGVmIF9XSU4zMgotI2luY2x1ZGUg PEdML3dnbGV3Lmg+CisjaW5jbHVkZSA8ZXBveHkvd2dsLmg+CiAjZWxpZiBkZWZpbmVkIF9fQVBQ TEVfXwogICAjaW5jbHVkZSA8R0xVVC9nbHV0Lmg+CiAjZW5kaWYKQEAgLTU4NCw2ICs1ODQsNyBA QAogICAgIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH07CisgICAgZXBveHlfaGFuZGxl X2V4dGVybmFsX3dnbE1ha2VDdXJyZW50KCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTU5 Miw2ICs1OTMsNyBAQAogICAgIGlmIChjb250ZXh0LnJlbmRlcmluZ0NvbnRleHQgIT0gTlVMTCkK ICAgICB7CiAgICAgICAgIHdnbE1ha2VDdXJyZW50KE5VTEwsIE5VTEwpOworICAgICAgICBlcG94 eV9oYW5kbGVfZXh0ZXJuYWxfd2dsTWFrZUN1cnJlbnQoKTsKICAgICAgICAgd2dsRGVsZXRlQ29u dGV4dChjb250ZXh0LnJlbmRlcmluZ0NvbnRleHQpOwogICAgIH0KICAgICBpZiAoY29udGV4dC53 aW5kb3cgIT0gTlVMTCAmJiBjb250ZXh0LmRjICE9IE5VTEwpCkBAIC02MjgsNyArNjMwLDcgQEAK IAogI2Vsc2UKICNpZiBkZWZpbmVkIEhBVkVfRUdMICYmIEhBVkVfRUdMCi0jaW5jbHVkZSA8RUdM L2VnbC5oPgorI2luY2x1ZGUgPGVwb3h5L2VnbC5oPgogCiBzdHJ1Y3QgQ29udGV4dFNldHRpbmdz CiB7CkBAIC03MTQsNyArNzE2LDcgQEAKICNlbHNlCiAjaW5jbHVkZSA8WDExL1hsaWIuaD4KICNp bmNsdWRlIDxYMTEvWHV0aWwuaD4KLSNpbmNsdWRlIDxHTC9nbHguaD4KKyNpbmNsdWRlIDxlcG94 eS9nbHguaD4KIAogc3RydWN0IENvbnRleHRTZXR0aW5ncwogewpAQCAtODExLDI2ICs4MTMsMTcg QEAKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9OwotICAgIGludCBlcnIgPSBn bGV3SW5pdCgpOwotICAgIGlmIChlcnIgIT0gR0xFV19PSykKLSAgICB7Ci0gICAgICAgIHN0ZDo6 Y2VyciA8PCBhcmd2WzBdIDw8ICI6IGFuIGVycm9yIG9jY3VycmVkIHdoaWxlIHNldHRpbmcgdXAg dGhlIEdQVToiIDw8IHN0ZDo6ZW5kbDsKLSAgICAgICAgc3RkOjpjZXJyIDw8IGdsZXdHZXRFcnJv clN0cmluZyhlcnIpIDw8IHN0ZDo6ZW5kbDsKLSAgICAgICAgc3RkOjpjZXJyIDw8IGFyZ3ZbMF0g PDwgIjogU3dpdGNoaW5nIHRvIENQVSBjYWxjdWxhdGlvbi4iIDw8IHN0ZDo6ZW5kbDsKLSAgICAg ICAgRGVzdHJveUNvbnRleHQoKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KIAogICAg IHN0ZDo6Y291dCA8PCBodWdpbl91dGlsczo6c3RyaXBQYXRoKGFyZ3ZbMF0pIDw8ICI6IHVzaW5n IGdyYXBoaWNzIGNhcmQ6ICIgPDwgZ2xHZXRTdHJpbmcoR0xfVkVORE9SKSA8PCAiICIgPDwgZ2xH ZXRTdHJpbmcoR0xfUkVOREVSRVIpIDw8IHN0ZDo6ZW5kbDsKIAotICAgIGNvbnN0IEdMYm9vbGVh biBoYXNfYXJiX2ZyYWdtZW50X3NoYWRlciA9IGdsZXdHZXRFeHRlbnNpb24oIkdMX0FSQl9mcmFn bWVudF9zaGFkZXIiKTsKLSAgICBjb25zdCBHTGJvb2xlYW4gaGFzX2FyYl92ZXJ0ZXhfc2hhZGVy ID0gZ2xld0dldEV4dGVuc2lvbigiR0xfQVJCX3ZlcnRleF9zaGFkZXIiKTsKLSAgICBjb25zdCBH TGJvb2xlYW4gaGFzX2FyYl9zaGFkZXJfb2JqZWN0cyA9IGdsZXdHZXRFeHRlbnNpb24oIkdMX0FS Ql9zaGFkZXJfb2JqZWN0cyIpOwotICAgIGNvbnN0IEdMYm9vbGVhbiBoYXNfYXJiX3NoYWRpbmdf bGFuZ3VhZ2UgPSBnbGV3R2V0RXh0ZW5zaW9uKCJHTF9BUkJfc2hhZGluZ19sYW5ndWFnZV8xMDAi KTsKLSAgICBjb25zdCBHTGJvb2xlYW4gaGFzX2V4dF9mcmFtZWJ1ZmZlciA9IGdsZXdHZXRFeHRl bnNpb24oIkdMX0VYVF9mcmFtZWJ1ZmZlcl9vYmplY3QiKTsKLSAgICBjb25zdCBHTGJvb2xlYW4g aGFzX2FyYl90ZXh0dXJlX3JlY3RhbmdsZSA9IGdsZXdHZXRFeHRlbnNpb24oIkdMX0FSQl90ZXh0 dXJlX3JlY3RhbmdsZSIpOwotICAgIGNvbnN0IEdMYm9vbGVhbiBoYXNfYXJiX3RleHR1cmVfYm9y ZGVyX2NsYW1wID0gZ2xld0dldEV4dGVuc2lvbigiR0xfQVJCX3RleHR1cmVfYm9yZGVyX2NsYW1w Iik7Ci0gICAgY29uc3QgR0xib29sZWFuIGhhc19hcmJfdGV4dHVyZV9mbG9hdCA9IGdsZXdHZXRF eHRlbnNpb24oIkdMX0FSQl90ZXh0dXJlX2Zsb2F0Iik7CisgICAgY29uc3QgR0xib29sZWFuIGhh c19hcmJfZnJhZ21lbnRfc2hhZGVyID0gZXBveHlfaGFzX2dsX2V4dGVuc2lvbigiR0xfQVJCX2Zy YWdtZW50X3NoYWRlciIpOworICAgIGNvbnN0IEdMYm9vbGVhbiBoYXNfYXJiX3ZlcnRleF9zaGFk ZXIgPSBlcG94eV9oYXNfZ2xfZXh0ZW5zaW9uKCJHTF9BUkJfdmVydGV4X3NoYWRlciIpOworICAg IGNvbnN0IEdMYm9vbGVhbiBoYXNfYXJiX3NoYWRlcl9vYmplY3RzID0gZXBveHlfaGFzX2dsX2V4 dGVuc2lvbigiR0xfQVJCX3NoYWRlcl9vYmplY3RzIik7CisgICAgY29uc3QgR0xib29sZWFuIGhh c19hcmJfc2hhZGluZ19sYW5ndWFnZSA9IGVwb3h5X2hhc19nbF9leHRlbnNpb24oIkdMX0FSQl9z aGFkaW5nX2xhbmd1YWdlXzEwMCIpOworICAgIGNvbnN0IEdMYm9vbGVhbiBoYXNfZXh0X2ZyYW1l YnVmZmVyID0gZXBveHlfaGFzX2dsX2V4dGVuc2lvbigiR0xfRVhUX2ZyYW1lYnVmZmVyX29iamVj dCIpOworICAgIGNvbnN0IEdMYm9vbGVhbiBoYXNfYXJiX3RleHR1cmVfcmVjdGFuZ2xlID0gZXBv eHlfaGFzX2dsX2V4dGVuc2lvbigiR0xfQVJCX3RleHR1cmVfcmVjdGFuZ2xlIik7CisgICAgY29u c3QgR0xib29sZWFuIGhhc19hcmJfdGV4dHVyZV9ib3JkZXJfY2xhbXAgPSBlcG94eV9oYXNfZ2xf ZXh0ZW5zaW9uKCJHTF9BUkJfdGV4dHVyZV9ib3JkZXJfY2xhbXAiKTsKKyAgICBjb25zdCBHTGJv b2xlYW4gaGFzX2FyYl90ZXh0dXJlX2Zsb2F0ID0gZXBveHlfaGFzX2dsX2V4dGVuc2lvbigiR0xf QVJCX3RleHR1cmVfZmxvYXQiKTsKIAogICAgIGlmICghKGhhc19hcmJfZnJhZ21lbnRfc2hhZGVy ICYmIGhhc19hcmJfdmVydGV4X3NoYWRlciAmJiBoYXNfYXJiX3NoYWRlcl9vYmplY3RzICYmIGhh c19hcmJfc2hhZGluZ19sYW5ndWFnZSAmJiBoYXNfZXh0X2ZyYW1lYnVmZmVyICYmIGhhc19hcmJf dGV4dHVyZV9yZWN0YW5nbGUgJiYgaGFzX2FyYl90ZXh0dXJlX2JvcmRlcl9jbGFtcCAmJiBoYXNf YXJiX3RleHR1cmVfZmxvYXQpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIgKiBtc2dbXSA9IHsiZmFs c2UiLCAidHJ1ZSJ9OwotLS0gYS9zcmMvaHVnaW5fYmFzZS92aWdyYV9leHQvSW1hZ2VUcmFuc2Zv cm1zR1BVLmNwcAorKysgYi9zcmMvaHVnaW5fYmFzZS92aWdyYV9leHQvSW1hZ2VUcmFuc2Zvcm1z R1BVLmNwcApAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1ZGUgPGlvc3RyZWFtPgogI2luY2x1ZGUg PGlvbWFuaXA+CiAKLSNpbmNsdWRlIDxHTC9nbGV3Lmg+CisjaW5jbHVkZSA8ZXBveHkvZ2wuaD4K IAogI2luY2x1ZGUgPHN0cmluZy5oPgogI2lmZGVmIF9XSU4zMgpAQCAtNTQsNiArNTQsMTYgQEAK IH07CiAjZW5kaWYKICNpbmNsdWRlIDx0aW1lLmg+CisKKyNpZmRlZiBfX1dYTUFDX18KKyNpbmNs dWRlIDxPcGVuR0wvZ2x1Lmg+CisjZWxzZQorLy8gYWZ0ZXIgd2luZG93cy5oCisjaW5jbHVkZSA8 R0wvZ2x1Lmg+CisjZW5kaWYKKyNpZmRlZiBfX0FQUExFX18KKyAgI2luY2x1ZGUgPEdMVVQvZ2x1 dC5oPgorI2VuZGlmCiAKICNpbmNsdWRlIDx2ZWN0b3I+CiAKQEAgLTc5OCw3ICs4MDgsNyBAQAog ICAgIGNvbnN0IGludCB2aWV3cG9ydEhlaWdodCA9IHN0ZDo6bWF4PGludD4oZGVzdENodW5rc1sw XS5oZWlnaHQoKSwgc291cmNlQ2h1bmtzWzBdLmhlaWdodCgpKTsKICAgICBnbE1hdHJpeE1vZGUo R0xfUFJPSkVDVElPTik7CiAgICAgZ2xMb2FkSWRlbnRpdHkoKTsKLSAgICBnbHVPcnRobzJEKDAu MCwgdmlld3BvcnRXaWR0aCwgMC4wLCB2aWV3cG9ydEhlaWdodCk7CisgICAgZ2xPcnRobygwLjAs IHZpZXdwb3J0V2lkdGgsIDAuMCwgdmlld3BvcnRIZWlnaHQsIC0xLCAxKTsKICAgICBnbE1hdHJp eE1vZGUoR0xfTU9ERUxWSUVXKTsKICAgICBnbExvYWRJZGVudGl0eSgpOwogICAgIGdsVmlld3Bv cnQoMCwgMCwgdmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpOwotLS0gYS9DTWFrZUxpc3Rz LnR4dAorKysgYi9DTWFrZUxpc3RzLnR4dApAQCAtMjU1LDkgKzI1NSw5IEBACiAgIElOQ0xVREVf RElSRUNUT1JJRVMoJHtHTFVUX0lOQ0xVREVfRElSfSkKICAgU0VUKE9QRU5HTF9HTEVXX0xJQlJB UklFUyAke09QRU5HTF9HTEVXX0xJQlJBUklFU30gJHtHTFVUX0xJQlJBUklFU30pCiBFTkRJRigp Ci1GSU5EX1BBQ0tBR0UoR0xFVyBSRVFVSVJFRCkKLUlOQ0xVREVfRElSRUNUT1JJRVMoJHtHTEVX X0lOQ0xVREVfRElSfSkKLVNFVChPUEVOR0xfR0xFV19MSUJSQVJJRVMgJHtPUEVOR0xfR0xFV19M SUJSQVJJRVN9ICR7R0xFV19MSUJSQVJJRVN9KQorUEtHX1NFQVJDSF9NT0RVTEUoRVBPWFkgZXBv eHkgUkVRVUlSRUQpCitJTkNMVURFX0RJUkVDVE9SSUVTKCR7RVBPWFlfSU5DTFVERV9ESVJ9KQor U0VUKE9QRU5HTF9HTEVXX0xJQlJBUklFUyAke09QRU5HTF9HTEVXX0xJQlJBUklFU30gJHtFUE9Y WV9MSUJSQVJJRVN9KQogSUYoTk9UIEhVR0lOX1NIQVJFRCBPUiBOT1QgV0lOMzIpCiAgIEFERF9E RUZJTklUSU9OUygtREdMRVdfU1RBVElDKQogRU5ESUYoKQoKLS0tIGEvc3JjL2h1Z2luMS9odWdp bi9HTFByZXZpZXdGcmFtZS5jcHAKKysrIGIvc3JjL2h1Z2luMS9odWdpbi9HTFByZXZpZXdGcmFt ZS5jcHAKQEAgLTI4LDggKzI4LDYgQEAKICNpbmNsdWRlIDxpb3N0cmVhbT4KIAogI2luY2x1ZGUg Imh1Z2luX2NvbmZpZy5oIgotCi0jaW5jbHVkZSA8R0wvZ2xldy5oPgogCiAjaW5jbHVkZSAicGFu b2luY19XWC5oIgogI2luY2x1ZGUgInBhbm9pbmMuaCIKLS0tIGEvc3JjL2h1Z2luMS9odWdpbi9H TFZpZXdlci5jcHAKKysrIGIvc3JjL2h1Z2luMS9odWdpbi9HTFZpZXdlci5jcHAKQEAgLTI1LDcg KzI1LDcgQEAKIAogI2luY2x1ZGUgInBhbm9pbmMuaCIKICNpbmNsdWRlICJodWdpbl9jb25maWcu aCIKLSNpbmNsdWRlIDxHTC9nbGV3Lmg+CisjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KICNpbmNsdWRl IDxiYXNlX3d4L3BsYXRmb3JtLmg+CiAjaW5jbHVkZSA8d3gvc2V0dGluZ3MuaD4KICNpbmNsdWRl IDx3eC9kY2NsaWVudC5oPgpAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIkdMUHJldmlld0Zy YW1lLmgiCiAjaW5jbHVkZSAiaHVnaW4vaHVnaW5BcHAuaCIKIAotYm9vbCBHTFZpZXdlcjo6aW5p dGlhbGlzZWRfZ2xldz1mYWxzZTsKIFZpZXdTdGF0ZSAqIEdMVmlld2VyOjptX3ZpZXdfc3RhdGUg PSBOVUxMOwogc2l6ZV90IEdMVmlld2VyOjptX3ZpZXdfc3RhdGVfb2JzZXJ2ZXIgPSAwOwogCkBA IC0xMjEsMjQgKzEyMCw4IEBACiAgICAgICAgIC8vIEl0IGFwcGVhcnMgd2UgYXJlIHNldHRpbmcg dXAgZm9yIHRoZSBmaXJzdCB0aW1lLgogICAgICAgICBzdGFydGVkX2NyZWF0aW9uID0gdHJ1ZTsK ICAgICAgICAgCi0gICAgICAgIGlmICghaW5pdGlhbGlzZWRfZ2xldykKLSAgICAgICAgewotICAg ICAgICAgICAgLy8gaW5pdGlhbGlzZSB0aGUgZ2xldyBsaWJyYXJ5LCBpZiBub3QgZG9uZSBpdCBi ZWZvcmUuCi0gICAgICAgICAgICBHTGVudW0gZXJyb3Jfc3RhdGUgPSBnbGV3SW5pdCgpOwotICAg ICAgICAgICAgaW5pdGlhbGlzZWRfZ2xldyA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoZXJyb3Jf c3RhdGUgIT0gR0xFV19PSykKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAvLyBnbGV3 SW5pdCBmYWlsZWQKLSAgICAgICAgICAgICAgICBzdGFydGVkX2NyZWF0aW9uPWZhbHNlOwotICAg ICAgICAgICAgICAgIERFQlVHX0VSUk9SKCJFcnJvciBpbml0aWFsaXNpbmcgR0xFVzogIgotICAg ICAgICAgICAgICAgICAgICAgICAgPDwgZ2xld0dldEVycm9yU3RyaW5nKGVycm9yX3N0YXRlKSA8 PCAiLiIpOwotICAgICAgICAgICAgICAgIGZyYW1lLT5DbG9zZSgpOwotICAgICAgICAgICAgICAg IHd4TWVzc2FnZUJveChfKCJFcnJvciBpbml0aWFsaXppbmcgR0xFV1xuRmFzdCBwcmV2aWV3IHdp bmRvdyBjYW4gbm90IGJlIG9wZW5lZC4iKSxfKCJFcnJvciIpLCB3eE9LIHwgd3hJQ09OX0VSUk9S KTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KICAg ICAgICAgLy8gY2hlY2sgdGhlIG9wZW5HTCBjYXBhYmlsaXRpZXMuCi0gICAgICAgIGlmICghKEdM RVdfVkVSU0lPTl8xXzEgJiYgR0xFV19BUkJfbXVsdGl0ZXh0dXJlKSkKKyAgICAgICAgaWYgKGVw b3h5X2dsX3ZlcnNpb24oKSA8IDExICYmICFlcG94eV9oYXNfZ2xfZXh0ZW5zaW9uKCJHTF9BUkJf bXVsdGl0ZXh0dXJlIikpCiAgICAgICAgIHsKICAgICAgICAgICAgIHN0YXJ0ZWRfY3JlYXRpb249 ZmFsc2U7CiAgICAgICAgICAgICB3eENvbmZpZ0Jhc2U6OkdldCgpLT5Xcml0ZSh3eFQoIkRpc2Fi bGVPcGVuR0wiKSwgMWwpOwotLS0gYS9zcmMvaHVnaW4xL2h1Z2luL0dMVmlld2VyLmgKKysrIGIv c3JjL2h1Z2luMS9odWdpbi9HTFZpZXdlci5oCkBAIC05OSw3ICs5OSw2IEBACiAgICAgdmlydHVh bCB2b2lkIHNldFVwKCkgPSAwOwogCiAgICAgYm9vbCBzdGFydGVkX2NyZWF0aW9uLCByZWRyYXdp bmcsIG1fdG9vbHNJbml0aWFsaXplZDsKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXNlZF9nbGV3 OwogICAgIHZpZ3JhOjpEaWZmMkQgb2Zmc2V0OwogICAgIGRvdWJsZSBtX3NjYWxlID0gMS4wOwog ICAgIEdMUHJldmlld0ZyYW1lICpmcmFtZTsKLS0tIGEvc3JjL2h1Z2luMS9odWdpbi9NZXNoTWFu YWdlci5jcHAKKysrIGIvc3JjL2h1Z2luMS9odWdpbi9NZXNoTWFuYWdlci5jcHAKQEAgLTIzLDE1 ICsyMywxMCBAQAogI2luY2x1ZGUgPHd4L3d4Lmg+CiAjaW5jbHVkZSA8d3gvcGxhdGZvcm0uaD4K IAotI2luY2x1ZGUgPEdML2dsZXcuaD4KLQotI2lmZGVmIF9fV1hNQUNfXwotI2luY2x1ZGUgPE9w ZW5HTC9nbC5oPgotI2Vsc2UKKyNpbmNsdWRlIDxlcG94eS9nbC5oPgorCiAjaWZkZWYgX19XWE1T V19fCiAjaW5jbHVkZSA8dmlncmEvd2luZG93cy5oPgotI2VuZGlmCi0jaW5jbHVkZSA8R0wvZ2wu aD4KICNlbmRpZgogCiAjaW5jbHVkZSAicGFub2luYy5oIgotLS0gYS9zcmMvaHVnaW4xL2h1Z2lu L092ZXJ2aWV3T3V0bGluZXNUb29sLmNwcAorKysgYi9zcmMvaHVnaW4xL2h1Z2luL092ZXJ2aWV3 T3V0bGluZXNUb29sLmNwcApAQCAtMjIsMTIgKzIyLDEwIEBACiAjaWZkZWYgX1dJTjMyCiAjaW5j bHVkZSAid3gvbXN3L3dyYXB3aW4uaCIKICNlbmRpZgotI2luY2x1ZGUgPEdML2dsZXcuaD4KKyNp bmNsdWRlIDxlcG94eS9nbC5oPgogI2lmZGVmIF9fV1hNQUNfXwotI2luY2x1ZGUgPE9wZW5HTC9n bC5oPgogI2luY2x1ZGUgPE9wZW5HTC9nbHUuaD4KICNlbHNlCi0jaW5jbHVkZSA8R0wvZ2wuaD4K ICNpbmNsdWRlIDxHTC9nbHUuaD4KICNlbmRpZgogI2lmZGVmIF9fQVBQTEVfXwotLS0gYS9zcmMv aHVnaW4xL2h1Z2luL1Bhbm9zcGhlcmVTcGhlcmVUb29sLmNwcAorKysgYi9zcmMvaHVnaW4xL2h1 Z2luL1Bhbm9zcGhlcmVTcGhlcmVUb29sLmNwcApAQCAtMjQsMTIgKzI0LDEwIEBACiAjaWZkZWYg X1dJTjMyCiAjaW5jbHVkZSAid3gvbXN3L3dyYXB3aW4uaCIKICNlbmRpZgotI2luY2x1ZGUgPEdM L2dsZXcuaD4KKyNpbmNsdWRlIDxlcG94eS9nbC5oPgogI2lmZGVmIF9fV1hNQUNfXwotI2luY2x1 ZGUgPE9wZW5HTC9nbC5oPgogI2luY2x1ZGUgPE9wZW5HTC9nbHUuaD4KICNlbHNlCi0jaW5jbHVk ZSA8R0wvZ2wuaD4KICNpbmNsdWRlIDxHTC9nbHUuaD4KICNlbmRpZgogI2lmZGVmIF9fQVBQTEVf XwotLS0gYS9zcmMvaHVnaW4xL2h1Z2luL1ByZXZpZXdEaWZmZXJlbmNlVG9vbC5jcHAKKysrIGIv c3JjL2h1Z2luMS9odWdpbi9QcmV2aWV3RGlmZmVyZW5jZVRvb2wuY3BwCkBAIC0yNCwxMyArMjQs OCBAQAogI2VuZGlmCiAjaW5jbHVkZSAiUHJldmlld0RpZmZlcmVuY2VUb29sLmgiCiAjaW5jbHVk ZSAiaHVnaW5fY29uZmlnLmgiCi0jaW5jbHVkZSA8R0wvZ2xldy5oPgorI2luY2x1ZGUgPGVwb3h5 L2dsLmg+CiAjaW5jbHVkZSA8d3gvcGxhdGZvcm0uaD4KLSNpZmRlZiBfX1dYTUFDX18KLSNpbmNs dWRlIDxPcGVuR0wvZ2wuaD4KLSNlbHNlCi0jaW5jbHVkZSA8R0wvZ2wuaD4KLSNlbmRpZgogCiAv LyBUaGlzIGlzIHRoZSBudW1iZXIgb2YgdGltZXMgdG8gZG91YmxlIHRoZSByZXN1bHQgb2YgdGhl IGRpZmZlcmVuY2UuIEl0IHNob3VsZAogLy8gYmUgYmV0d2VlbiAwIGFuZCA3LiBOb3RlIHRoYXQg d2l0aCAgdmFsdWVzID4gMCBubyBleHRyYSBjb2xvdXJzIGFyZSB1c2VkCkBAIC00Niw5ICs0MSw5 IEBACiAvKiogY2FsbCB0aGlzIGZ1bmN0aW9uIG9ubHkgYWZ0ZXIgT3BlbkdMIGNvbnRleHQgd2Fz IGNyZWF0ZWQgKi8KIGJvb2wgUHJldmlld0RpZmZlcmVuY2VUb29sOjpDaGVja09wZW5HTENhbkRp ZmZlcmVuY2UoKQogewotICAgIGlmKEdMRVdfQVJCX2ltYWdpbmcpCisgICAgaWYoZXBveHlfaGFz X2dsX2V4dGVuc2lvbigiR0xfQVJCX2ltYWdpbmciKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgaWYoKGdsQmxlbmRFcXVhdGlvbiE9TlVMTCkgJiYgKEdMRVdfRVhUX2JsZW5kX3N1YnRyYWN0 KSkKKyAgICBpZigoZ2xCbGVuZEVxdWF0aW9uIT1OVUxMKSAmJiAoZXBveHlfaGFzX2dsX2V4dGVu c2lvbigiR0xfRVhUX2JsZW5kX3N1YnRyYWN0IikpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICByZXR1cm4gZmFsc2U7CiB9Ci0tLSBhL3NyYy9odWdpbjEvaHVnaW4vUHJldmlld0lkZW50aWZ5 VG9vbC5jcHAKKysrIGIvc3JjL2h1Z2luMS9odWdpbi9QcmV2aWV3SWRlbnRpZnlUb29sLmNwcApA QCAtMzEsMTQgKzMxLDEwIEBACiAKICNpbmNsdWRlIDx3eC9wbGF0Zm9ybS5oPgogCi0vL211bHRp dGV4dHVyZSBmZWF0dXJlIHJlcXVpcmVzIGdsZXcgb24gc29tZSBzeXN0ZW1zCi0jaW5jbHVkZSA8 R0wvZ2xldy5oPgotCisjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KICNpZmRlZiBfX1dYTUFDX18KLSNp bmNsdWRlIDxPcGVuR0wvZ2wuaD4KICNpbmNsdWRlIDxPcGVuR0wvZ2x1Lmg+CiAjZWxzZQotI2lu Y2x1ZGUgPEdML2dsLmg+CiAjaW5jbHVkZSA8R0wvZ2x1Lmg+CiAjZW5kaWYK