Backport Raring mesa, dropping Wayland support because it's hard