Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

update sdl and sdl_image again (contains v4l2 fix)

Browse Source
This commit is contained in:
Green Sky 2024-09-19 14:01:47 +02:00
parent 6af0ddc3ec
commit 557a642ad3
No known key found for this signature in database
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/sdl/CMakeLists.txt vendored
View File

@ -22,7 +22,8 @@ if (NOT TARGET SDL3::SDL3)
#GIT_TAG d65a8146b950abe31b4fbf779f3e2fea731af9bd # tip 16-07-2024 - before string policy changes breaking imgui #GIT_TAG d65a8146b950abe31b4fbf779f3e2fea731af9bd # tip 16-07-2024 - before string policy changes breaking imgui
#GIT_TAG e949f12f63cdfcef4bdf456936ee676e0a3f9de6 # tip 18-07-2024 - broke bmp surface (before too) #GIT_TAG e949f12f63cdfcef4bdf456936ee676e0a3f9de6 # tip 18-07-2024 - broke bmp surface (before too)
#GIT_TAG 67b973b5fad633b3be76d4daf4fd9fece292c25f # tip 29-07-2024 #GIT_TAG 67b973b5fad633b3be76d4daf4fd9fece292c25f # tip 29-07-2024
GIT_TAG 6e885d96193a4b0096fe7fed6d4e6c3e5f247283 # tip 09-09-2024 #GIT_TAG 6e885d96193a4b0096fe7fed6d4e6c3e5f247283 # tip 09-09-2024
GIT_TAG 9dd8859240703d886941733ad32c1dc6f50d64f0 # tip 19-09-2024
FIND_PACKAGE_ARGS # for the future FIND_PACKAGE_ARGS # for the future
) )

3
external/sdl_image/CMakeLists.txt vendored
View File

@ -21,7 +21,8 @@ if (NOT TARGET SDL3_image::SDL3_image)
#GIT_TAG 8eff782fa33d795c9ea1ac42dbe7e17cc9874c78 # tip 09-06-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 #GIT_TAG 2a27018eda394a4e005cd8ba6bb3bfd0298809c7 # tip 29-07-2024
GIT_TAG c1b272450d306db3845086cc231acae736b92f4f # tip 09-09-2024 #GIT_TAG c1b272450d306db3845086cc231acae736b92f4f # tip 09-09-2024
GIT_TAG b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc # tip 17-09-2024
FIND_PACKAGE_ARGS # for the future FIND_PACKAGE_ARGS # for the future
) )
FetchContent_MakeAvailable(SDL3_image) FetchContent_MakeAvailable(SDL3_image)

14
flake.lock generated
View File

@ -63,34 +63,34 @@
"sdl3": { "sdl3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725865005, "lastModified": 1726672741,
"narHash": "sha256-4vauaoxf+2LhGYLKRJOugZWKKMqa0bHTJCuR2F01DeM=", "narHash": "sha256-+L1khIk2nHI7V8o/RVk2MEHv+baoQvISNHNclOWPxQM=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "6e885d96193a4b0096fe7fed6d4e6c3e5f247283", "rev": "9dd8859240703d886941733ad32c1dc6f50d64f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "6e885d96193a4b0096fe7fed6d4e6c3e5f247283", "rev": "9dd8859240703d886941733ad32c1dc6f50d64f0",
"type": "github" "type": "github"
} }
}, },
"sdl3_image": { "sdl3_image": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725662120, "lastModified": 1726603202,
"narHash": "sha256-jLKf3xSqjIL7L6iarQAiwcrmIQlM4R1zC2gXGXcdwPA=", "narHash": "sha256-jLKf3xSqjIL7L6iarQAiwcrmIQlM4R1zC2gXGXcdwPA=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "c1b272450d306db3845086cc231acae736b92f4f", "rev": "b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "c1b272450d306db3845086cc231acae736b92f4f", "rev": "b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc",
"type": "github" "type": "github"
} }
}, },

4
flake.nix
View File

@ -11,11 +11,11 @@
flake = false; flake = false;
}; };
sdl3 = { sdl3 = {
url = "github:libsdl-org/SDL/6e885d96193a4b0096fe7fed6d4e6c3e5f247283"; # keep in sync this cmake url = "github:libsdl-org/SDL/9dd8859240703d886941733ad32c1dc6f50d64f0"; # keep in sync this cmake
flake = false; flake = false;
}; };
sdl3_image = { sdl3_image = {
url = "github:libsdl-org/SDL_image/c1b272450d306db3845086cc231acae736b92f4f"; url = "github:libsdl-org/SDL_image/b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc";
flake = false; flake = false;
}; };
}; };

2
src/sdlrenderer_texture_uploader.cpp
View File

@ -56,7 +56,7 @@ bool SDLRendererTextureUploader::updateRGBA(uint64_t tex_id, const uint8_t* data
uint8_t* pixels = nullptr; uint8_t* pixels = nullptr;
int pitch = 0; int pitch = 0;
if (SDL_LockTexture(texture, nullptr, (void**)&pixels, &pitch) != 0) { if (!SDL_LockTexture(texture, nullptr, (void**)&pixels, &pitch)) {
std::cerr << "SDLRTU error: failed locking texture '" << SDL_GetError() << "'\n"; std::cerr << "SDLRTU error: failed locking texture '" << SDL_GetError() << "'\n";
return false; return false;
} }