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: Richard Shaw To: git-commits@fedoraproject.org Subject: [rpms/OpenImageIO] rawhide: Fix merge conflict. Date: Tue, 02 Jun 2026 01:22:25 GMT Message-ID: <178036334593.1.10467257110471679904.rpms-OpenImageIO-947d9614b483@fedoraproject.org> List-ID: X-Git-Repo: rpms/OpenImageIO X-Git-Branch: rawhide X-Git-Rev: 947d9614b48309a85447bfd9fbb640fd54eb2bd1 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvT3BlbkltYWdlSU8K QnJhbmNoIDogcmF3aGlkZQpDb21taXQgOiA5NDdkOTYxNGI0ODMwOWE4NTQ0N2JmZDlmYmI2NDBm ZDU0ZWIyYmQxCkF1dGhvciA6IFJpY2hhcmQgU2hhdyA8aG9iYmVzMTA2OUBnbWFpbC5jb20+CkRh dGUgICA6IDIwMjYtMDYtMDFUMjA6MjI6MjEtMDU6MDAKU3RhdHMgIDogKzE3Ly01IGluIDMgZmls ZShzKQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL09wZW5JbWFn ZUlPL2MvOTQ3ZDk2MTRiNDgzMDlhODU0NDdiZmQ5ZmJiNjQwZmQ1NGViMmJkMT9icmFuY2g9cmF3 aGlkZQoKTG9nOgpGaXggbWVyZ2UgY29uZmxpY3QuCgotLS0KZGlmZiAtLWdpdCBhL09wZW5JbWFn ZUlPLnNwZWMgYi9PcGVuSW1hZ2VJTy5zcGVjCmluZGV4IDE0YzM2ODQuLjA0ODdiZjYgMTAwNjQ0 Ci0tLSBhL09wZW5JbWFnZUlPLnNwZWMKKysrIGIvT3BlbkltYWdlSU8uc3BlYwpAQCAtNDEsNiAr NDEsNyBAQCBCdWlsZFJlcXVpcmVzOiAgZm10LWRldmVsCiBCdWlsZFJlcXVpcmVzOiAgZnJlZXR5 cGUtZGV2ZWwKIEJ1aWxkUmVxdWlyZXM6ICBnaWZsaWItZGV2ZWwKIEJ1aWxkUmVxdWlyZXM6ICBn bGV3LWRldmVsCitCdWlsZFJlcXVpcmVzOiAgaW1hdGgtZGV2ZWwKICMgT25seSBhdmFpbGFibGUg b24gUlBNIEZ1c2lvbgogQnVpbGRSZXF1aXJlczogIGxpYmhlaWYtZGV2ZWwKIEJ1aWxkUmVxdWly ZXM6ICBsaWJ1bHRyYWhkci1kZXZlbApAQCAtMjAzLDEwICsyMDQsMTggQEAgY3AgLWEgc3JjL2Rv Yy8qLjEgJXtidWlsZHJvb3R9JXtfbWFuZGlyfS9tYW4xCiAle19pbmNsdWRlZGlyfS8le25hbWV9 LwogCiAKLSVjaGFuZ2Vsb2cKICogVHVlIEp1biAwMiAyMDI2IFJpY2hhcmQgU2hhdyA8aG9iYmVz MTA2OUBnbWFpbC5jb20+IC0gMTozLjEuMTQuMC0xCiAtIFVwZGF0ZSB0byAzLjEuMTQuMC4KIAor KiBTYXQgTWF5IDMwIDIwMjYgUmljaGFyZCBTaGF3IDxob2JiZXMxMDY5QGdtYWlsLmNvbT4gLSAx OjMuMS4xMi4wLTUKKy0gUmVidWlsZCBmb3IgT3BlbkNvbG9ySU8gMi41LjIuCisKKyogTW9uIE1h eSAyNSAyMDI2IFJpY2hhcmQgU2hhdyA8aG9iYmVzMTA2OUBnbWFpbC5jb20+IC0gMTozLjEuMTIu MC00CistIFJlYnVpbGQgZm9yIE9wZW5FWFIgMy40LjEyLgorCisqIFNhdCBNYXkgMDIgMjAyNiBT aW1vbmUgQ2Fyb25uaSA8bmVnYXRpdm8xN0BnbWFpbC5jb20+IC0gMTozLjEuMTIuMC0zCistIFJl YnVpbGQgZm9yIE9wZW5KUEggdXBkYXRlLgorCiAqIFdlZCBBcHIgMDggMjAyNiBHd3luIENpZXNs YSA8Z3d5bmNAcHJvdG9ubWFpbC5jb20+IC0gMTozLjEuMTIuMC0yCiAtIExpYnJhdyByZWJ1aWxk CiAKCmRpZmYgLS1naXQgYS8uZ2l0aWdub3JlIGIvLmdpdGlnbm9yZQppbmRleCA5ZGRhM2VhLi41 ZmVkMWI2IDEwMDY0NAotLS0gYS8uZ2l0aWdub3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTEzNiwz ICsxMzYsNCBAQCBjbG9nCiAvT3BlbkltYWdlSU8tMy4xLjguMC50YXIuZ3oKIC9PcGVuSW1hZ2VJ Ty0zLjEuOS4wLnRhci5negogL09wZW5JbWFnZUlPLTMuMS4xMi4wLnRhci5negorL09wZW5JbWFn ZUlPLTMuMS4xNC4wLnRhci5negoKZGlmZiAtLWdpdCBhL09wZW5JbWFnZUlPLnNwZWMgYi9PcGVu SW1hZ2VJTy5zcGVjCmluZGV4IDUwYWJiNjYuLjA0ODdiZjYgMTAwNjQ0Ci0tLSBhL09wZW5JbWFn ZUlPLnNwZWMKKysrIGIvT3BlbkltYWdlSU8uc3BlYwpAQCAtMiw4ICsyLDggQEAKICVnbG9iYWwg c292ZXIgMy4xCiAKIE5hbWU6ICAgICAgICAgICBPcGVuSW1hZ2VJTwotVmVyc2lvbjogICAgICAg IDMuMS4xMi4wCi1SZWxlYXNlOiAgICAgICAgNSV7P2Rpc3R9CitWZXJzaW9uOiAgICAgICAgMy4x LjE0LjAKK1JlbGVhc2U6ICAgICAgICAxJXs/ZGlzdH0KIEVwb2NoOiAgICAgICAgICAxCiBTdW1t YXJ5OiAgICAgICAgTGlicmFyeSBmb3IgcmVhZGluZyBhbmQgd3JpdGluZyBpbWFnZXMKIApAQCAt MjA0LDcgKzIwNCw5IEBAIGNwIC1hIHNyYy9kb2MvKi4xICV7YnVpbGRyb290fSV7X21hbmRpcn0v bWFuMQogJXtfaW5jbHVkZWRpcn0vJXtuYW1lfS8KIAogCi0lY2hhbmdlbG9nCisqIFR1ZSBKdW4g MDIgMjAyNiBSaWNoYXJkIFNoYXcgPGhvYmJlczEwNjlAZ21haWwuY29tPiAtIDE6My4xLjE0LjAt MQorLSBVcGRhdGUgdG8gMy4xLjE0LjAuCisKICogU2F0IE1heSAzMCAyMDI2IFJpY2hhcmQgU2hh dyA8aG9iYmVzMTA2OUBnbWFpbC5jb20+IC0gMTozLjEuMTIuMC01CiAtIFJlYnVpbGQgZm9yIE9w ZW5Db2xvcklPIDIuNS4yLgogCgpkaWZmIC0tZ2l0IGEvc291cmNlcyBiL3NvdXJjZXMKaW5kZXgg ZTkzY2ZiNi4uYTE0ODVkZSAxMDA2NDQKLS0tIGEvc291cmNlcworKysgYi9zb3VyY2VzCkBAIC0x ICsxIEBACi1TSEE1MTIgKE9wZW5JbWFnZUlPLTMuMS4xMi4wLnRhci5neikgPSBkMDA4NzdjMWJj YThjNWNhMTllNDUzNDc4Nzc4M2ExMmM4OTIyMTU0MDMyODI0MjVkMTY4NTkyMGI1ZjQyNGI2ZmFj MjE3ZjA0OTI0M2MyMTA2ZTVkOTgxYzc1MDgxMTUxNDVlMDhjZTVjNWRkNzg2MzMwNzNjMWRkZDg4 M2YzZQorU0hBNTEyIChPcGVuSW1hZ2VJTy0zLjEuMTQuMC50YXIuZ3opID0gZGQ1Y2IzMGVkZjhk NmMyZDYxMjYwY2MyZDkxYTdhMjliYmFkMTFiMThmODNhZjkzNTI3ZjkzMDhiZmYwZTI0YjIxODU4 NDYzNWZkYWQ2YTE1NGEyYzMyZjBjOGMxMmE0NThhODYyNjFjNzZjMzZkOWFhNDExMDZhZjg1MzNh MzkK