meda-libs/mesa: merge with x11