liborigin2 with fixes not yet applied upstream