mesa: use upstream patch to fix doCheck again