[kodi/f41] (2 commits) ...fix build