Sorry I don't really know what needs to be done if you have xorg-edgers. The patch is supposed to be applied using the git command, so you basically need the whole Mesa git repository.