[mpv/f31] (20 commits) ...Fix build