vlc-git: try to move away from #define to configure.ac patch
vlc-git: apply patch 4 and not 7 so ray can test