The patch doesn't apply cleanly and needs some rework.
Created attachment 270603 [details, diff] reworked patch That should help
took me a while to understand what it was about and realise it was about vlc... patch applied, thanks!