From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Simone Caronni To: git-commits@fedoraproject.org Subject: [rpms/vkroots] rawhide: Fix for new Vulkan 1.4.341+ XML format; add parsing for both old and new format. Date: Thu, 25 Jun 2026 13:33:38 GMT Message-ID: <178239441884.1.17021982142064574525.rpms-vkroots-b3ca603d6748@fedoraproject.org> List-ID: X-Git-Repo: rpms/vkroots X-Git-Branch: rawhide X-Git-Rev: b3ca603d6748e2c218e0f433389fa8f7b522a4de QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvdmtyb290cwpCcmFu Y2ggOiByYXdoaWRlCkNvbW1pdCA6IGIzY2E2MDNkNjc0OGUyYzIxOGUwZjQzMzM4OWZhOGY3YjUy MmE0ZGUKQXV0aG9yIDogU2ltb25lIENhcm9ubmkgPG5lZ2F0aXZvMTdAZ21haWwuY29tPgpEYXRl ICAgOiAyMDI2LTA2LTI1VDE1OjMzOjA5KzAyOjAwClN0YXRzICA6ICs5OC8tMSBpbiAyIGZpbGUo cykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy92a3Jvb3RzL2Mv YjNjYTYwM2Q2NzQ4ZTJjMjE4ZTBmNDMzMzg5ZmE4ZjdiNTIyYTRkZT9icmFuY2g9cmF3aGlkZQoK TG9nOgpGaXggZm9yIG5ldyBWdWxrYW4gMS40LjM0MSsgWE1MIGZvcm1hdDsgYWRkIHBhcnNpbmcg Zm9yIGJvdGggb2xkIGFuZCBuZXcgZm9ybWF0LgoKLS0tCmRpZmYgLS1naXQgYS92a3Jvb3RzLWZp eC1mdW5jcG9pbnRlci14bWwtZm9ybWF0LnBhdGNoIGIvdmtyb290cy1maXgtZnVuY3BvaW50ZXIt eG1sLWZvcm1hdC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45OGE4 YmY4Ci0tLSAvZGV2L251bGwKKysrIGIvdmtyb290cy1maXgtZnVuY3BvaW50ZXIteG1sLWZvcm1h dC5wYXRjaApAQCAtMCwwICsxLDk2IEBACistLS0gYS9nZW4vdnVsa2FuX2hlbHBlcnMucHkJMjAy Ni0wNS0wNyAyMjowMDoxMC4wMDAwMDAwMDAgKzAyMDAKKysrKyBiL2dlbi92dWxrYW5faGVscGVy cy5weQkyMDI2LTA2LTI1IDE1OjIzOjUzLjc1NjA3NjU2NyArMDIwMAorQEAgLTQ2MiwzOCArNDYy LDUxIEBACisgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAKKyAgICAgICAgIG1lbWJlcnMgPSBb XQorLSAgICAgICAgYmVnaW4gPSBOb25lCisrICAgICAgICBwcm90byA9IGZ1bmNwb2ludGVyLmZp bmQoInByb3RvIikKKyAKKy0gICAgICAgIGZvciB0IGluIGZ1bmNwb2ludGVyLmZpbmRhbGwoInR5 cGUiKToKKy0gICAgICAgICAgICAjIEdlbmVyYWwgZm9ybToKKy0gICAgICAgICAgICAjIDx0eXBl PnZvaWQ8L3R5cGU+KiAgICAgICBwVXNlckRhdGEsCistICAgICAgICAgICAgIyBQYXJzaW5nIG9m IHRoZSB0YWlsIChhbnl0aGluZyBwYXN0IDwvdHlwZT4pIGlzIHRyaWNreSBzaW5jZSB0aGVyZQor LSAgICAgICAgICAgICMgY2FuIGJlIG90aGVyIGRhdGEgb24gdGhlIG5leHQgbGluZSBsaWtlOiBj b25zdCA8dHlwZT5pbnQ8L3R5cGU+Li4KKy0KKy0gICAgICAgICAgICBjb25zdCA9IFRydWUgaWYg YmVnaW4gYW5kICJjb25zdCIgaW4gYmVnaW4gZWxzZSBGYWxzZQorLSAgICAgICAgICAgIF90eXBl ID0gdC50ZXh0CistICAgICAgICAgICAgbGluZXMgPSB0LnRhaWwuc3BsaXQoIixcbiIpCistICAg ICAgICAgICAgaWYgbGluZXNbMF1bMF0gPT0gIioiOgorLSAgICAgICAgICAgICAgICBwb2ludGVy ID0gIioiCistICAgICAgICAgICAgICAgIG5hbWUgPSBsaW5lc1swXVsxOl0uc3RyaXAoKQorLSAg ICAgICAgICAgIGVsc2U6CistICAgICAgICAgICAgICAgIHBvaW50ZXIgPSBOb25lCistICAgICAg ICAgICAgICAgIG5hbWUgPSBsaW5lc1swXS5zdHJpcCgpCisrICAgICAgICBpZiBwcm90byBpcyBu b3QgTm9uZToKKysgICAgICAgICAgICAjIE5ldyBYTUwgZm9ybWF0ICh2dWxrYW4taGVhZGVycyAx LjQuMzQxKyk6CisrICAgICAgICAgICAgIyA8cHJvdG8+PHR5cGU+dm9pZDwvdHlwZT4gPG5hbWU+ UEZOX2ZvbzwvbmFtZT48L3Byb3RvPgorKyAgICAgICAgICAgICMgPHBhcmFtPjx0eXBlPnR5cGVB PC90eXBlPiogPG5hbWU+cGFybUE8L25hbWU+PC9wYXJhbT4KKysgICAgICAgICAgICBwcm90b190 eXBlX2VsZW0gPSBwcm90by5maW5kKCJ0eXBlIikKKysgICAgICAgICAgICByZXRfdHlwZSA9IHBy b3RvX3R5cGVfZWxlbS50ZXh0CisrICAgICAgICAgICAgcmV0X3B0ciA9ICIqIiBpZiBwcm90b190 eXBlX2VsZW0udGFpbCBhbmQgIioiIGluIHByb3RvX3R5cGVfZWxlbS50YWlsIGVsc2UgIiIKKysg ICAgICAgICAgICBfdHlwZSA9ICJ0eXBlZGVmIHt9e30gKFZLQVBJX1BUUiAqIi5mb3JtYXQocmV0 X3R5cGUsIHJldF9wdHIpCisrICAgICAgICAgICAgbmFtZSA9IHByb3RvLmZpbmQoIm5hbWUiKS50 ZXh0CisrCisrICAgICAgICAgICAgZm9yIHBhcmFtIGluIGZ1bmNwb2ludGVyLmZpbmRhbGwoInBh cmFtIik6CisrICAgICAgICAgICAgICAgIG1lbWJlciA9IFZrTWVtYmVyLmZyb21feG1sKHBhcmFt LCBGYWxzZSwgTm9uZSkKKysgICAgICAgICAgICAgICAgaWYgbWVtYmVyOgorKyAgICAgICAgICAg ICAgICAgICAgbWVtYmVycy5hcHBlbmQobWVtYmVyKQorKyAgICAgICAgZWxzZToKKysgICAgICAg ICAgICAjIE9sZCBYTUwgZm9ybWF0OgorKyAgICAgICAgICAgICMgdHlwZWRlZiB2b2lkIChWS0FQ SV9QVFIgKjxuYW1lPlBGTl9mb288L25hbWU+KSgKKysgICAgICAgICAgICAjICAgICA8dHlwZT50 eXBlQTwvdHlwZT4qIHBhcm1BLAorKyAgICAgICAgICAgIGJlZ2luID0gTm9uZQorKyAgICAgICAg ICAgIGZvciB0IGluIGZ1bmNwb2ludGVyLmZpbmRhbGwoInR5cGUiKToKKysgICAgICAgICAgICAg ICAgY29uc3QgPSBUcnVlIGlmIGJlZ2luIGFuZCAiY29uc3QiIGluIGJlZ2luIGVsc2UgRmFsc2UK KysgICAgICAgICAgICAgICAgcGFyYW1fdHlwZSA9IHQudGV4dAorKyAgICAgICAgICAgICAgICBs aW5lcyA9IHQudGFpbC5zcGxpdCgiLFxuIikKKysgICAgICAgICAgICAgICAgaWYgbGluZXNbMF1b MF0gPT0gIioiOgorKyAgICAgICAgICAgICAgICAgICAgcG9pbnRlciA9ICIqIgorKyAgICAgICAg ICAgICAgICAgICAgcGFyYW1fbmFtZSA9IGxpbmVzWzBdWzE6XS5zdHJpcCgpCisrICAgICAgICAg ICAgICAgIGVsc2U6CisrICAgICAgICAgICAgICAgICAgICBwb2ludGVyID0gTm9uZQorKyAgICAg ICAgICAgICAgICAgICAgcGFyYW1fbmFtZSA9IGxpbmVzWzBdLnN0cmlwKCkKKyAKKy0gICAgICAg ICAgICAjIEZpbHRlciBvdXQgKTsgaWYgaXQgaXMgY29udGFpbmVkLgorLSAgICAgICAgICAgIG5h bWUgPSBuYW1lLnBhcnRpdGlvbigiKTsiKVswXQorKyAgICAgICAgICAgICAgICAjIEZpbHRlciBv dXQgKTsgaWYgaXQgaXMgY29udGFpbmVkLgorKyAgICAgICAgICAgICAgICBwYXJhbV9uYW1lID0g cGFyYW1fbmFtZS5wYXJ0aXRpb24oIik7IilbMF0KKysKKysgICAgICAgICAgICAgICAgdHJ5Ogor KyAgICAgICAgICAgICAgICAgICAgYmVnaW4gPSBsaW5lc1sxXS5zdHJpcCgpCisrICAgICAgICAg ICAgICAgIGV4Y2VwdCBJbmRleEVycm9yOgorKyAgICAgICAgICAgICAgICAgICAgYmVnaW4gPSBO b25lCisgCistICAgICAgICAgICAgIyBJZiB0YWlsIGVuY29tcGFzc2VzIG11bHRpcGxlIGxpbmVz LCBhc3NpZ24gdGhlIHNlY29uZCBsaW5lIHRvIGJlZ2luCistICAgICAgICAgICAgIyBmb3IgdGhl IG5leHQgbGluZS4KKy0gICAgICAgICAgICB0cnk6CistICAgICAgICAgICAgICAgIGJlZ2luID0g bGluZXNbMV0uc3RyaXAoKQorLSAgICAgICAgICAgIGV4Y2VwdCBJbmRleEVycm9yOgorLSAgICAg ICAgICAgICAgICBiZWdpbiA9IE5vbmUKKysgICAgICAgICAgICAgICAgbWVtYmVycy5hcHBlbmQo VmtNZW1iZXIoY29uc3Q9Y29uc3QsIF90eXBlPXBhcmFtX3R5cGUsIHBvaW50ZXI9cG9pbnRlciwg bmFtZT1wYXJhbV9uYW1lKSkKKyAKKy0gICAgICAgICAgICBtZW1iZXJzLmFwcGVuZChWa01lbWJl cihjb25zdD1jb25zdCwgX3R5cGU9X3R5cGUsIHBvaW50ZXI9cG9pbnRlciwgbmFtZT1uYW1lKSkK KysgICAgICAgICAgICBfdHlwZSA9IGZ1bmNwb2ludGVyLnRleHQKKysgICAgICAgICAgICBuYW1l ID0gZnVuY3BvaW50ZXIuZmluZCgibmFtZSIpLnRleHQKKyAKKy0gICAgICAgIF90eXBlID0gZnVu Y3BvaW50ZXIudGV4dAorLSAgICAgICAgbmFtZSA9IGZ1bmNwb2ludGVyLmZpbmQoIm5hbWUiKS50 ZXh0CisgICAgICAgICBpZiAicmVxdWlyZXMiIGluIGZ1bmNwb2ludGVyLmF0dHJpYjoKKyAgICAg ICAgICAgICBmb3J3YXJkX2RlY2xzID0gZnVuY3BvaW50ZXIuYXR0cmliLmdldCgicmVxdWlyZXMi KS5zcGxpdCgiLCIpCisgICAgICAgICBlbHNlOgorQEAgLTIwNjksMTAgKzIwODIsMTMgQEAKKyAg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgCisgICAgICAgICAgICAgIyBOYW1lIGlzIGlu IGdlbmVyYWwgd2l0aGluIGEgbmFtZSB0YWcgZWxzZSBpdCBpcyBhbiBvcHRpb25hbAorLSAgICAg ICAgICAgICMgYXR0cmlidXRlIG9uIHRoZSB0eXBlIHRhZy4KKysgICAgICAgICAgICAjIGF0dHJp YnV0ZSBvbiB0aGUgdHlwZSB0YWcuIEZvciB0aGUgbmV3IGZ1bmNwb2ludGVyIGZvcm1hdCwKKysg ICAgICAgICAgICAjIHRoZSBuYW1lIGlzIG5lc3RlZCBpbnNpZGUgPHByb3RvPjxuYW1lPi4uLjwv bmFtZT48L3Byb3RvPi4KKyAgICAgICAgICAgICBuYW1lX2VsZW0gPSB0LmZpbmQoIm5hbWUiKQor ICAgICAgICAgICAgIGlmIG5hbWVfZWxlbSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAgICAg dHlwZV9pbmZvWyJuYW1lIl0gPSBuYW1lX2VsZW0udGV4dAorKyAgICAgICAgICAgIGVsaWYgdC5m aW5kKCJwcm90by9uYW1lIikgaXMgbm90IE5vbmU6CisrICAgICAgICAgICAgICAgIHR5cGVfaW5m b1sibmFtZSJdID0gdC5maW5kKCJwcm90by9uYW1lIikudGV4dAorICAgICAgICAgICAgIGVsc2U6 CisgICAgICAgICAgICAgICAgIHR5cGVfaW5mb1sibmFtZSJdID0gdC5hdHRyaWIuZ2V0KCJuYW1l IiwgTm9uZSkKKyAKCmRpZmYgLS1naXQgYS92a3Jvb3RzLnNwZWMgYi92a3Jvb3RzLnNwZWMKaW5k ZXggMmRiMWYwYy4uODYxYTA5NyAxMDA2NDQKLS0tIGEvdmtyb290cy5zcGVjCisrKyBiL3Zrcm9v dHMuc3BlYwpAQCAtMTIsNyArMTIsOCBAQCBVUkw6ICAgICAgICAgICAgaHR0cHM6Ly9naXRodWIu Y29tL0pvc2h1YS1Bc2h0b24vdmtyb290cwogQnVpbGRBcmNoOiAgICAgIG5vYXJjaAogCiBTb3Vy Y2U6ICAgICAgICAgJXt1cmx9L2FyY2hpdmUvJXtjb21taXR9LyV7bmFtZX0tJXtzaG9ydGNvbW1p dH0udGFyLmd6Ci1QYXRjaDogICAgICAgICAgaHR0cHM6Ly9wYXRjaC1kaWZmLmdpdGh1YnVzZXJj b250ZW50LmNvbS9yYXcvbWlzeWx0b2FkL3Zrcm9vdHMvcHVsbC8xMi5wYXRjaAorUGF0Y2gwOiAg ICAgICAgIGh0dHBzOi8vcGF0Y2gtZGlmZi5naXRodWJ1c2VyY29udGVudC5jb20vcmF3L21pc3ls dG9hZC92a3Jvb3RzL3B1bGwvMTIucGF0Y2gKK1BhdGNoMTogICAgICAgICB2a3Jvb3RzLWZpeC1m dW5jcG9pbnRlci14bWwtZm9ybWF0LnBhdGNoCiAKIEJ1aWxkUmVxdWlyZXM6ICBtZXNvbiA+PSAw LjU4LjAKIEJ1aWxkUmVxdWlyZXM6ICBnY2MK