58365 2004-07-26 02:08 0000 Update OpenAL library to current CVS (25/07/2004) 2004-08-17 13:04:13 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All All RESOLVED FIXED P2 normal --- 1 swanson@ukfsn.org wolf31o2@gentoo.org sound@gentoo.org swanson@ukfsn.org 2004-07-26 02:08:05 0000 The current OpenAL CVS contains an important doppler fix (i.e. it now works) and a new ALCubyte typedef that the current Freespace2 CVS (and possibly other programs) need. Reproducible: Always Steps to Reproduce: swanson@ukfsn.org 2004-07-26 02:11:01 0000 Created an attachment (id=36167) openal-20040725.ebuild Changed keywords (~x86) and update included ALSA capture patch version. swanson@ukfsn.org 2004-07-26 02:12:46 0000 Created an attachment (id=36168) openal-20040725-alsa_capture.diff Fix a minor hunk failure when applying previous patch to current OpenAL CVS. chriswhite@gentoo.org 2004-07-27 14:35:35 0000 wolf, since this is a cvs style ebuild, and you're the maintainer, I'm assigning this one to you. I just don't want to cause any issues with it. Thanks ahead of time! wolf31o2@gentoo.org 2004-07-27 15:02:53 0000 That's cool... I'll get this going. At some point, due to ut2004, I ended up becoming the maintainer for openal, just because most of the games that I add to portage use it. I'll get this going in the next few days. If you're really interested in getting it in sooner, just make a snapshot from the openal CVS and put that on the mirrors about 4-6 hours before adding the ebuild to portage. Also, make sure to only KEYWORD it for platforms you can test... ;] I can test amd64, x86, and sparc... got a ppc around? wolf31o2@gentoo.org 2004-08-17 13:04:13 0000 Added a newer snapshot to CVS... thanks for the bug report. 36167 2004-07-26 02:11 0000 openal-20040725.ebuild openal-20040725.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA0IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L21lZGlhLWxpYnMvb3BlbmFsL29wZW5hbC0yMDA0 MDMwMy5lYnVpbGQsdiAxLjEwIDIwMDQvMDcvMDcgMjA6NTI6NTcgbHYgRXhwICQKCmluaGVyaXQg ZXV0aWxzCgpJVVNFPSJhbHNhIGFydHMgZXNkIHNkbCBkZWJ1ZyBvZ2d2b3JiaXMgbXBlZyIKREVT Q1JJUFRJT049Ik9wZW5BTCwgdGhlIE9wZW4gQXVkaW8gTGlicmFyeSwgaXMgYW4gb3BlbiwgdmVu ZG9yLW5ldXRyYWwsIGNyb3NzLXBsYXRmb3JtIEFQSSBmb3IgaW50ZXJhY3RpdmUsIHByaW1hcmls eSBzcGF0aWFsaXplZCBhdWRpbyIKU1JDX1VSST0ibWlycm9yOi8vZ2VudG9vLyR7UH0udGFyLmJ6 MiIKSE9NRVBBR0U9Imh0dHA6Ly9vcGVuc291cmNlLmNyZWF0aXZlLmNvbS8iCgpMSUNFTlNFPSJH UEwtMiIKU0xPVD0iMCIKS0VZV09SRFM9In54ODYgfnNwYXJjIH5wcGMgYW1kNjQiCgpERVBFTkQ9 Ing4Nj8gKCBkZXYtbGFuZy9uYXNtICkKCWFsc2E/ICggPj1tZWRpYS1saWJzL2Fsc2EtbGliLTEu MC4yICkKCWFydHM/ICgga2RlLWJhc2UvYXJ0cyApCgllc2Q/ICggbWVkaWEtc291bmQvZXNvdW5k ICkKCXNkbD8gKCBtZWRpYS1saWJzL2xpYnNkbCApCglvZ2d2b3JiaXM/ICggbWVkaWEtbGlicy9s aWJ2b3JiaXMgKQoJbXBlZz8gKCBtZWRpYS1saWJzL3NtcGVnICkiCgpzcmNfY29tcGlsZSgpIHsK CWxvY2FsIG15Y29uZgoKCXVzZSBlc2QgJiYgbXljb25mPSIke215Y29uZn0gLS1lbmFibGUtZXNk IgoJdXNlIHNkbCAmJiBteWNvbmY9IiR7bXljb25mfSAtLWVuYWJsZS1zZGwiCgl1c2UgYWxzYSAm JiBteWNvbmY9IiR7bXljb25mfSAtLWVuYWJsZS1hbHNhIgoJdXNlIGFydHMgJiYgbXljb25mPSIk e215Y29uZn0gLS1lbmFibGUtYXJ0cyIKCXVzZSBtcGVnICYmIG15Y29uZj0iJHtteWNvbmZ9IC0t ZW5hYmxlLXNtcGVnIgoJdXNlIG9nZ3ZvcmJpcyAmJiBteWNvbmY9IiR7bXljb25mfSAtLWVuYWJs ZS12b3JiaXMiCgl1c2UgZGVidWcgJiYgbXljb25mPSIke215Y29uZn0gLS1lbmFibGUtZGVidWct bWF4aW11cyIKCgljZCAke1N9L2xpbnV4Cgl1c2UgYWxzYSAmJiBlcGF0Y2ggJHtGSUxFU0RJUn0v b3BlbmFsLTIwMDQwNzI1LWFsc2FfY2FwdHVyZS5kaWZmCglXQU5UX0FVVE9DT05GPTIuNSAuL2F1 dG9nZW4uc2ggfHwgZGllCgkuL2NvbmZpZ3VyZSAgLS1wcmVmaXg9L3VzciAke215Y29uZn0gLS1l bmFibGUtcGFyYW5vaWQtbG9ja3MgXAoJCS0tZW5hYmxlLWNhcHR1cmUgLS1lbmFibGUtb3B0aW1p emUgfHwgZGllCgllbWFrZSBhbGwgfHwgZGllCn0KCnNyY19pbnN0YWxsKCkgewoJY2QgJHtTfS9s aW51eAoKCW1ha2UgaW5zdGFsbCBERVNURElSPSR7RH0vdXNyL3x8IGRpZQoKCWRvZG9jIENSRURJ VFMgQ2hhbmdlTG9nIElOU1RBTEwgTk9URVMgUExBVEZPUk0gVE9ETwoJZG9kb2MgJHtGSUxFU0RJ Un0vb3BlbmFscmMKCW1ha2VpbmZvIGRvYy9vcGVuYWwudGV4aQoJZG9pbmZvIGRvYy9vcGVuYWwu aW5mbwoKCWNkICR7U30KCWRvZG9jIENIQU5HRVMgQ09QWUlORyBDUkVESVRTCglkb2h0bWwgZG9j cy8qLmh0bWwKfQoKcGtnX3Bvc3RpbnN0KCkgewoJZWluZm8gIlRoZXJlIGlzIGEgc2FtcGxlIG9w ZW5hbHJjIGZpbGUgaW4gL3Vzci9zaGFyZS9kb2MvJHtQfSB3aGljaCBzZXRzIHVwIgoJZWluZm8g IjQgc3BlYWtlciBzdXJyb3VuZCBzb3VuZCB3aXRoIEFMU0EuICBTaW1wbHkgY29weSBpdCB0byB5 b3VyIH4vLm9wZW5hbHJjIgoJZWluZm8gInRvIHVzZSBpdC4iCn0K 36168 2004-07-26 02:12 0000 openal-20040725-alsa_capture.diff openal-20040725-alsa_capture.diff text/plain LS0tIGxpbnV4L3NyYy9hbF9leHQuYwkyMDA0LTA3LTIwIDExOjU5OjAwLjAwMDAwMDAwMCArMDEw MAorKysgbGludXgvc3JjL2FsX2V4dC5jCTIwMDQtMDctMjUgMTM6NDQ6NDEuMDAwMDAwMDAwICsw MTAwCkBAIC05OTMsNSArOTkzLDkgQEAKIAkJcmV0dXJuIEFMQ19UUlVFOwogCX0KIAorCWlmKHVz dHJjbXAoIkFMQ19DQVBUVVJFX1NBTVBMRVMiLCBlbmFtZSkgPT0gMCkgeworCQlyZXR1cm4gMHgz MTI7CisJfQorCiAJcmV0dXJuIDA7CiB9Ci0tLSBsaW51eC9zcmMvYWxfbWFpbi5jCTIwMDQtMDct MjAgMTE6NTg6NTguMDAwMDAwMDAwICswMTAwCisrKyBsaW51eC9zcmMvYWxfbWFpbi5jCTIwMDQt MDctMjUgMTM6NDQ6NDEuMDAwMDAwMDAwICswMTAwCkBAIC0xMzcsNiArMTM3LDcgQEAKIAogI2lm ZGVmIENBUFRVUkVfU1VQUE9SVAogCV9hbFJlZ2lzdGVyRXh0ZW5zaW9uR3JvdXAoIChjb25zdCBB THVieXRlKikgIkFMX0VYVF9jYXB0dXJlIiApOworCV9hbFJlZ2lzdGVyRXh0ZW5zaW9uR3JvdXAo IChjb25zdCBBTHVieXRlKikgIkFMQ19FWFRfY2FwdHVyZSIgKTsKICNlbmRpZiAvKiBDQVBUVVJF X1NVUFBPUlQgKi8KIAogI2VuZGlmIC8qIEJVSUxUSU5fRVhUX0xPS0kgKi8KLS0tIGxpbnV4L3Ny Yy9hbGMvYWxjX2NvbnRleHQuYwkyMDA0LTA3LTIwIDExOjU4OjU4LjAwMDAwMDAwMCArMDEwMAor KysgbGludXgvc3JjL2FsYy9hbGNfY29udGV4dC5jCTIwMDQtMDctMjUgMTM6NDc6MTguMDAwMDAw MDAwICswMTAwCkBAIC0xNTI2LDYgKzE1MjYsOCBAQAogCXJldHVybiBkZXZpY2VIYW5kbGUtPmNj OwogfQogCitBTGludCBfX2FsY0dldEF2YWlsYWJsZVNhbXBsZXMoQUx2b2lkKTsKKwogdm9pZCBh bGNHZXRJbnRlZ2VydiggQUxDZGV2aWNlICpkZXZpY2VIYW5kbGUsIEFMQ2VudW0gIHRva2VuLAog CQkgICAgIEFMQ3NpemVpICBzaXplICwgQUxDaW50ICpkZXN0ICkKIHsKQEAgLTE1NDcsNiArMTU0 OSw5IEBACiAJCSAgICAgdGltZS4KIAkJICAgICBDaGVjayBzaXplCiAJCSAgICovCisJCWNhc2Ug MHgzMTI6ICAvKkFMQ19DQVBUVVJFX1NBTVBMRVM6Ki8KKyAgICAgICAgICAqZGVzdCA9IF9fYWxj R2V0QXZhaWxhYmxlU2FtcGxlcygpOworICAgICAgICAgIGJyZWFrOwogCQljYXNlIEFMQ19NQUpP Ul9WRVJTSU9OOgogCQkgICpkZXN0ID0gMTsKIAkJICBicmVhazsKLS0tIGxpbnV4L3NyYy9leHRl bnNpb25zL2FsX2V4dF9jYXB0dXJlLmMJMjAwNC0wNy0yMCAxMTo1OTowMC4wMDAwMDAwMDAgKzAx MDAKKysrIGxpbnV4L3NyYy9leHRlbnNpb25zL2FsX2V4dF9jYXB0dXJlLmMJMjAwNC0wNy0yNSAx Mzo0NDo0MS4wMDAwMDAwMDAgKzAxMDAKQEAgLTQ1LDYgKzQ1LDExIEBACiAJQUxfRVhUX1BBSVIo YWxDYXB0dXJlU3RvcF9FWFQpLAogCUFMX0VYVF9QQUlSKGFsQ2FwdHVyZUdldERhdGFfRVhUKSwK IAlBTF9FWFRfUEFJUihhbENhcHR1cmVEZXN0cm95X0VYVCksCisJQUxfRVhUX1BBSVIoYWxjQ2Fw dHVyZU9wZW5EZXZpY2UpLAorCUFMX0VYVF9QQUlSKGFsY0NhcHR1cmVDbG9zZURldmljZSksCisJ QUxfRVhUX1BBSVIoYWxjQ2FwdHVyZVN0YXJ0KSwKKwlBTF9FWFRfUEFJUihhbGNDYXB0dXJlU3Rv cCksCisJQUxfRVhUX1BBSVIoYWxjQ2FwdHVyZVNhbXBsZXMpLAogCXsgTlVMTCwgTlVMTCB9CiB9 OwogCkBAIC03Miw4ICs3Nyw4IEBACiAJcmV0dXJuOwogfQogCi1BTGJvb2xlYW4gYWxDYXB0dXJl SW5pdF9FWFQoIFVOVVNFRChBTGVudW0gZm9ybWF0KSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgVU5VU0VEKEFMdWludCByYXRlKSwKK0FMYm9vbGVhbiBhbENhcHR1cmVJbml0X0VYVCgg QUxlbnVtIGZvcm1hdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQUx1aW50IHJhdGUs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVOVVNFRChBTHNpemVpIGJ1ZmZlclNpemUp ICkKIHsKIAlBTHVpbnQgY2lkOwpAQCAtODksOSArOTQsMjYgQEAKIAkJY2FwdHVyZV9kZXZpY2Ug PSBjYy0+cmVhZF9kZXZpY2U7CiAJCWlmICggY2FwdHVyZV9kZXZpY2UgPT0gTlVMTCApIHsKIAkJ CWNoYXIgc3BlY1sxMDI0XTsKLQkJCWNoYXIgKmZtdD0iJyggKGRpcmVjdGlvbiBcInJlYWRcIikg KHNhbXBsaW5nLXJhdGUgJWQpKSI7CisJCQlpbnQgc3BlYWtlcnM7CisJCQljaGFyICpmbXQ9Iico IChkaXJlY3Rpb24gXCJyZWFkXCIpIChzYW1wbGluZy1yYXRlICVkKSAoc3BlYWtlci1udW0gJWQp ICkiOwogCi0JCQlzcHJpbnRmKHNwZWMsIGZtdCwgcmF0ZSk7CisJCQlzd2l0Y2ggKGZvcm1hdCkg eworCQkJCWNhc2UgQUxfRk9STUFUX01PTk84OgorCQkJCWNhc2UgQUxfRk9STUFUX01PTk8xNjoK KwkJCQlkZWZhdWx0OgorCQkJCQlzcGVha2VycyA9IDE7CisJCQkJCWJyZWFrOworCQkJCWNhc2Ug QUxfRk9STUFUX1NURVJFTzg6CisJCQkJY2FzZSBBTF9GT1JNQVRfU1RFUkVPMTY6CisJCQkJCXNw ZWFrZXJzID0gMjsKKwkJCQkJYnJlYWs7CisJCQkJY2FzZSBBTF9GT1JNQVRfUVVBRDhfTE9LSToK KwkJCQljYXNlIEFMX0ZPUk1BVF9RVUFEMTZfTE9LSToKKwkJCQkJc3BlYWtlcnMgPSA0OworCQkJ CQlicmVhazsKKwkJCX0KKworCQkJc3ByaW50ZihzcGVjLCBmbXQsIHJhdGUsIHNwZWFrZXJzKTsK IAkJCWNhcHR1cmVfZGV2aWNlID0gYWxjT3BlbkRldmljZSgoQUx1Ynl0ZSAqKXNwZWMpOwogCQkJ aWYgKCBjYXB0dXJlX2RldmljZSApIHsKIAkJCQlfYWxjU2V0Q29udGV4dChOVUxMLCBjaWQsIGNh cHR1cmVfZGV2aWNlKTsKQEAgLTE3MSwxNCArMTkzLDE2IEBACiAJCSAgICAgICAgICAgICAgICAg ICAgICAgZm9ybWF0LCBkZXYtPmZvcm1hdCwgc2FtcGxlcyk7CiAJCXNpemUgKj0gKF9hbF9mb3Jt YXRiaXRzKGRldi0+Zm9ybWF0KSAvIDgpOwogCi0gICAgICAgIAlpZiAoIG4gPiAoQUxzaXplaSlz aXplICkKKyAgICAgICAJaWYgKCBuID4gKEFMc2l6ZWkpc2l6ZSApCiAJCQl0ZW1wID0gbWFsbG9j KCBuICk7CiAJCWVsc2UKIAkJCXRlbXAgPSBtYWxsb2MoIHNpemUgKTsKIAogCQlpZiAoIHNpemUg PiAwICkgewogCQkJc2l6ZSA9IF9hbGNEZXZpY2VSZWFkKGNpZCwgdGVtcCwgc2l6ZSk7CisJCX0K IAorCQlpZiAoIHNpemUgPiAwICkgewogCQkJdGVtcCA9IF9hbEJ1ZmZlckNhbm9uaXplRGF0YShk ZXYtPmZvcm1hdCwKIAkJCQkJCSAgICAgdGVtcCwKIAkJCQkJCSAgICAgc2l6ZSwKQEAgLTE4OSw4 ICsyMTMsOCBAQAogCQkJCQkJICAgICBBTF9UUlVFKTsKIAkJfSBlbHNlIHsKIAkJCS8qIEhtbSwg emVybyBzaXplIGluIHJlY29yZC4uICovCi0JCQltZW1zZXQodGVtcCwgMCwgbik7Ci0JCQlzaXpl ID0gbjsKKwkJCS8qbWVtc2V0KHRlbXAsIDAsIG4pOyovCisJCQlzaXplID0gMDsKIAkJfQogCQlp Zih0ZW1wID09IE5VTEwpIHsKIAkJCWZwcmludGYoc3RkZXJyLCAiY291bGQgbm90IGNhbm9uaXpl IGRhdGFcbiIpOwpAQCAtMjAzLDMgKzIyNywyMjggQEAKIAl9CiAJcmV0dXJuIHNpemU7CiB9CisK KworLyogSGFja2VkIGluIEFMQ19FWFRfY2FwdHVyZSBzdXBwb3J0LiAgLS1yeWFuLiAqLworLyog VGhpcyBkb2Vzbid0IHN1cHBvcnQgbXVsdGlwbGUgZGV2aWNlcywgZGV2aWNlIGVudW1lcmF0aW9u LCBvciBjYXB0dXJlICovCisvKiAgZGV2aWNlcyBzZXBlcmF0ZSBmcm9tIGFuIGV4aXN0aW5nIGNv bnRleHQuIEhvdyBwYWluZnVsLiAqLworCisvKiByaW5nIGJ1ZmZlciBmdW5jdGlvbmFsaXR5Li4u ICovCisKK3R5cGVkZWYgc3RydWN0Cit7CisgICAgQUx1Ynl0ZSAqYnVmZmVyOworICAgIEFMc2l6 ZWkgc2l6ZTsKKyAgICBBTHNpemVpIHdyaXRlOworICAgIEFMc2l6ZWkgcmVhZDsKKyAgICBBTHNp emVpIHVzZWQ7Cit9IF9fQUxSaW5nQnVmZmVyOworCitzdGF0aWMgQUxib29sZWFuIF9fYWxSaW5n QnVmZmVySW5pdChfX0FMUmluZ0J1ZmZlciAqcmluZywgQUxzaXplaSBzaXplKTsKK3N0YXRpYyBB THZvaWQgX19hbFJpbmdCdWZmZXJTaHV0ZG93bihfX0FMUmluZ0J1ZmZlciAqcmluZyk7CitzdGF0 aWMgQUxzaXplaSBfX2FsUmluZ0J1ZmZlclNpemUoX19BTFJpbmdCdWZmZXIgKnJpbmcpOworc3Rh dGljIEFMdm9pZCBfX2FsUmluZ0J1ZmZlclB1dChfX0FMUmluZ0J1ZmZlciAqcmluZywgQUx1Ynl0 ZSAqZGF0YSwgQUxzaXplaSBzaXplKTsKK3N0YXRpYyBBTHNpemVpIF9fYWxSaW5nQnVmZmVyR2V0 KF9fQUxSaW5nQnVmZmVyICpyaW5nLCBBTHVieXRlICpkYXRhLCBBTHNpemVpIHNpemUpOworCitz dGF0aWMgX19BTFJpbmdCdWZmZXIgY2FwdHVyZVJpbmc7CisKK3N0YXRpYyBBTGJvb2xlYW4gX19h bFJpbmdCdWZmZXJJbml0KF9fQUxSaW5nQnVmZmVyICpyaW5nLCBBTHNpemVpIHNpemUpCit7Cisg ICAgQUx1Ynl0ZSAqcHRyID0gKEFMdWJ5dGUgKikgcmVhbGxvYyhyaW5nLT5idWZmZXIsIHNpemUp OworICAgIGlmIChwdHIgPT0gTlVMTCkKKyAgICAgICAgcmV0dXJuKEFMX0ZBTFNFKTsKKworICAg IHJpbmctPmJ1ZmZlciA9IHB0cjsKKyAgICByaW5nLT5zaXplID0gc2l6ZTsKKyAgICByaW5nLT53 cml0ZSA9IDA7CisgICAgcmluZy0+cmVhZCA9IDA7CisgICAgcmluZy0+dXNlZCA9IDA7CisgICAg cmV0dXJuKEFMX1RSVUUpOworfSAvKiBfX2FsUmluZ0J1ZmZlckluaXQgKi8KKworc3RhdGljIEFM dm9pZCBfX2FsUmluZ0J1ZmZlclNodXRkb3duKF9fQUxSaW5nQnVmZmVyICpyaW5nKQoreworICAg IGZyZWUocmluZy0+YnVmZmVyKTsKKyAgICByaW5nLT5idWZmZXIgPSBOVUxMOworfSAvKiBfX2Fs UmluZ0J1ZmZlclNodXRkb3duICovCisKK3N0YXRpYyBBTHNpemVpIF9fYWxSaW5nQnVmZmVyU2l6 ZShfX0FMUmluZ0J1ZmZlciAqcmluZykKK3sKKyAgICByZXR1cm4ocmluZy0+dXNlZCk7Cit9IC8q IF9fYWxSaW5nQnVmZmVyU2l6ZSAqLworCitzdGF0aWMgQUx2b2lkIF9fYWxSaW5nQnVmZmVyUHV0 KF9fQUxSaW5nQnVmZmVyICpyaW5nLCBBTHVieXRlICpkYXRhLCBBTHNpemVpIF9zaXplKQorewor ICAgIHJlZ2lzdGVyIEFMc2l6ZWkgc2l6ZSA9IF9zaXplOworICAgIHJlZ2lzdGVyIEFMc2l6ZWkg Y3B5OworICAgIHJlZ2lzdGVyIEFMc2l6ZWkgYXZhaWw7CisKKyAgICBpZiAoIXNpemUpICAgLyog anVzdCBpbiBjYXNlLi4uICovCisgICAgICAgIHJldHVybjsKKworICAgIC8qIFB1dHRpbmcgbW9y ZSBkYXRhIHRoYW4gcmluZyBidWZmZXIgaG9sZHMgaW4gdG90YWw/IFJlcGxhY2UgaXQgYWxsLiAq LworICAgIGlmIChzaXplID4gcmluZy0+c2l6ZSkKKyAgICB7CisgICAgICAgIHJpbmctPndyaXRl ID0gMDsKKyAgICAgICAgcmluZy0+cmVhZCA9IDA7CisgICAgICAgIHJpbmctPnVzZWQgPSByaW5n LT5zaXplOworICAgICAgICBtZW1jcHkocmluZy0+YnVmZmVyLCBkYXRhICsgKHNpemUgLSByaW5n LT5zaXplKSwgcmluZy0+c2l6ZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9IC8qIGlmICovCisK KyAgICAvKiBCdWZmZXIgb3ZlcmZsb3c/IFB1c2ggcmVhZCBwb2ludGVyIHRvIG9sZGVzdCBzYW1w bGUgbm90IG92ZXJ3cml0dGVuLiAqLworICAgIGF2YWlsID0gcmluZy0+c2l6ZSAtIHJpbmctPnVz ZWQ7CisgICAgaWYgKHNpemUgPiBhdmFpbCkKKyAgICB7CisgICAgICAgIHJpbmctPnJlYWQgKz0g c2l6ZSAtIGF2YWlsOworICAgICAgICBpZiAocmluZy0+cmVhZCA+IHJpbmctPnNpemUpCisgICAg ICAgICAgICByaW5nLT5yZWFkIC09IHJpbmctPnNpemU7CisgICAgfSAvKiBpZiAqLworCisgICAg LyogQ2xpcCB0byBlbmQgb2YgYnVmZmVyIGFuZCBjb3B5IGZpcnN0IGJsb2NrLi4uICovCisgICAg Y3B5ID0gcmluZy0+c2l6ZSAtIHJpbmctPndyaXRlOworICAgIGlmIChzaXplIDwgY3B5KQorICAg ICAgICBjcHkgPSBzaXplOworICAgIGlmIChjcHkpIG1lbWNweShyaW5nLT5idWZmZXIgKyByaW5n LT53cml0ZSwgZGF0YSwgY3B5KTsKKworICAgIC8qIFdyYXAgYXJvdW5kIHRvIGZyb250IG9mIHJp bmcgYnVmZmVyIGFuZCBjb3B5IHJlbWFpbmluZyBkYXRhLi4uICovCisgICAgYXZhaWwgPSBzaXpl IC0gY3B5OworICAgIGlmIChhdmFpbCkgbWVtY3B5KHJpbmctPmJ1ZmZlciwgZGF0YSArIGNweSwg YXZhaWwpOworCisgICAgLyogVXBkYXRlIHdyaXRlIHBvaW50ZXIuLi4gKi8KKyAgICByaW5nLT53 cml0ZSArPSBzaXplOworICAgIGlmIChyaW5nLT53cml0ZSA+IHJpbmctPnNpemUpCisgICAgICAg IHJpbmctPndyaXRlIC09IHJpbmctPnNpemU7CisKKyAgICByaW5nLT51c2VkICs9IHNpemU7Cisg ICAgaWYgKHJpbmctPnVzZWQgPiByaW5nLT5zaXplKQorICAgICAgICByaW5nLT51c2VkID0gcmlu Zy0+c2l6ZTsKK30gLyogX19hbFJpbmdCdWZmZXJQdXQgKi8KKworc3RhdGljIEFMc2l6ZWkgX19h bFJpbmdCdWZmZXJHZXQoX19BTFJpbmdCdWZmZXIgKnJpbmcsIEFMdWJ5dGUgKmRhdGEsIEFMc2l6 ZWkgX3NpemUpCit7CisgICAgcmVnaXN0ZXIgQUxzaXplaSBjcHk7CisgICAgcmVnaXN0ZXIgQUxz aXplaSBzaXplID0gX3NpemU7CisgICAgcmVnaXN0ZXIgQUxzaXplaSBhdmFpbCA9IHJpbmctPnVz ZWQ7CisKKyAgICAvKiBDbGFtcCBhbW91bnQgdG8gcmVhZCB0byBhdmFpbGFibGUgZGF0YS4uLiAq LworICAgIGlmIChzaXplID4gYXZhaWwpCisgICAgICAgIHNpemUgPSBhdmFpbDsKKyAgICAKKyAg ICAvKiBDbGlwIHRvIGVuZCBvZiBidWZmZXIgYW5kIGNvcHkgZmlyc3QgYmxvY2suLi4gKi8KKyAg ICBjcHkgPSByaW5nLT5zaXplIC0gcmluZy0+cmVhZDsKKyAgICBpZiAoY3B5ID4gc2l6ZSkgY3B5 ID0gc2l6ZTsKKyAgICBpZiAoY3B5KSBtZW1jcHkoZGF0YSwgcmluZy0+YnVmZmVyICsgcmluZy0+ cmVhZCwgY3B5KTsKKyAgICAKKyAgICAvKiBXcmFwIGFyb3VuZCB0byBmcm9udCBvZiByaW5nIGJ1 ZmZlciBhbmQgY29weSByZW1haW5pbmcgZGF0YS4uLiAqLworICAgIGF2YWlsID0gc2l6ZSAtIGNw eTsKKyAgICBpZiAoYXZhaWwpIG1lbWNweShkYXRhICsgY3B5LCByaW5nLT5idWZmZXIsIGF2YWls KTsKKworICAgIC8qIFVwZGF0ZSByZWFkIHBvaW50ZXIuLi4gKi8KKyAgICByaW5nLT5yZWFkICs9 IHNpemU7CisgICAgaWYgKHJpbmctPnJlYWQgPiByaW5nLT5zaXplKQorICAgICAgICByaW5nLT5y ZWFkIC09IHJpbmctPnNpemU7CisKKyAgICByaW5nLT51c2VkIC09IHNpemU7CisKKyAgICByZXR1 cm4oc2l6ZSk7ICAvKiBtYXkgaGF2ZSBiZWVuIGNsYW1wZWQgaWYgdGhlcmUgd2Fzbid0IGVub3Vn aCBkYXRhLi4uICovCit9IC8qIF9fYWxSaW5nQnVmZmVyR2V0ICovCisKKworc3RhdGljIEFMZW51 bSBjYXB0dXJlRm10ID0gQUxfTk9ORTsKK3N0YXRpYyBBTHVpbnQgY2FwdHVyZUZyZXEgPSAwOwor c3RhdGljIEFMaW50IGNhcHR1cmVGbXRTaXplID0gMDsKKworQUxDZGV2aWNlICphbGNDYXB0dXJl T3BlbkRldmljZShjb25zdCBBTHVieXRlICpkZXZpY2VOYW1lLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBBTHVpbnQgZnJlcSwgQUxlbnVtIGZtdCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQUxzaXplaSBidWZzaXplKQoreworICAgIEFMQ2RldmljZSAqcmV0dmFs OworCUFMX2NvbnRleHQgKmNjOworCUFMdWludCBjaWQ7CisKKyAgICBpZiAoZGV2aWNlTmFtZSAh PSBOVUxMKSAgLyogISEhIEZJWE1FICovCisgICAgICAgIHJldHVybiBOVUxMOworCisgICAgc3dp dGNoIChmbXQpICAvKiB0cnkgdG8ga2VlcCB0aGlzIHNhbmUgZm9yIG5vdy4uLiAqLworICAgIHsK KyAgICAgICAgY2FzZSBBTF9GT1JNQVRfTU9OTzg6CisgICAgICAgIGNhc2UgQUxfRk9STUFUX01P Tk8xNjoKKyAgICAgICAgY2FzZSBBTF9GT1JNQVRfU1RFUkVPODoKKyAgICAgICAgY2FzZSBBTF9G T1JNQVRfU1RFUkVPMTY6CisgICAgICAgICAgICBicmVhazsgIC8qIG9rYXkgZm9ybWF0LiAqLwor CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4oTlVMTCk7CisgICAgfQorCisg ICAgY2FwdHVyZUZtdCA9IGZtdDsKKyAgICBjYXB0dXJlRnJlcSA9IGZyZXE7CisgICAgY2FwdHVy ZUZtdFNpemUgPSAoX2FsX2Zvcm1hdGJpdHMoZm10KSAvIDgpOworICAgIGlmICgoZm10ID09IEFM X0ZPUk1BVF9TVEVSRU84KSB8fCAoZm10ID09IEFMX0ZPUk1BVF9TVEVSRU8xNikpCisgICAgICAg IGNhcHR1cmVGbXRTaXplICo9IDI7CisKKyAgICBidWZzaXplICo9IGNhcHR1cmVGbXRTaXplOwor CisgICAgaWYgKCFfX2FsUmluZ0J1ZmZlckluaXQoJmNhcHR1cmVSaW5nLCBidWZzaXplKSkKKyAg ICAgICAgcmV0dXJuIE5VTEw7CisKKyAgICBpZiAoIWFsQ2FwdHVyZUluaXRfRVhUKGZtdCwgZnJl cSwgYnVmc2l6ZSkpCisgICAgICAgIHJldHVybiBOVUxMOworCisJY2lkID0gX2FsY0NDSWQ7CisJ X2FsY0xvY2tDb250ZXh0KCBjaWQgKTsKKwljYyA9IF9hbGNHZXRDb250ZXh0KGNpZCk7CisgICAg cmV0dmFsID0gY2MtPnJlYWRfZGV2aWNlOworCXJldHZhbC0+Y2MgPSBjYzsKKyAgICBfYWxjVW5s b2NrQ29udGV4dCggY2lkICk7CisKKyAgICBmcHJpbnRmKHN0ZGVyciwgIldBUk5JTkc6IEFMQ19F WFRfY2FwdHVyZSBpcyBzdWJqZWN0IHRvIGNoYW5nZSFcbiIpOworCisgICAgcmV0dXJuKHJldHZh bCk7Cit9CisKK0FMdm9pZCBhbGNDYXB0dXJlQ2xvc2VEZXZpY2UoQUxDZGV2aWNlICpkZXYpCit7 CisgICAgaWYgKGRldiA9PSBOVUxMKQorICAgICAgICByZXR1cm47CisKKyAgICBhbENhcHR1cmVE ZXN0cm95X0VYVCgpOworICAgIF9fYWxSaW5nQnVmZmVyU2h1dGRvd24oJmNhcHR1cmVSaW5nKTsK K30KKworQUx2b2lkIGFsY0NhcHR1cmVTdGFydCh2b2lkKQoreworICAgIGFsQ2FwdHVyZVN0YXJ0 X0VYVCgpOworfQorCitBTHZvaWQgYWxjQ2FwdHVyZVN0b3Aodm9pZCkKK3sKKyAgICBhbENhcHR1 cmVTdG9wX0VYVCgpOworfQorCisvKiAhISEgRklYTUU6IE5vdCBpZGVhbDsgcmVhZHMgc2FtcGxl cyBpbiBBTENfQ0FQVFVSRV9TQU1QTEVTIHF1ZXJ5ICovCisvKiAhISEgRklYTUU6IHNob3VsZCBx dWVyeSBoYXJkd2FyZSBoZXJlIGFuZCBkbyByZWFkIGluIGFsY0NhcHR1cmVTYW1wbGVzKCkgKi8K K0FMaW50IF9fYWxjR2V0QXZhaWxhYmxlU2FtcGxlcyhBTHZvaWQpCit7CisgICAgc3RhdGljIEFM dWJ5dGUgYnVmWzIwNDhdOworICAgIEFMc2l6ZWkgZ290OworICAgIAorICAgIHdoaWxlICgoZ290 ID0gYWxDYXB0dXJlR2V0RGF0YV9FWFQoYnVmLCBzaXplb2YgKGJ1ZiksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjYXB0dXJlRm10LCBjYXB0dXJlRnJlcSkpID4gMCkK KyAgICAgICAgX19hbFJpbmdCdWZmZXJQdXQoJmNhcHR1cmVSaW5nLCBidWYsIGdvdCk7CisKKyAg ICAvKnByaW50ZigiZ290ICVkIGhhdmUgJWRcbiIsIChpbnQpIGdvdCwgKGludCkgKF9fYWxSaW5n QnVmZmVyU2l6ZSgmY2FwdHVyZVJpbmcpIC8gY2FwdHVyZUZtdFNpemUpKTsqLworCisgICAgcmV0 dXJuKF9fYWxSaW5nQnVmZmVyU2l6ZSgmY2FwdHVyZVJpbmcpIC8gY2FwdHVyZUZtdFNpemUpOwor fQorCisKK0FMdm9pZCBhbGNDYXB0dXJlU2FtcGxlcyhVTlVTRUQoQUxDZGV2aWNlICpkZXZpY2Up LCBBTHZvaWQgKmJ1ZiwgQUxzaXplaSBzYW1wcykKK3sKKyAgICBpZiAoKF9fYWxSaW5nQnVmZmVy U2l6ZSgmY2FwdHVyZVJpbmcpIC8gY2FwdHVyZUZtdFNpemUpIDwgc2FtcHMpCisgICAgICAgIHJl dHVybjsgIC8qICEhISBGSVhNRTogVGhpcyBpcyBhbiBlcnJvciBjb25kaXRpb24hICovCisKKyAg ICBfX2FsUmluZ0J1ZmZlckdldCgmY2FwdHVyZVJpbmcsIGJ1Ziwgc2FtcHMgKiBjYXB0dXJlRm10 U2l6ZSk7Cit9CisKLS0tIGxpbnV4L3NyYy9leHRlbnNpb25zL2FsX2V4dF9jYXB0dXJlLmgJMjAw NC0wNy0yMCAxMTo1OTowMC4wMDAwMDAwMDAgKzAxMDAKKysrIGxpbnV4L3NyYy9leHRlbnNpb25z L2FsX2V4dF9jYXB0dXJlLmgJMjAwNC0wNy0yNSAxMzo0NDo0MS4wMDAwMDAwMDAgKzAxMDAKQEAg LTEzLDYgKzEzLDE2IEBACiAKICNpbmNsdWRlIDxBTC9hbGV4dC5oPgogCitBTENkZXZpY2UgKmFs Y0NhcHR1cmVPcGVuRGV2aWNlKGNvbnN0IEFMdWJ5dGUgKmRldmljZU5hbWUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEFMdWludCBmcmVxLCBBTGVudW0gZm10LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBBTHNpemVpIGJ1ZnNpemUpOworQUx2b2lkIGFsY0NhcHR1 cmVDbG9zZURldmljZShBTENkZXZpY2UgKmRldik7CitBTHZvaWQgYWxjQ2FwdHVyZVN0YXJ0KHZv aWQpOworQUx2b2lkIGFsY0NhcHR1cmVTdG9wKHZvaWQpOworQUxpbnQgX19hbGNHZXRBdmFpbGFi bGVTYW1wbGVzKEFMdm9pZCk7CitBTHZvaWQgYWxjQ2FwdHVyZVNhbXBsZXMoQUxDZGV2aWNlICpk ZXZpY2UsIEFMdm9pZCAqYnVmLCBBTHNpemVpIHNhbXBzKTsKKworCiAvKgogICogYWxJbml0Q2Fw dHVyZSggdm9pZCApCiAgKgpAQCAtMzgsNyArNDgsMTIgQEAKIAlBTF9FWFRfUEFJUihhbENhcHR1 cmVTdGFydF9FWFQpLCAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKIAlBTF9FWFRfUEFJUihh bENhcHR1cmVTdG9wX0VYVCksICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKIAlBTF9FWFRf UEFJUihhbENhcHR1cmVHZXREYXRhX0VYVCksICAgICAgICAgICAgICAgICAgICAgICAgIFwKLQlB TF9FWFRfUEFJUihhbENhcHR1cmVEZXN0cm95X0VYVCkgICAgICAgICAgICAgICAgICAgICAgICAg XAorCUFMX0VYVF9QQUlSKGFsQ2FwdHVyZURlc3Ryb3lfRVhUKSwgICAgICAgICAgICAgICAgICAg ICAgICAgXAorCUFMX0VYVF9QQUlSKGFsY0NhcHR1cmVPcGVuRGV2aWNlKSwgICAgICAgICAgICAg ICAgICAgICAgICAgXAorCUFMX0VYVF9QQUlSKGFsY0NhcHR1cmVDbG9zZURldmljZSksICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKwlBTF9FWFRfUEFJUihhbGNDYXB0dXJlU3RhcnQpLCAgICAg ICAgICAgICAgICAgICAgICAgICBcCisJQUxfRVhUX1BBSVIoYWxjQ2FwdHVyZVN0b3ApLCAgICAg ICAgICAgICAgICAgICAgICAgICBcCisJQUxfRVhUX1BBSVIoYWxjQ2FwdHVyZVNhbXBsZXMpICAg ICAgICAgICAgICAgICAgICAgICAgIFwKIAogLyogaW5pdGlhbGl6YXRpb24gYW5kIGRlc3RydWN0 aW9uIGZ1bmN0aW9ucyAqLwogCg==