More build fixes.
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic