media-libs/mesa: merge some gentoo upstream stuff in