Andrew,
FINALLY, gg got rid of Patch 4 as you notified us August 26 (GIT update).  Thanks so much for the notify and sorry for the long delay.

for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4
is not applicable anymore, and ffmpeg log list this commit: