diff --git a/external/sdl/CMakeLists.txt b/external/sdl/CMakeLists.txt index e1f6d0dd..d5bcee39 100644 --- a/external/sdl/CMakeLists.txt +++ b/external/sdl/CMakeLists.txt @@ -20,7 +20,8 @@ if (NOT TARGET SDL3::SDL3) #GIT_TAG 9651ca59187c16079846918483c40d6b5c2f454c # tip 09-06-2024 #GIT_TAG 657c0135b1ff1685afa1bad63b0417d92f4bcb46 # tip 09-06-2024 #GIT_TAG d65a8146b950abe31b4fbf779f3e2fea731af9bd # tip 16-07-2024 - before string policy changes breaking imgui - GIT_TAG e949f12f63cdfcef4bdf456936ee676e0a3f9de6 # tip 18-07-2024 + #GIT_TAG e949f12f63cdfcef4bdf456936ee676e0a3f9de6 # tip 18-07-2024 - broke bmp surface (before too) + GIT_TAG 67b973b5fad633b3be76d4daf4fd9fece292c25f # tip 29-07-2024 FIND_PACKAGE_ARGS # for the future ) diff --git a/external/sdl_image/CMakeLists.txt b/external/sdl_image/CMakeLists.txt index 8fd2df4e..3fd69e2b 100644 --- a/external/sdl_image/CMakeLists.txt +++ b/external/sdl_image/CMakeLists.txt @@ -19,7 +19,8 @@ if (NOT TARGET SDL3_image::SDL3_image) #GIT_TAG a34ccf16f961e6d5a480045eb650fc3dddb4bfaa # tip 14-05-2024 #GIT_TAG 2fc5310a9a2700fc856663200f94edebeb5e554a # tip 28-05-2024 #GIT_TAG 8eff782fa33d795c9ea1ac42dbe7e17cc9874c78 # tip 09-06-2024 - GIT_TAG 8abc07df88cc035997e797967ac2f479b0e50981 # tip 18-07-2024 + #GIT_TAG 8abc07df88cc035997e797967ac2f479b0e50981 # tip 18-07-2024 + GIT_TAG 2a27018eda394a4e005cd8ba6bb3bfd0298809c7 # tip 29-07-2024 FIND_PACKAGE_ARGS # for the future ) FetchContent_MakeAvailable(SDL3_image) diff --git a/flake.lock b/flake.lock index 8d994531..562c5cf7 100644 --- a/flake.lock +++ b/flake.lock @@ -63,34 +63,34 @@ "sdl3": { "flake": false, "locked": { - "lastModified": 1721156595, - "narHash": "sha256-BamJ5xK2uEHv1Q5AM2aNYk+ZDsrKCVsyZ4ium7pTTis=", + "lastModified": 1722282731, + "narHash": "sha256-02y7JB23xAehjqBp6hj7ExNkD06XkFE8Odxnu0hYx8k=", "owner": "libsdl-org", "repo": "SDL", - "rev": "d65a8146b950abe31b4fbf779f3e2fea731af9bd", + "rev": "67b973b5fad633b3be76d4daf4fd9fece292c25f", "type": "github" }, "original": { "owner": "libsdl-org", "repo": "SDL", - "rev": "d65a8146b950abe31b4fbf779f3e2fea731af9bd", + "rev": "67b973b5fad633b3be76d4daf4fd9fece292c25f", "type": "github" } }, "sdl3_image": { "flake": false, "locked": { - "lastModified": 1721253495, - "narHash": "sha256-mZjO5Tfu6TyGGC/2AduzOqKHW9NdH4oSzyVGjipW5bQ=", + "lastModified": 1722000822, + "narHash": "sha256-h2vyWcGdLPbg42M6bgJAzskXJfeq9UYTMHi1XdP/otk=", "owner": "libsdl-org", "repo": "SDL_image", - "rev": "8abc07df88cc035997e797967ac2f479b0e50981", + "rev": "2a27018eda394a4e005cd8ba6bb3bfd0298809c7", "type": "github" }, "original": { "owner": "libsdl-org", "repo": "SDL_image", - "rev": "8abc07df88cc035997e797967ac2f479b0e50981", + "rev": "2a27018eda394a4e005cd8ba6bb3bfd0298809c7", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2fdbb9a7..b5985b84 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,11 @@ flake = false; }; sdl3 = { - url = "github:libsdl-org/SDL/d65a8146b950abe31b4fbf779f3e2fea731af9bd"; # keep in sync this cmake + url = "github:libsdl-org/SDL/67b973b5fad633b3be76d4daf4fd9fece292c25f"; # keep in sync this cmake flake = false; }; sdl3_image = { - url = "github:libsdl-org/SDL_image/8abc07df88cc035997e797967ac2f479b0e50981"; + url = "github:libsdl-org/SDL_image/2a27018eda394a4e005cd8ba6bb3bfd0298809c7"; flake = false; }; };