cdriso: merge some libretro changes