freedesktop repo seems to be ~1 month out of date, so getting updates required syncing upstream changes via temporary forks.