media-libs/mesa: merge with upstream