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: Dominik 'Rathann' Mierzejewski To: git-commits@fedoraproject.org Subject: [rpms/opencv] rawhide: Fixed build with FFmpeg 9 Date: Sat, 05 Sep 2026 09:46:40 GMT Message-ID: <178860160079.1.15442971314442766181.rpms-opencv-0360c67218cf@fedoraproject.org> List-ID: X-Git-Repo: rpms/opencv X-Git-Branch: rawhide X-Git-Rev: 0360c67218cfc8d0108ace9177bb2c7477ad64fc QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvb3BlbmN2CkJyYW5j aCA6IHJhd2hpZGUKQ29tbWl0IDogMDM2MGM2NzIxOGNmYzhkMDEwOGFjZTkxNzdiYjJjNzQ3N2Fk NjRmYwpBdXRob3IgOiBEb21pbmlrICdSYXRoYW5uJyBNaWVyemVqZXdza2kgPGRvbWluaWtAZ3Jl eXNlY3Rvci5uZXQ+CkRhdGUgICA6IDIwMjYtMDgtMTlUMjI6MTA6MDQrMDI6MDAKU3RhdHMgIDog Kzk5Ly0xIGluIDIgZmlsZShzKQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9y Zy9ycG1zL29wZW5jdi9jLzAzNjBjNjcyMThjZmM4ZDAxMDhhY2U5MTc3YmIyYzc0NzdhZDY0ZmM/ YnJhbmNoPXJhd2hpZGUKCkxvZzoKRml4ZWQgYnVpbGQgd2l0aCBGRm1wZWcgOQoKLS0tCmRpZmYg LS1naXQgYS9vcGVuY3YtZmZtcGVnOS5wYXRjaCBiL29wZW5jdi1mZm1wZWc5LnBhdGNoCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUxNWU1MGUKLS0tIC9kZXYvbnVsbAorKysg Yi9vcGVuY3YtZmZtcGVnOS5wYXRjaApAQCAtMCwwICsxLDkyIEBACitkaWZmIC11cCBvcGVuY3Yt NC4xMy4wL21vZHVsZXMvdmlkZW9pby9zcmMvY2FwX2ZmbXBlZ19ody5ocHAuZmZtcGVnOSBvcGVu Y3YtNC4xMy4wL21vZHVsZXMvdmlkZW9pby9zcmMvY2FwX2ZmbXBlZ19ody5ocHAKKy0tLSBvcGVu Y3YtNC4xMy4wL21vZHVsZXMvdmlkZW9pby9zcmMvY2FwX2ZmbXBlZ19ody5ocHAuZmZtcGVnOQky MDI1LTEyLTMwIDA4OjUyOjA1LjAwMDAwMDAwMCArMDEwMAorKysrIG9wZW5jdi00LjEzLjAvbW9k dWxlcy92aWRlb2lvL3NyYy9jYXBfZmZtcGVnX2h3LmhwcAkyMDI2LTA4LTE5IDIyOjA4OjAzLjEy MzAzMTMxOCArMDIwMAorQEAgLTc1Nyw2ICs3NTcsMzAgQEAgQVZDb2RlYyAqaHdfZmluZF9jb2Rl YyhBVkNvZGVjSUQgaWQsIEFWSAorICNlbmRpZgorICAgICAgICAgICAgIGlmIChod190eXBlID09 IEFWX0hXREVWSUNFX1RZUEVfQ1VEQSkgLy8gQ1VEQSBlbmNvZGVycyBkb24ndCBzdXBwb3J0IGF2 Y29kZWNfZ2V0X2h3X2NvbmZpZygpCisgICAgICAgICAgICAgICAgIGh3X25hdGl2ZV9mbXQgPSBB Vl9QSVhfRk1UX0NVREE7CisrI2lmIExJQkFWQ09ERUNfQlVJTEQgPj0gQVZfVkVSU0lPTl9JTlQo NjEsIDEzLCAxMDApCisrICAgICAgICAgICAgaWYgKGF2X2NvZGVjX2lzX2VuY29kZXIoYykgJiYg aHdfbmF0aXZlX2ZtdCAhPSBBVl9QSVhfRk1UX05PTkUpIHsKKysgICAgICAgICAgICAgICAgY29u c3QgQVZQaXhlbEZvcm1hdCAqcGl4X2ZtdHMgPSBOVUxMOworKyAgICAgICAgICAgICAgICBpbnQg bnVtX3BpeF9mbXRzID0gMDsKKysKKysgICAgICAgICAgICAgICAgaW50IHJldCA9IGF2Y29kZWNf Z2V0X3N1cHBvcnRlZF9jb25maWcoCisrICAgICAgICAgICAgICAgICAgICBOVUxMLAorKyAgICAg ICAgICAgICAgICAgICAgYywKKysgICAgICAgICAgICAgICAgICAgIEFWX0NPREVDX0NPTkZJR19Q SVhfRk9STUFULAorKyAgICAgICAgICAgICAgICAgICAgMCwKKysgICAgICAgICAgICAgICAgICAg IChjb25zdCB2b2lkICoqKSZwaXhfZm10cywKKysgICAgICAgICAgICAgICAgICAgICZudW1fcGl4 X2ZtdHMpOworKworKyAgICAgICAgICAgICAgICBpZiAocmV0ID49IDAgJiYgcGl4X2ZtdHMgJiYg bnVtX3BpeF9mbXRzID4gMCkgeworKyAgICAgICAgICAgICAgICAgICAgICAgIGZvciAoaW50IGkg PSAwOyBpIDwgbnVtX3BpeF9mbXRzOyBpKyspIHsKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHBpeF9mbXRzW2ldID09IGh3X25hdGl2ZV9mbXQpIHsKKysgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICpod19waXhfZm10ID0gaHdfbmF0aXZlX2ZtdDsKKysgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChod19jaGVja19jb2RlYyhjLCBod190eXBlLCBkaXNh YmxlZF9jb2RlY3MpKQorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVy biBjOworKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisrICAgICAgICAgICAgICAgICAg ICAgICAgfQorKyAgICAgICAgICAgICAgICAgICAgfQorKyAgICAgICAgICAgIH0KKysjZWxzZQor ICAgICAgICAgICAgIGlmIChhdl9jb2RlY19pc19lbmNvZGVyKGMpICYmIGh3X25hdGl2ZV9mbXQg IT0gQVZfUElYX0ZNVF9OT05FICYmIGMtPnBpeF9mbXRzKSB7CisgICAgICAgICAgICAgICAgIGZv ciAoaW50IGkgPSAwOyBjLT5waXhfZm10c1tpXSAhPSBBVl9QSVhfRk1UX05PTkU7IGkrKykgewor ICAgICAgICAgICAgICAgICAgICAgaWYgKGMtPnBpeF9mbXRzW2ldID09IGh3X25hdGl2ZV9mbXQp IHsKK0BAIC03NjYsNiArNzkwLDcgQEAgQVZDb2RlYyAqaHdfZmluZF9jb2RlYyhBVkNvZGVjSUQg aWQsIEFWSAorICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgfQorKyNlbmRpZgorICAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOzsgaSsrKSB7 CisgICAgICAgICAgICAgICAgIGNvbnN0IEFWQ29kZWNIV0NvbmZpZyAqaHdfY29uZmlnID0gYXZj b2RlY19nZXRfaHdfY29uZmlnKGMsIGkpOworICAgICAgICAgICAgICAgICBpZiAoIWh3X2NvbmZp ZykKK2RpZmYgLXVwIG9wZW5jdi00LjEzLjAvbW9kdWxlcy92aWRlb2lvL3NyYy9jYXBfZmZtcGVn X2ltcGwuaHBwLmZmbXBlZzkgb3BlbmN2LTQuMTMuMC9tb2R1bGVzL3ZpZGVvaW8vc3JjL2NhcF9m Zm1wZWdfaW1wbC5ocHAKKy0tLSBvcGVuY3YtNC4xMy4wL21vZHVsZXMvdmlkZW9pby9zcmMvY2Fw X2ZmbXBlZ19pbXBsLmhwcC5mZm1wZWc5CTIwMjUtMTItMzAgMDg6NTI6MDUuMDAwMDAwMDAwICsw MTAwCisrKysgb3BlbmN2LTQuMTMuMC9tb2R1bGVzL3ZpZGVvaW8vc3JjL2NhcF9mZm1wZWdfaW1w bC5ocHAJMjAyNi0wOC0xOSAyMjowODowMy4xMjMyNzUzMjIgKzAyMDAKK0BAIC0yNTgzLDYgKzI1 ODMsMzggQEAgc3RhdGljIEFWQ29kZWNDb250ZXh0ICogaWN2X2NvbmZpZ3VyZV92aQorICAgICBj LT50aW1lX2Jhc2UuZGVuID0gZnJhbWVfcmF0ZTsKKyAgICAgYy0+dGltZV9iYXNlLm51bSA9IGZy YW1lX3JhdGVfYmFzZTsKKyAgICAgLyogYWRqdXN0IHRpbWUgYmFzZSBmb3Igc3VwcG9ydGVkIGZy YW1lcmF0ZXMgKi8KKysjaWYgTElCQVZDT0RFQ19CVUlMRCA+PSBDQUxDX0ZGTVBFR19WRVJTSU9O KDYxLCAxMywgMTAwKQorKyAgICBpZiAoY29kZWMpeworKyAgICAgICAgY29uc3QgQVZSYXRpb25h bCAqc3VwcG9ydGVkX2ZyYW1lcmF0ZXMgPSBOVUxMOworKyAgICAgICAgaW50IG51bV9zdXBwb3J0 ZWRfZnJhbWVyYXRlcyA9IDA7CisrICAgICAgICBpbnQgcmV0ID0gYXZjb2RlY19nZXRfc3VwcG9y dGVkX2NvbmZpZyhOVUxMLCBjb2RlYywgQVZfQ09ERUNfQ09ORklHX0ZSQU1FX1JBVEUsIDAsCisr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29uc3Qgdm9p ZCAqKikmc3VwcG9ydGVkX2ZyYW1lcmF0ZXMsICZudW1fc3VwcG9ydGVkX2ZyYW1lcmF0ZXMpOwor KworKyAgICAgICAgaWYgKHJldCA+PSAwICYmIHN1cHBvcnRlZF9mcmFtZXJhdGVzICYmIG51bV9z dXBwb3J0ZWRfZnJhbWVyYXRlcyA+IDApeworKyAgICAgICAgICAgIEFWUmF0aW9uYWwgcmVxID0g e2ZyYW1lX3JhdGUsIGZyYW1lX3JhdGVfYmFzZX07CisrICAgICAgICAgICAgY29uc3QgQVZSYXRp b25hbCAqYmVzdD1OVUxMOworKyAgICAgICAgICAgIEFWUmF0aW9uYWwgYmVzdF9lcnJvcj0ge0lO VF9NQVgsIDF9OworKyAgICAgICAgICAgIGZvcihpbnQgaSA9IDA7IGkgPCBudW1fc3VwcG9ydGVk X2ZyYW1lcmF0ZXM7IGkrKyl7CisrICAgICAgICAgICAgICAgIGNvbnN0IEFWUmF0aW9uYWwgKnAg PSAmc3VwcG9ydGVkX2ZyYW1lcmF0ZXNbaV07CisrICAgICAgICAgICAgICAgIEFWUmF0aW9uYWwg ZXJyb3IgPSBhdl9zdWJfcShyZXEsICpwKTsKKysgICAgICAgICAgICAgICAgaWYoZXJyb3IubnVt IDwwKSBlcnJvci5udW0gKj0gLTE7CisrICAgICAgICAgICAgICAgIGlmKGF2X2NtcF9xKGVycm9y LCBiZXN0X2Vycm9yKSA8IDApeworKyAgICAgICAgICAgICAgICAgICAgYmVzdF9lcnJvciA9IGVy cm9yOworKyAgICAgICAgICAgICAgICAgICAgYmVzdCA9IHA7CisrICAgICAgICAgICAgICAgIH0K KysgICAgICAgICAgICB9CisrICAgICAgICAgICAgaWYgKGJlc3QgPT0gTlVMTCkKKysgICAgICAg ICAgICB7CisrI2lmZGVmIENWX0ZGTVBFR19DT0RFQ1BBUgorKyAgICAgICAgICAgICAgICBhdmNv ZGVjX2ZyZWVfY29udGV4dCgmYyk7CisrI2VuZGlmCisrICAgICAgICAgICAgICAgIHJldHVybiBO VUxMOworKyAgICAgICAgICAgIH0KKysgICAgICAgICAgICBjLT50aW1lX2Jhc2UuZGVuID0gYmVz dC0+bnVtOworKyAgICAgICAgICAgIGMtPnRpbWVfYmFzZS5udW0gPSBiZXN0LT5kZW47CisrICAg ICAgICB9CisrICAgIH0KKysjZWxzZQorICAgICBpZihjb2RlYyAmJiBjb2RlYy0+c3VwcG9ydGVk X2ZyYW1lcmF0ZXMpeworICAgICAgICAgY29uc3QgQVZSYXRpb25hbCAqcD0gY29kZWMtPnN1cHBv cnRlZF9mcmFtZXJhdGVzOworICAgICAgICAgQVZSYXRpb25hbCByZXEgPSB7ZnJhbWVfcmF0ZSwg ZnJhbWVfcmF0ZV9iYXNlfTsKK0BAIC0yNjA2LDYgKzI2MzgsNyBAQCBzdGF0aWMgQVZDb2RlY0Nv bnRleHQgKiBpY3ZfY29uZmlndXJlX3ZpCisgICAgICAgICBjLT50aW1lX2Jhc2UuZGVuPSBiZXN0 LT5udW07CisgICAgICAgICBjLT50aW1lX2Jhc2UubnVtPSBiZXN0LT5kZW47CisgICAgIH0KKysj ZW5kaWYKKyAKKyAgICAgYy0+Z29wX3NpemUgPSAxMjsgLyogZW1pdCBvbmUgaW50cmEgZnJhbWUg ZXZlcnkgdHdlbHZlIGZyYW1lcyBhdCBtb3N0ICovCisgICAgIGMtPnBpeF9mbXQgPSBwaXhlbF9m b3JtYXQ7CgpkaWZmIC0tZ2l0IGEvb3BlbmN2LnNwZWMgYi9vcGVuY3Yuc3BlYwppbmRleCAzN2Iw YjgwLi4xZDNhY2NkIDEwMDY0NAotLS0gYS9vcGVuY3Yuc3BlYworKysgYi9vcGVuY3Yuc3BlYwpA QCAtNzMsNyArNzMsNyBAQCBWZXJzaW9uOiAgICAgICAgNC4xMy4wCiAlZ2xvYmFsIG1pbm9ydmVy ICUoZm9vPSV7dmVyc2lvbn07IGE9KCR7Zm9vLy8uLyB9KTsgZWNobyAke2FbMV19ICkKICVnbG9i YWwgcGFkZGluZyAgJShkaWdpdHM9MDA7IG51bT0le21pbm9ydmVyfTsgZWNobyAke2RpZ2l0czok eyNudW19OiR7I2RpZ2l0c319ICkKICVnbG9iYWwgYWJpdmVyICAgJShlY2hvICV7bWFqb3J2ZXJ9 JXtwYWRkaW5nfSV7bWlub3J2ZXJ9ICkKLVJlbGVhc2U6ICAgICAgICAxMCV7P2Rpc3R9CitSZWxl YXNlOiAgICAgICAgMTElez9kaXN0fQogU3VtbWFyeTogICAgICAgIENvbGxlY3Rpb24gb2YgYWxn b3JpdGhtcyBmb3IgY29tcHV0ZXIgdmlzaW9uCiAjIFRoaXMgaXMgbm9ybWFsIHRocmVlIGNsYXVz ZSBCU0QuCiBMaWNlbnNlOiAgICAgICAgQlNELTMtQ2xhdXNlIEFORCBBcGFjaGUtMi4wIEFORCBJ U0MKQEAgLTEwMyw2ICsxMDMsOCBAQCBQYXRjaDA6ICAgICAgICAgb3BlbmN2LTQuMS4wLWluc3Rh bGxfM3JkcGFydHlfbGljZW5zZXMucGF0Y2gKIFBhdGNoMTogICAgICAgICBvcGVuY3YtdnRrLnBh dGNoCiBQYXRjaDM6ICAgICAgICAgb3BlbmN2LnB5dGhvbi5wYXRjaAogUGF0Y2g0OiAgICAgICAg IEZpeC1tYWNyby1kZWZpbml0aW9uLWZvci1Qb3dlcjEwLWFyY2hpdGVjdHVyZS5wYXRjaAorIyBG aXggYnVpbGQgd2l0aCBGRm1wZWcgOSAtIGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuY3Yvb3BlbmN2 L3B1bGwvMjk1MzMKK1BhdGNoNTogICAgICAgICBvcGVuY3YtZmZtcGVnOS5wYXRjaAogCiAKIEJ1 aWxkUmVxdWlyZXM6ICBnY2MtYysrCkBAIC00MDEsNiArNDAzLDcgQEAgcG9wZCAmPi9kZXYvbnVs bAogJXBhdGNoIC1QIDAgLXAxIC1iIC5pbnN0YWxsXzNyZHBhcnR5X2xpY2Vuc2VzCiAlcGF0Y2gg LVAgMyAtcDEgLWIgLnB5dGhvbl9pbnN0YWxsX2JpbmFyeQogJXBhdGNoIC1QIDQgLXAxIC1iIC5w cGNfbWFjcm8KKyVwYXRjaCAtUCA1IC1wMSAtYiAuZmZtcGVnOQogCiBwdXNoZCAle25hbWV9X2Nv bnRyaWItJXt2ZXJzaW9ufQogJXBhdGNoIC1QIDEgLXAxIC1iIC52dGsKQEAgLTYwOSw2ICs2MTIs OSBAQCBjcCBjb25maWctKi5weSAle2J1aWxkcm9vdH0vJXtweXRob24zX3NpdGVsaWJ9L2N2Mi8K IAogCiAlY2hhbmdlbG9nCisqIFdlZCBBdWcgMTkgMjAyNiBEb21pbmlrIE1pZXJ6ZWpld3NraSA8 ZG9taW5pa0BncmV5c2VjdG9yLm5ldD4gLSA0LjEzLjAtMTEKKy0gRml4ZWQgYnVpbGQgd2l0aCBG Rm1wZWcgOQorCiAqIFdlZCBKdWwgMjIgMjAyNiBQeXRob24gTWFpbnQgPHB5dGhvbi1tYWludEBy ZWRoYXQuY29tPiAtIDQuMTMuMC0xMAogLSBSZWJ1aWx0IGZvciBQeXRob24gMy4xNS4wYjQgQUJJ IGNoYW5nZQogCg==