Add MESON_ARGS which got lost in previous commit and while at it fetch upstream patch instead of hosting a local one in tree