195552 2019-03-11 05:52:14 -0700 [GStreamer] remove legacy GStreamer version checks 2019-03-12 03:26:19 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris webkit-bug-importer oldest_to_newest 1514745 0 pnormand 2019-03-11 05:52:14 -0700 We require GStreamer 1.8.x so version checks below that make little sense. Also checks for odd minor version numbers make sense only for the latest GStreamer git development version. 1514746 1 364247 pnormand 2019-03-11 05:54:10 -0700 Created attachment 364247 Patch 1515392 2 pnormand 2019-03-12 03:25:18 -0700 Committed r242789: <https://trac.webkit.org/changeset/242789> 1515393 3 webkit-bug-importer 2019-03-12 03:26:19 -0700 <rdar://problem/48803042> 364247 2019-03-11 05:54:10 -0700 2019-03-12 03:12:28 -0700 Patch bug-195552-20190311125409.patch text/plain 6803 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGNjMGI2MmUzYTFhMzVl YmExYjJhMTlmNWQzMGFkOGMyOGJmMzJhNC4uNmM5NTRjZTY3NmQzMWUzMGMwODY4NWM1OTgzYjY3 MGNmNWI5ZmVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTAzLTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSByZW1vdmUgbGVnYWN5IEdTdHJlYW1lciB2ZXJzaW9uIGNoZWNrcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NTUyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgcmVxdWlyZSBHU3RyZWFtZXIgMS44 Lnggc28gdmVyc2lvbiBjaGVja3MgYmVsb3cgdGhhdCBtYWtlCisgICAgICAgIGxpdHRsZSBzZW5z ZS4gQWxzbyBjaGVja3MgZm9yIG9kZCBtaW5vciB2ZXJzaW9uIG51bWJlcnMgbWFrZSBzZW5zZQor ICAgICAgICBvbmx5IGZvciB0aGUgbGF0ZXN0IEdTdHJlYW1lciBnaXQgZGV2ZWxvcG1lbnQgdmVy c2lvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJD b21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lz dGVyV2ViS2l0RWxlbWVudHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVBdWRpb1NpbmspOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjplbnN1cmVHc3RHTENvbnRleHQpOgorCiAyMDE5LTAzLTEwICBSb3NzIEtpcnNs aW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBJbnZhbGlkIGZsYWdzIGlu IGEgUmVnRXhwIGxpdGVyYWwgc2hvdWxkIGJlIGFuIGVhcmx5IFN5bnRheEVycm9yCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVy Q29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uY3BwCmluZGV4IDFmYTRjNGM4NzkwOGQ4M2EzYWE3ZGIzYzBlOGM1NGYw ODVhYjMyOWEuLmRiMzU2M2FmNDMyM2JhMjA0YzllMTU0MjQxNjU3M2U4ZGY2ZTRlMzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFt ZXJDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9HU3RyZWFtZXJDb21tb24uY3BwCkBAIC0yNTksOCArMjU5LDcgQEAgYm9vbCBpbml0aWFs aXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpCiAgICAgc3RhdGljIHN0ZDo6 b25jZV9mbGFnIG9uY2VGbGFnOwogICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7CiAj aWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICAgICAgaWYgKHdlYmtpdEdzdENoZWNrVmVy c2lvbigxLCA2LCAxKSkKLSAgICAgICAgICAgIGdzdF9lbGVtZW50X3JlZ2lzdGVyKG51bGxwdHIs ICJ3ZWJraXRjbGVhcmtleSIsIEdTVF9SQU5LX1BSSU1BUlkgKyAxMDAsIFdFQktJVF9UWVBFX01F RElBX0NLX0RFQ1JZUFQpOworICAgICAgICBnc3RfZWxlbWVudF9yZWdpc3RlcihudWxscHRyLCAi d2Via2l0Y2xlYXJrZXkiLCBHU1RfUkFOS19QUklNQVJZICsgMTAwLCBXRUJLSVRfVFlQRV9NRURJ QV9DS19ERUNSWVBUKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkgJiYgR1NU X0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGY4ZjAwZjE2OGIwYWMzZDgwNzk0YmJiNWVlNWU4NzNi YzZmNGVhM2EuLjZiODQzNzE4MzNlODcwNzViYThlZjZjMDdhODU4ZTE1ZTc0NjBjZTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0yMzIx LDU5ICsyMzIxLDE0IEBAIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 Y3JlYXRlQXVkaW9TaW5rKCkKIAogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX2F1dG9B dWRpb1NpbmsuZ2V0KCksICJjaGlsZC1hZGRlZCIsIEdfQ0FMTEJBQ0soc2V0QXVkaW9TdHJlYW1Q cm9wZXJ0aWVzQ2FsbGJhY2spLCB0aGlzKTsKIAotICAgIEdzdEVsZW1lbnQqIGF1ZGlvU2lua0Jp bjsKLQotICAgIGlmICh3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgNCwgMikpIHsKLSNpZiBFTkFC TEUoV0VCX0FVRElPKQotICAgICAgICBhdWRpb1NpbmtCaW4gPSBnc3RfYmluX25ldygiYXVkaW8t c2luayIpOwotICAgICAgICBlbnN1cmVBdWRpb1NvdXJjZVByb3ZpZGVyKCk7Ci0gICAgICAgIG1f YXVkaW9Tb3VyY2VQcm92aWRlci0+Y29uZmlndXJlQXVkaW9CaW4oYXVkaW9TaW5rQmluLCBudWxs cHRyKTsKLSAgICAgICAgcmV0dXJuIGF1ZGlvU2lua0JpbjsKLSNlbHNlCi0gICAgICAgIHJldHVy biBtX2F1dG9BdWRpb1NpbmsuZ2V0KCk7Ci0jZW5kaWYKLSAgICB9Ci0KLSAgICAvLyBDb25zdHJ1 Y3QgYXVkaW8gc2luayBvbmx5IGlmIHBpdGNoIHByZXNlcnZpbmcgaXMgZW5hYmxlZC4KLSAgICAv LyBJZiBHU3RyZWFtZXIgMS40LjIgaXMgdXNlZCB0aGUgYXVkaW8tZmlsdGVyIHBsYXliaW4gcHJv cGVydHkgaXMgdXNlZCBpbnN0ZWFkLgotICAgIGlmIChtX3ByZXNlcnZlc1BpdGNoKSB7Ci0gICAg ICAgIEdzdEVsZW1lbnQqIHNjYWxlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJzY2FsZXRl bXBvIiwgbnVsbHB0cik7Ci0gICAgICAgIGlmICghc2NhbGUpIHsKLSAgICAgICAgICAgIEdTVF9X QVJOSU5HKCJGYWlsZWQgdG8gY3JlYXRlIHNjYWxldGVtcG8iKTsKLSAgICAgICAgICAgIHJldHVy biBtX2F1dG9BdWRpb1NpbmsuZ2V0KCk7Ci0gICAgICAgIH0KLQotICAgICAgICBhdWRpb1NpbmtC aW4gPSBnc3RfYmluX25ldygiYXVkaW8tc2luayIpOwotICAgICAgICBnc3RfYmluX2FkZChHU1Rf QklOKGF1ZGlvU2lua0JpbiksIHNjYWxlKTsKLSAgICAgICAgR1JlZlB0cjxHc3RQYWQ+IHBhZCA9 IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChzY2FsZSwgInNpbmsiKSk7Ci0g ICAgICAgIGdzdF9lbGVtZW50X2FkZF9wYWQoYXVkaW9TaW5rQmluLCBnc3RfZ2hvc3RfcGFkX25l dygic2luayIsIHBhZC5nZXQoKSkpOwotCiAjaWYgRU5BQkxFKFdFQl9BVURJTykKLSAgICAgICAg ZW5zdXJlQXVkaW9Tb3VyY2VQcm92aWRlcigpOwotICAgICAgICBtX2F1ZGlvU291cmNlUHJvdmlk ZXItPmNvbmZpZ3VyZUF1ZGlvQmluKGF1ZGlvU2lua0Jpbiwgc2NhbGUpOwotI2Vsc2UKLSAgICAg ICAgR3N0RWxlbWVudCogY29udmVydCA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgiYXVkaW9j b252ZXJ0IiwgbnVsbHB0cik7Ci0gICAgICAgIEdzdEVsZW1lbnQqIHJlc2FtcGxlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJhdWRpb3Jlc2FtcGxlIiwgbnVsbHB0cik7Ci0KLSAgICAgICAg Z3N0X2Jpbl9hZGRfbWFueShHU1RfQklOKGF1ZGlvU2lua0JpbiksIGNvbnZlcnQsIHJlc2FtcGxl LCBtX2F1dG9BdWRpb1NpbmsuZ2V0KCksIG51bGxwdHIpOwotCi0gICAgICAgIGlmICghZ3N0X2Vs ZW1lbnRfbGlua19tYW55KHNjYWxlLCBjb252ZXJ0LCByZXNhbXBsZSwgbV9hdXRvQXVkaW9TaW5r LmdldCgpLCBudWxscHRyKSkgewotICAgICAgICAgICAgR1NUX1dBUk5JTkcoIkZhaWxlZCB0byBs aW5rIGF1ZGlvIHNpbmsgZWxlbWVudHMiKTsKLSAgICAgICAgICAgIGdzdF9vYmplY3RfdW5yZWYo YXVkaW9TaW5rQmluKTsKLSAgICAgICAgICAgIHJldHVybiBtX2F1dG9BdWRpb1NpbmsuZ2V0KCk7 Ci0gICAgICAgIH0KLSNlbmRpZgotICAgICAgICByZXR1cm4gYXVkaW9TaW5rQmluOwotICAgIH0K LQotI2lmIEVOQUJMRShXRUJfQVVESU8pCi0gICAgYXVkaW9TaW5rQmluID0gZ3N0X2Jpbl9uZXco ImF1ZGlvLXNpbmsiKTsKKyAgICBHc3RFbGVtZW50KiBhdWRpb1NpbmtCaW4gPSBnc3RfYmluX25l dygiYXVkaW8tc2luayIpOwogICAgIGVuc3VyZUF1ZGlvU291cmNlUHJvdmlkZXIoKTsKICAgICBt X2F1ZGlvU291cmNlUHJvdmlkZXItPmNvbmZpZ3VyZUF1ZGlvQmluKGF1ZGlvU2lua0JpbiwgbnVs bHB0cik7CiAgICAgcmV0dXJuIGF1ZGlvU2lua0JpbjsKKyNlbHNlCisgICAgcmV0dXJuIG1fYXV0 b0F1ZGlvU2luay5nZXQoKTsKICNlbmRpZgotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAg IHJldHVybiBudWxscHRyOwogfQogCiBHc3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmF1ZGlvU2luaygpIGNvbnN0CkBAIC0yNDY2LDcgKzI0MjEsNyBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbihjb25zdCBnY2hhciogcGxh eWJpbk5hbWUsIGNvbgogICAgIEFTU0VSVChtX3RleHRBcHBTaW5rUGFkKTsKIAogICAgIEdSZWZQ dHI8R3N0Q2Fwcz4gdGV4dENhcHM7Ci0gICAgaWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigxLCAx MywgMCkpCisgICAgaWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigxLCAxNCwgMCkpCiAgICAgICAg IHRleHRDYXBzID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19lbXB0eV9zaW1wbGUoImFwcGxpY2F0 aW9uL3gtc3VidGl0bGUtdnR0IikpOwogICAgIGVsc2UKICAgICAgICAgdGV4dENhcHMgPSBhZG9w dEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgidGV4dC92dHQiKSk7CkBAIC0yNDgwLDEw ICsyNDM1LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBs YXlCaW4oY29uc3QgZ2NoYXIqIHBsYXliaW5OYW1lLCBjb24KIAogICAgIGNvbmZpZ3VyZVBsYXlT aW5rKCk7CiAKLSAgICAvLyBPbiAxLjQuMiBhbmQgbmV3ZXIgd2UgdXNlIHRoZSBhdWRpby1maWx0 ZXIgcHJvcGVydHkgaW5zdGVhZC4KLSAgICAvLyBTZWUgaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5v cmcvc2hvd19idWcuY2dpP2lkPTczNTc0OCBmb3IKLSAgICAvLyB0aGUgcmVhc29uIGZvciB1c2lu ZyA+PSAxLjQuMiBpbnN0ZWFkIG9mID49IDEuNC4wLgotICAgIGlmIChtX3ByZXNlcnZlc1BpdGNo ICYmIHdlYmtpdEdzdENoZWNrVmVyc2lvbigxLCA0LCAyKSkgeworICAgIGlmIChtX3ByZXNlcnZl c1BpdGNoKSB7CiAgICAgICAgIEdzdEVsZW1lbnQqIHNjYWxlID0gZ3N0X2VsZW1lbnRfZmFjdG9y eV9tYWtlKCJzY2FsZXRlbXBvIiwgbnVsbHB0cik7CiAKICAgICAgICAgaWYgKCFzY2FsZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcApp bmRleCBhZDYyMDBjNDU2MzVhYzIxOWNkYTc4NjFiNDM1YjRjNTdhNDQwMzE5Li5iZmE3MDAyOTk1 ODMxNjJlYjE3ZTcwMmY1YjBmMzk3YjQxZWNjOWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCkBAIC00MTksNyArNDE5LDcgQEAg Ym9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjplbnN1cmVHc3RHTENvbnRleHQo KQogICAgIGF1dG8mIHNoYXJlZERpc3BsYXkgPSBQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3Bs YXlGb3JDb21wb3NpdGluZygpOwogCiAgICAgLy8gVGhlIGZsb2F0aW5nIHJlZiByZW1vdmFsIHN1 cHBvcnQgd2FzIGFkZGVkIGluIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNn aT9pZD03NDMwNjIuCi0gICAgYm9vbCBzaG91bGRBZG9wdFJlZiA9IHdlYmtpdEdzdENoZWNrVmVy c2lvbigxLCAxMywgMSk7CisgICAgYm9vbCBzaG91bGRBZG9wdFJlZiA9IHdlYmtpdEdzdENoZWNr VmVyc2lvbigxLCAxNCwgMCk7CiAgICAgaWYgKCFtX2dsRGlzcGxheSkgewogI2lmIFBMQVRGT1JN KFgxMSkKICNpZiBVU0UoR0xYKQo=