From 7c568fd09deae986968b3378ad5c505c7c5c859e Mon Sep 17 00:00:00 2001 From: gered Date: Wed, 18 Jan 2023 13:30:25 -0500 Subject: [PATCH] update to a more recent version of sdl2. only tested on linux for now 0.35.2 is the latest version available via cargo right now, and that version has some issues building for me that have been resolved in subsequent commit(s). for some reason the maintainers have not pushed a new version of sdl2 to cargo for quite some time despite numerous fixes and updates being available ...? bah! also the current sdl2 `features` set will probably only work for linux builds. i will try to work out windows + mac build issues shortly --- examples/audio_playback/Cargo.toml | 2 +- examples/balls/Cargo.toml | 3 +-- examples/balls_v2/Cargo.toml | 2 +- examples/slimed/Cargo.toml | 2 +- examples/template_complicated/Cargo.toml | 2 +- examples/template_minimal/Cargo.toml | 2 +- libretrogd/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/audio_playback/Cargo.toml b/examples/audio_playback/Cargo.toml index f2291e6..69ed28e 100644 --- a/examples/audio_playback/Cargo.toml +++ b/examples/audio_playback/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd" } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } diff --git a/examples/balls/Cargo.toml b/examples/balls/Cargo.toml index b64438c..e56706b 100644 --- a/examples/balls/Cargo.toml +++ b/examples/balls/Cargo.toml @@ -6,5 +6,4 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd" } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } - +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } diff --git a/examples/balls_v2/Cargo.toml b/examples/balls_v2/Cargo.toml index 741f35c..3798d43 100644 --- a/examples/balls_v2/Cargo.toml +++ b/examples/balls_v2/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd", features = [] } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } diff --git a/examples/slimed/Cargo.toml b/examples/slimed/Cargo.toml index 3d98d2a..f1ec34b 100644 --- a/examples/slimed/Cargo.toml +++ b/examples/slimed/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd", features = [] } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" diff --git a/examples/template_complicated/Cargo.toml b/examples/template_complicated/Cargo.toml index 06559d8..381fc3b 100644 --- a/examples/template_complicated/Cargo.toml +++ b/examples/template_complicated/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd" } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } diff --git a/examples/template_minimal/Cargo.toml b/examples/template_minimal/Cargo.toml index 475d126..3610757 100644 --- a/examples/template_minimal/Cargo.toml +++ b/examples/template_minimal/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] anyhow = "=1.0.55" libretrogd = { path = "../../libretrogd" } -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } diff --git a/libretrogd/Cargo.toml b/libretrogd/Cargo.toml index 1579d7c..d3fc34e 100644 --- a/libretrogd/Cargo.toml +++ b/libretrogd/Cargo.toml @@ -10,7 +10,7 @@ low_res = [] wide = [] [dependencies] -sdl2 = { version = "0.34.5", features = ["static-link", "bundled", "unsafe_textures" ] } +sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2/", rev = "819ab438ac971a922d6ee1da558822002d343b4e", features = ["static-link", "bundled", "use-pkgconfig", "unsafe_textures"] } byte-slice-cast = "1.2.1" byteorder = "1.4.3" thiserror = "=1.0.30"