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] f43: Fix for new Vulkan 1.4.341+ XML format; add parsing for both old and new format. Date: Thu, 25 Jun 2026 13:33:37 GMT Message-ID: <178239441787.1.9975010356786148837.rpms-vkroots-b3ca603d6748@fedoraproject.org> List-ID: X-Git-Repo: rpms/vkroots X-Git-Branch: f43 X-Git-Rev: b3ca603d6748e2c218e0f433389fa8f7b522a4de QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvdmtyb290cwpCcmFu Y2ggOiBmNDMKQ29tbWl0IDogYjNjYTYwM2Q2NzQ4ZTJjMjE4ZTBmNDMzMzg5ZmE4ZjdiNTIyYTRk ZQpBdXRob3IgOiBTaW1vbmUgQ2Fyb25uaSA8bmVnYXRpdm8xN0BnbWFpbC5jb20+CkRhdGUgICA6 IDIwMjYtMDYtMjVUMTU6MzM6MDkrMDI6MDAKU3RhdHMgIDogKzk4Ly0xIGluIDIgZmlsZShzKQpV UkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Zrcm9vdHMvYy9iM2Nh NjAzZDY3NDhlMmMyMThlMGY0MzMzODlmYThmN2I1MjJhNGRlP2JyYW5jaD1mNDMKCkxvZzoKRml4 IGZvciBuZXcgVnVsa2FuIDEuNC4zNDErIFhNTCBmb3JtYXQ7IGFkZCBwYXJzaW5nIGZvciBib3Ro IG9sZCBhbmQgbmV3IGZvcm1hdC4KCi0tLQpkaWZmIC0tZ2l0IGEvdmtyb290cy1maXgtZnVuY3Bv aW50ZXIteG1sLWZvcm1hdC5wYXRjaCBiL3Zrcm9vdHMtZml4LWZ1bmNwb2ludGVyLXhtbC1mb3Jt YXQucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOThhOGJmOAotLS0g L2Rldi9udWxsCisrKyBiL3Zrcm9vdHMtZml4LWZ1bmNwb2ludGVyLXhtbC1mb3JtYXQucGF0Y2gK QEAgLTAsMCArMSw5NiBAQAorLS0tIGEvZ2VuL3Z1bGthbl9oZWxwZXJzLnB5CTIwMjYtMDUtMDcg MjI6MDA6MTAuMDAwMDAwMDAwICswMjAwCisrKysgYi9nZW4vdnVsa2FuX2hlbHBlcnMucHkJMjAy Ni0wNi0yNSAxNToyMzo1My43NTYwNzY1NjcgKzAyMDAKK0BAIC00NjIsMzggKzQ2Miw1MSBAQAor ICAgICAgICAgICAgIHJldHVybiBOb25lCisgCisgICAgICAgICBtZW1iZXJzID0gW10KKy0gICAg ICAgIGJlZ2luID0gTm9uZQorKyAgICAgICAgcHJvdG8gPSBmdW5jcG9pbnRlci5maW5kKCJwcm90 byIpCisgCistICAgICAgICBmb3IgdCBpbiBmdW5jcG9pbnRlci5maW5kYWxsKCJ0eXBlIik6Cist ICAgICAgICAgICAgIyBHZW5lcmFsIGZvcm06CistICAgICAgICAgICAgIyA8dHlwZT52b2lkPC90 eXBlPiogICAgICAgcFVzZXJEYXRhLAorLSAgICAgICAgICAgICMgUGFyc2luZyBvZiB0aGUgdGFp bCAoYW55dGhpbmcgcGFzdCA8L3R5cGU+KSBpcyB0cmlja3kgc2luY2UgdGhlcmUKKy0gICAgICAg ICAgICAjIGNhbiBiZSBvdGhlciBkYXRhIG9uIHRoZSBuZXh0IGxpbmUgbGlrZTogY29uc3QgPHR5 cGU+aW50PC90eXBlPi4uCistCistICAgICAgICAgICAgY29uc3QgPSBUcnVlIGlmIGJlZ2luIGFu ZCAiY29uc3QiIGluIGJlZ2luIGVsc2UgRmFsc2UKKy0gICAgICAgICAgICBfdHlwZSA9IHQudGV4 dAorLSAgICAgICAgICAgIGxpbmVzID0gdC50YWlsLnNwbGl0KCIsXG4iKQorLSAgICAgICAgICAg IGlmIGxpbmVzWzBdWzBdID09ICIqIjoKKy0gICAgICAgICAgICAgICAgcG9pbnRlciA9ICIqIgor LSAgICAgICAgICAgICAgICBuYW1lID0gbGluZXNbMF1bMTpdLnN0cmlwKCkKKy0gICAgICAgICAg ICBlbHNlOgorLSAgICAgICAgICAgICAgICBwb2ludGVyID0gTm9uZQorLSAgICAgICAgICAgICAg ICBuYW1lID0gbGluZXNbMF0uc3RyaXAoKQorKyAgICAgICAgaWYgcHJvdG8gaXMgbm90IE5vbmU6 CisrICAgICAgICAgICAgIyBOZXcgWE1MIGZvcm1hdCAodnVsa2FuLWhlYWRlcnMgMS40LjM0MSsp OgorKyAgICAgICAgICAgICMgPHByb3RvPjx0eXBlPnZvaWQ8L3R5cGU+IDxuYW1lPlBGTl9mb288 L25hbWU+PC9wcm90bz4KKysgICAgICAgICAgICAjIDxwYXJhbT48dHlwZT50eXBlQTwvdHlwZT4q IDxuYW1lPnBhcm1BPC9uYW1lPjwvcGFyYW0+CisrICAgICAgICAgICAgcHJvdG9fdHlwZV9lbGVt ID0gcHJvdG8uZmluZCgidHlwZSIpCisrICAgICAgICAgICAgcmV0X3R5cGUgPSBwcm90b190eXBl X2VsZW0udGV4dAorKyAgICAgICAgICAgIHJldF9wdHIgPSAiKiIgaWYgcHJvdG9fdHlwZV9lbGVt LnRhaWwgYW5kICIqIiBpbiBwcm90b190eXBlX2VsZW0udGFpbCBlbHNlICIiCisrICAgICAgICAg ICAgX3R5cGUgPSAidHlwZWRlZiB7fXt9IChWS0FQSV9QVFIgKiIuZm9ybWF0KHJldF90eXBlLCBy ZXRfcHRyKQorKyAgICAgICAgICAgIG5hbWUgPSBwcm90by5maW5kKCJuYW1lIikudGV4dAorKwor KyAgICAgICAgICAgIGZvciBwYXJhbSBpbiBmdW5jcG9pbnRlci5maW5kYWxsKCJwYXJhbSIpOgor KyAgICAgICAgICAgICAgICBtZW1iZXIgPSBWa01lbWJlci5mcm9tX3htbChwYXJhbSwgRmFsc2Us IE5vbmUpCisrICAgICAgICAgICAgICAgIGlmIG1lbWJlcjoKKysgICAgICAgICAgICAgICAgICAg IG1lbWJlcnMuYXBwZW5kKG1lbWJlcikKKysgICAgICAgIGVsc2U6CisrICAgICAgICAgICAgIyBP bGQgWE1MIGZvcm1hdDoKKysgICAgICAgICAgICAjIHR5cGVkZWYgdm9pZCAoVktBUElfUFRSICo8 bmFtZT5QRk5fZm9vPC9uYW1lPikoCisrICAgICAgICAgICAgIyAgICAgPHR5cGU+dHlwZUE8L3R5 cGU+KiBwYXJtQSwKKysgICAgICAgICAgICBiZWdpbiA9IE5vbmUKKysgICAgICAgICAgICBmb3Ig dCBpbiBmdW5jcG9pbnRlci5maW5kYWxsKCJ0eXBlIik6CisrICAgICAgICAgICAgICAgIGNvbnN0 ID0gVHJ1ZSBpZiBiZWdpbiBhbmQgImNvbnN0IiBpbiBiZWdpbiBlbHNlIEZhbHNlCisrICAgICAg ICAgICAgICAgIHBhcmFtX3R5cGUgPSB0LnRleHQKKysgICAgICAgICAgICAgICAgbGluZXMgPSB0 LnRhaWwuc3BsaXQoIixcbiIpCisrICAgICAgICAgICAgICAgIGlmIGxpbmVzWzBdWzBdID09ICIq IjoKKysgICAgICAgICAgICAgICAgICAgIHBvaW50ZXIgPSAiKiIKKysgICAgICAgICAgICAgICAg ICAgIHBhcmFtX25hbWUgPSBsaW5lc1swXVsxOl0uc3RyaXAoKQorKyAgICAgICAgICAgICAgICBl bHNlOgorKyAgICAgICAgICAgICAgICAgICAgcG9pbnRlciA9IE5vbmUKKysgICAgICAgICAgICAg ICAgICAgIHBhcmFtX25hbWUgPSBsaW5lc1swXS5zdHJpcCgpCisgCistICAgICAgICAgICAgIyBG aWx0ZXIgb3V0ICk7IGlmIGl0IGlzIGNvbnRhaW5lZC4KKy0gICAgICAgICAgICBuYW1lID0gbmFt ZS5wYXJ0aXRpb24oIik7IilbMF0KKysgICAgICAgICAgICAgICAgIyBGaWx0ZXIgb3V0ICk7IGlm IGl0IGlzIGNvbnRhaW5lZC4KKysgICAgICAgICAgICAgICAgcGFyYW1fbmFtZSA9IHBhcmFtX25h bWUucGFydGl0aW9uKCIpOyIpWzBdCisrCisrICAgICAgICAgICAgICAgIHRyeToKKysgICAgICAg ICAgICAgICAgICAgIGJlZ2luID0gbGluZXNbMV0uc3RyaXAoKQorKyAgICAgICAgICAgICAgICBl eGNlcHQgSW5kZXhFcnJvcjoKKysgICAgICAgICAgICAgICAgICAgIGJlZ2luID0gTm9uZQorIAor LSAgICAgICAgICAgICMgSWYgdGFpbCBlbmNvbXBhc3NlcyBtdWx0aXBsZSBsaW5lcywgYXNzaWdu IHRoZSBzZWNvbmQgbGluZSB0byBiZWdpbgorLSAgICAgICAgICAgICMgZm9yIHRoZSBuZXh0IGxp bmUuCistICAgICAgICAgICAgdHJ5OgorLSAgICAgICAgICAgICAgICBiZWdpbiA9IGxpbmVzWzFd LnN0cmlwKCkKKy0gICAgICAgICAgICBleGNlcHQgSW5kZXhFcnJvcjoKKy0gICAgICAgICAgICAg ICAgYmVnaW4gPSBOb25lCisrICAgICAgICAgICAgICAgIG1lbWJlcnMuYXBwZW5kKFZrTWVtYmVy KGNvbnN0PWNvbnN0LCBfdHlwZT1wYXJhbV90eXBlLCBwb2ludGVyPXBvaW50ZXIsIG5hbWU9cGFy YW1fbmFtZSkpCisgCistICAgICAgICAgICAgbWVtYmVycy5hcHBlbmQoVmtNZW1iZXIoY29uc3Q9 Y29uc3QsIF90eXBlPV90eXBlLCBwb2ludGVyPXBvaW50ZXIsIG5hbWU9bmFtZSkpCisrICAgICAg ICAgICAgX3R5cGUgPSBmdW5jcG9pbnRlci50ZXh0CisrICAgICAgICAgICAgbmFtZSA9IGZ1bmNw b2ludGVyLmZpbmQoIm5hbWUiKS50ZXh0CisgCistICAgICAgICBfdHlwZSA9IGZ1bmNwb2ludGVy LnRleHQKKy0gICAgICAgIG5hbWUgPSBmdW5jcG9pbnRlci5maW5kKCJuYW1lIikudGV4dAorICAg ICAgICAgaWYgInJlcXVpcmVzIiBpbiBmdW5jcG9pbnRlci5hdHRyaWI6CisgICAgICAgICAgICAg Zm9yd2FyZF9kZWNscyA9IGZ1bmNwb2ludGVyLmF0dHJpYi5nZXQoInJlcXVpcmVzIikuc3BsaXQo IiwiKQorICAgICAgICAgZWxzZToKK0BAIC0yMDY5LDEwICsyMDgyLDEzIEBACisgICAgICAgICAg ICAgICAgICAgICBjb250aW51ZQorIAorICAgICAgICAgICAgICMgTmFtZSBpcyBpbiBnZW5lcmFs IHdpdGhpbiBhIG5hbWUgdGFnIGVsc2UgaXQgaXMgYW4gb3B0aW9uYWwKKy0gICAgICAgICAgICAj IGF0dHJpYnV0ZSBvbiB0aGUgdHlwZSB0YWcuCisrICAgICAgICAgICAgIyBhdHRyaWJ1dGUgb24g dGhlIHR5cGUgdGFnLiBGb3IgdGhlIG5ldyBmdW5jcG9pbnRlciBmb3JtYXQsCisrICAgICAgICAg ICAgIyB0aGUgbmFtZSBpcyBuZXN0ZWQgaW5zaWRlIDxwcm90bz48bmFtZT4uLi48L25hbWU+PC9w cm90bz4uCisgICAgICAgICAgICAgbmFtZV9lbGVtID0gdC5maW5kKCJuYW1lIikKKyAgICAgICAg ICAgICBpZiBuYW1lX2VsZW0gaXMgbm90IE5vbmU6CisgICAgICAgICAgICAgICAgIHR5cGVfaW5m b1sibmFtZSJdID0gbmFtZV9lbGVtLnRleHQKKysgICAgICAgICAgICBlbGlmIHQuZmluZCgicHJv dG8vbmFtZSIpIGlzIG5vdCBOb25lOgorKyAgICAgICAgICAgICAgICB0eXBlX2luZm9bIm5hbWUi XSA9IHQuZmluZCgicHJvdG8vbmFtZSIpLnRleHQKKyAgICAgICAgICAgICBlbHNlOgorICAgICAg ICAgICAgICAgICB0eXBlX2luZm9bIm5hbWUiXSA9IHQuYXR0cmliLmdldCgibmFtZSIsIE5vbmUp CisgCgpkaWZmIC0tZ2l0IGEvdmtyb290cy5zcGVjIGIvdmtyb290cy5zcGVjCmluZGV4IDJkYjFm MGMuLjg2MWEwOTcgMTAwNjQ0Ci0tLSBhL3Zrcm9vdHMuc3BlYworKysgYi92a3Jvb3RzLnNwZWMK QEAgLTEyLDcgKzEyLDggQEAgVVJMOiAgICAgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3No dWEtQXNodG9uL3Zrcm9vdHMKIEJ1aWxkQXJjaDogICAgICBub2FyY2gKIAogU291cmNlOiAgICAg ICAgICV7dXJsfS9hcmNoaXZlLyV7Y29tbWl0fS8le25hbWV9LSV7c2hvcnRjb21taXR9LnRhci5n egotUGF0Y2g6ICAgICAgICAgIGh0dHBzOi8vcGF0Y2gtZGlmZi5naXRodWJ1c2VyY29udGVudC5j b20vcmF3L21pc3lsdG9hZC92a3Jvb3RzL3B1bGwvMTIucGF0Y2gKK1BhdGNoMDogICAgICAgICBo dHRwczovL3BhdGNoLWRpZmYuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3Jhdy9taXN5bHRvYWQvdmty b290cy9wdWxsLzEyLnBhdGNoCitQYXRjaDE6ICAgICAgICAgdmtyb290cy1maXgtZnVuY3BvaW50 ZXIteG1sLWZvcm1hdC5wYXRjaAogCiBCdWlsZFJlcXVpcmVzOiAgbWVzb24gPj0gMC41OC4wCiBC dWlsZFJlcXVpcmVzOiAgZ2NjCg==