RetroArch does not compile - 01_hotkey_hack.diff does not apply

[vbs]

I just noticed when I tried to update RetroArch that it does not compile currently from master:

git clone --depth 1 "https://github.com/libretro/RetroArch.git" "/home/vbs/RetroPie-Setup/tmp/build/retroarch"
Cloning into '/home/vbs/RetroPie-Setup/tmp/build/retroarch'...
patching file input/input_driver.c
Hunk #1 succeeded at 116 (offset 10 lines).
Hunk #2 FAILED at 563.
1 out of 2 hunks FAILED -- saving rejects to file input/input_driver.c.rej
patching file menu/widgets/menu_entry.c
Hunk #1 succeeded at 545 (offset 2 lines).
/home/vbs/RetroPie-Setup
retroarch patch /home/vbs/RetroPie-Setup/scriptmodules/emulators/retroarch/01_hotkey_hack.diff failed to apply

I would try to fix it myself but I cannot at the moment. Maybe someone wants to look into it otherwise I will try to in the next days.

[BuZz]

@vbs I will look into it. (PS. feel free to open tickets on the tracker - the message we have there is primarily designed to deter users, as we get a lot of support requests otherwise).

[BuZz]

I opened a ticket. More info there.

[GhengisKhan]

I loaded up RetroPie after doing an update only to find all of my emulators and games are gone. I checked my ROMS folder and they're all still there. I then tried to bring up RetroArch from within ES, but it just flashes a black screen then goes back to ES.
I just tried uninstalling/reinstalling RetroPie from scratch and got the same "Hunk #2 FAILED at 563", and "01_hotkey_hack.diff failed to apply" faults that vbs shows in the original post.
RetroArch still will not load, and none of my games will show up in ES.
This install is on my PC running Ubuntu 16.04.1 LTS, but I have a RetroPie (RPi 3) that I'm afraid to do updates on until I find out how to fix this, or if there is something more serious going on.
Is there a way for me to see the "ticket" that BuZz opened for this issue?

[BuZz]

@GhengisKhan update RetroPie-Setup and reinstall retroarch. It will compile, minus our patch.

[BuZz]

https://github.com/RetroPie/RetroPie-Setup/pull/1773

joolswills created this issue in RetroPie/RetroPie-Setup

closed retrarch - rework hotkey enable hack for upstream retroarch and re-enable patch - fixes #1772 #1773