Fix build with latest rustc, updated rust-sdl2