diff --git a/changelog.md b/changelog.md index 5556fcad..8fa6ba34 100644 --- a/changelog.md +++ b/changelog.md @@ -10,6 +10,8 @@ when upgrading from a version of rust-sdl2 to another. [PR #1080](https://github.com/Rust-SDL2/rust-sdl2/pull/1080): Fix line endings of patches to lf so patching of sources works on Windows. +[PR #1078](https://github.com/Rust-SDL2/rust-sdl2/pull/1078): Upgraded the "bundled" version of SDL2 to 2.0.14 + ### v0.34.4 [PR #1057](https://github.com/Rust-SDL2/rust-sdl2/pull/1057): fix memory safety bug in set_error diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL.h b/sdl2-sys/SDL2-2.0.14/include/SDL.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL.h rename to sdl2-sys/SDL2-2.0.14/include/SDL.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_assert.h b/sdl2-sys/SDL2-2.0.14/include/SDL_assert.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_assert.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_assert.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_atomic.h b/sdl2-sys/SDL2-2.0.14/include/SDL_atomic.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_atomic.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_atomic.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_audio.h b/sdl2-sys/SDL2-2.0.14/include/SDL_audio.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_audio.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_audio.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_bits.h b/sdl2-sys/SDL2-2.0.14/include/SDL_bits.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_bits.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_bits.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_blendmode.h b/sdl2-sys/SDL2-2.0.14/include/SDL_blendmode.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_blendmode.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_blendmode.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_clipboard.h b/sdl2-sys/SDL2-2.0.14/include/SDL_clipboard.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_clipboard.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_clipboard.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config.h.cmake b/sdl2-sys/SDL2-2.0.14/include/SDL_config.h.cmake similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config.h.cmake rename to sdl2-sys/SDL2-2.0.14/include/SDL_config.h.cmake diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config.h.in b/sdl2-sys/SDL2-2.0.14/include/SDL_config.h.in similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config.h.in rename to sdl2-sys/SDL2-2.0.14/include/SDL_config.h.in diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_android.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_android.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_android.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_android.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_iphoneos.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_iphoneos.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_iphoneos.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_iphoneos.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_macosx.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_macosx.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_macosx.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_macosx.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_minimal.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_minimal.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_minimal.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_minimal.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_os2.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_os2.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_os2.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_os2.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_pandora.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_pandora.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_pandora.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_pandora.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_psp.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_psp.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_psp.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_psp.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_windows.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_windows.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_windows.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_windows.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_winrt.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_winrt.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_winrt.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_winrt.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_config_wiz.h b/sdl2-sys/SDL2-2.0.14/include/SDL_config_wiz.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_config_wiz.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_config_wiz.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_copying.h b/sdl2-sys/SDL2-2.0.14/include/SDL_copying.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_copying.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_copying.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_cpuinfo.h b/sdl2-sys/SDL2-2.0.14/include/SDL_cpuinfo.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_cpuinfo.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_cpuinfo.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_egl.h b/sdl2-sys/SDL2-2.0.14/include/SDL_egl.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_egl.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_egl.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_endian.h b/sdl2-sys/SDL2-2.0.14/include/SDL_endian.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_endian.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_endian.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_error.h b/sdl2-sys/SDL2-2.0.14/include/SDL_error.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_error.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_error.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_events.h b/sdl2-sys/SDL2-2.0.14/include/SDL_events.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_events.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_events.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_filesystem.h b/sdl2-sys/SDL2-2.0.14/include/SDL_filesystem.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_filesystem.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_filesystem.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_gamecontroller.h b/sdl2-sys/SDL2-2.0.14/include/SDL_gamecontroller.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_gamecontroller.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_gamecontroller.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_gesture.h b/sdl2-sys/SDL2-2.0.14/include/SDL_gesture.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_gesture.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_gesture.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_haptic.h b/sdl2-sys/SDL2-2.0.14/include/SDL_haptic.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_haptic.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_haptic.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_hints.h b/sdl2-sys/SDL2-2.0.14/include/SDL_hints.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_hints.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_hints.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_joystick.h b/sdl2-sys/SDL2-2.0.14/include/SDL_joystick.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_joystick.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_joystick.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_keyboard.h b/sdl2-sys/SDL2-2.0.14/include/SDL_keyboard.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_keyboard.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_keyboard.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_keycode.h b/sdl2-sys/SDL2-2.0.14/include/SDL_keycode.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_keycode.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_keycode.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_loadso.h b/sdl2-sys/SDL2-2.0.14/include/SDL_loadso.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_loadso.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_loadso.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_log.h b/sdl2-sys/SDL2-2.0.14/include/SDL_log.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_log.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_log.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_main.h b/sdl2-sys/SDL2-2.0.14/include/SDL_main.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_main.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_main.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_messagebox.h b/sdl2-sys/SDL2-2.0.14/include/SDL_messagebox.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_messagebox.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_messagebox.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_metal.h b/sdl2-sys/SDL2-2.0.14/include/SDL_metal.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_metal.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_metal.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_mouse.h b/sdl2-sys/SDL2-2.0.14/include/SDL_mouse.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_mouse.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_mouse.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_mutex.h b/sdl2-sys/SDL2-2.0.14/include/SDL_mutex.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_mutex.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_mutex.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_name.h b/sdl2-sys/SDL2-2.0.14/include/SDL_name.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_name.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_name.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengl.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengl.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengl.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengl.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengl_glext.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengl_glext.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengl_glext.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengl_glext.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles2.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles2.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles2.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles2.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2ext.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2ext.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2ext.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2ext.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2platform.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2platform.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_gl2platform.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_gl2platform.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_khrplatform.h b/sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_khrplatform.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_opengles2_khrplatform.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_opengles2_khrplatform.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_pixels.h b/sdl2-sys/SDL2-2.0.14/include/SDL_pixels.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_pixels.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_pixels.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_platform.h b/sdl2-sys/SDL2-2.0.14/include/SDL_platform.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_platform.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_platform.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_power.h b/sdl2-sys/SDL2-2.0.14/include/SDL_power.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_power.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_power.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_quit.h b/sdl2-sys/SDL2-2.0.14/include/SDL_quit.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_quit.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_quit.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_rect.h b/sdl2-sys/SDL2-2.0.14/include/SDL_rect.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_rect.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_rect.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_render.h b/sdl2-sys/SDL2-2.0.14/include/SDL_render.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_render.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_render.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_revision.h b/sdl2-sys/SDL2-2.0.14/include/SDL_revision.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_revision.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_revision.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_rwops.h b/sdl2-sys/SDL2-2.0.14/include/SDL_rwops.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_rwops.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_rwops.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_scancode.h b/sdl2-sys/SDL2-2.0.14/include/SDL_scancode.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_scancode.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_scancode.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_sensor.h b/sdl2-sys/SDL2-2.0.14/include/SDL_sensor.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_sensor.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_sensor.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_shape.h b/sdl2-sys/SDL2-2.0.14/include/SDL_shape.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_shape.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_shape.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_stdinc.h b/sdl2-sys/SDL2-2.0.14/include/SDL_stdinc.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_stdinc.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_stdinc.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_surface.h b/sdl2-sys/SDL2-2.0.14/include/SDL_surface.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_surface.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_surface.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_system.h b/sdl2-sys/SDL2-2.0.14/include/SDL_system.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_system.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_system.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_syswm.h b/sdl2-sys/SDL2-2.0.14/include/SDL_syswm.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_syswm.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_syswm.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_assert.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_assert.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_assert.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_assert.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_common.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_common.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_common.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_common.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_compare.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_compare.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_compare.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_compare.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_crc32.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_crc32.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_crc32.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_crc32.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_font.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_font.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_font.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_font.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_fuzzer.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_fuzzer.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_fuzzer.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_fuzzer.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_harness.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_harness.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_harness.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_harness.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_images.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_images.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_images.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_images.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_log.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_log.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_log.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_log.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_md5.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_md5.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_md5.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_md5.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_memory.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_memory.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_memory.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_memory.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_test_random.h b/sdl2-sys/SDL2-2.0.14/include/SDL_test_random.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_test_random.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_test_random.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_thread.h b/sdl2-sys/SDL2-2.0.14/include/SDL_thread.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_thread.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_thread.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_timer.h b/sdl2-sys/SDL2-2.0.14/include/SDL_timer.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_timer.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_timer.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_touch.h b/sdl2-sys/SDL2-2.0.14/include/SDL_touch.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_touch.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_touch.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_types.h b/sdl2-sys/SDL2-2.0.14/include/SDL_types.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_types.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_types.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_version.h b/sdl2-sys/SDL2-2.0.14/include/SDL_version.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_version.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_version.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_video.h b/sdl2-sys/SDL2-2.0.14/include/SDL_video.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_video.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_video.h diff --git a/sdl2-sys/SDL2-2.0.12/include/SDL_vulkan.h b/sdl2-sys/SDL2-2.0.14/include/SDL_vulkan.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/SDL_vulkan.h rename to sdl2-sys/SDL2-2.0.14/include/SDL_vulkan.h diff --git a/sdl2-sys/SDL2-2.0.12/include/begin_code.h b/sdl2-sys/SDL2-2.0.14/include/begin_code.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/begin_code.h rename to sdl2-sys/SDL2-2.0.14/include/begin_code.h diff --git a/sdl2-sys/SDL2-2.0.12/include/close_code.h b/sdl2-sys/SDL2-2.0.14/include/close_code.h similarity index 100% rename from sdl2-sys/SDL2-2.0.12/include/close_code.h rename to sdl2-sys/SDL2-2.0.14/include/close_code.h diff --git a/sdl2-sys/build.rs b/sdl2-sys/build.rs index 5beeefaf..a3dfcaeb 100644 --- a/sdl2-sys/build.rs +++ b/sdl2-sys/build.rs @@ -20,10 +20,10 @@ use std::path::{Path, PathBuf}; use std::{env, fs, io}; // corresponds to the headers that we have in sdl2-sys/SDL2-{version} -const SDL2_HEADERS_BUNDLED_VERSION: &str = "2.0.12"; +const SDL2_HEADERS_BUNDLED_VERSION: &str = "2.0.14"; // means the lastest stable version that can be downloaded from SDL2's source -const LASTEST_SDL2_VERSION: &str = "2.0.12"; +const LASTEST_SDL2_VERSION: &str = "2.0.14"; #[cfg(feature = "bindgen")] macro_rules! add_msvc_includes_to_bindings { @@ -171,24 +171,6 @@ fn patch_sdl2(sdl2_source_path: &Path) { // Required patches can be added here like this: // ("SDL-2.x.y-filename.patch", include_str!("patches/SDL-2.x.y-filename.patch")), - // https://bugzilla.libsdl.org/show_bug.cgi?id=5105 - // Expected to be fixed in 2.0.14 - ( - "SDL2-2.0.12-sndio-shared-linux.patch", - include_str!("patches/SDL2-2.0.12-sndio-shared-linux.patch"), - ), - // https://bugzilla.libsdl.org/show_bug.cgi?id=3421 - // Expected to be fixed in 2.0.14 - ( - "SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch", - include_str!("patches/SDL2-2.0.12-SDL_DISABLE_WINDOWS_IME.patch"), - ), - // https://bugzilla.libsdl.org/show_bug.cgi?id=4988 - // Expected to be fixed in 2.0.14 - ( - "SDL2-2.0.12-metal-detection-macos-ios.patch", - include_str!("patches/SDL2-2.0.12-metal-detection-macos-ios.patch"), - ), // Cherrypick to fix "SDL_string.obj : error LNK2019: unresolved external symbol memset // referenced in function SDL_vsnprintf_REAL" // Expected to be fixed in 2.0.15