Created attachment 96968 [details]
the combined full patch needed to fix it
This final patch works well on my system.
I added your "max patch" to the original 76564 patch, OE kept skipping it on
build if 2 patches for that file existed..
Editing patches/diff files is tricky stuff (fixing @@ hunk counters really had
me for a bit there).
Let me know if you need anything else.