sdl3-image: 3.2.6 -> 3.4.0, fix compilation with stb#482633
Conversation
|
running review on x86_64 linux rn |
|
my internet broke down, so it'll be a few hours |
|
This is a major release. How much breakage in consumers do you expect? As in, should we backport or not? |
from what I can see, this version only adds new functionality. I don't think it would break anything |
|
i changed this to draft for now. it depends on |
|
depends on #475854 (currently in staging) |
4e15f2b to
287a497
Compare
Review dismissed automatically
287a497 to
371bb7f
Compare
|
No point in targeting
In that case it can't be backported to stable since it's still on sdl3-3.2.x. I'm aware of at least one breaking change in sdl-3.4.0 so I wouldn't backport it unless we have a good reason to do so. |
|
alr, will rebase tmrw |
371bb7f to
0e64cd1
Compare
Review dismissed automatically
|
just noticed that sdl3 3.4.0 is in master already. will fix some compilation errors reopen the pull request |
|
this is not building anymore with the following log from cmake: Setting Will look at it later, gotta eat now. Feel free to look into it. |
|
fixed it by disabling libpng when stb is used. |
|
|
the medusa package not building seems unrelated, there's an issue for that here: #481545 |
jansol
left a comment
There was a problem hiding this comment.
This is indeed a "major" release in terms of new additions but existing API / ABI from previous stable 3.x releases is expected to remain unchanged.
marcin-serwin
left a comment
There was a problem hiding this comment.
this is not building anymore with the following log from cmake:
This is because libpng is now always used for PNG images even with stb backend enabled, see libsdl-org/SDL_image#666.
fixed it by disabling
libpngwhen stb is used.
IMO the correct way is to move libpng to unconditional buildInputs and leave stb enabled to match upstream defaults:
diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix
index 528a06a499..cdce69d3f4 100644
--- a/pkgs/by-name/sd/sdl3-image/package.nix
+++ b/pkgs/by-name/sd/sdl3-image/package.nix
@@ -48,10 +48,10 @@
libtiff
libwebp
libjxl
+ libpng
]
++ (lib.optional (!stdenv.hostPlatform.isDarwin) libavif)
++ (lib.optionals (!enableSTB) [
- libpng
libjpeg
]);|
@marcin-serwin fair enough, though I'm not sure if we should leave stb enabled by default |
8bf0d67 to
e9fc628
Compare
|
The update commit should contain the libpng fix otherwise it doesn't build so it will be harder to bisect in the future.
The upstream uses stb by default but I don't have a strong opinion on that, up to you. |
e9fc628 to
099ada0
Compare
099ada0 to
cd9901b
Compare
|
squashed to one commit now, will keep stb enabled by default |
|
. |
|
Thank you! |
Update sdl3-image to 3.4.0
Release details: https://github.com/libsdl-org/SDL_image/releases/tag/release-3.4.0
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.