Skip to content

SDL2: 2.24.0 -> 2.24.2#196854

Merged
mweinelt merged 2 commits intoNixOS:staging-nextfrom
jansol:SDL2main-fix
Nov 7, 2022
Merged

SDL2: 2.24.0 -> 2.24.2#196854
mweinelt merged 2 commits intoNixOS:staging-nextfrom
jansol:SDL2main-fix

Conversation

@jansol
Copy link
Contributor

@jansol jansol commented Oct 20, 2022 •
edited by SuperSandro2000
Loading

Fixes #200022

Description of changes

Minor version bump to pull in a fix for some build breakage due to the SDL2::SDL2main cmake target not getting created. Upstream issue: libsdl-org/SDL#6119

NB: even with this fix, the target for the (no-op) libSDL2main.a is only present when withStatic is overridden to true. This is probably not the desired behavior since SDL2main is always static and is intended to be linked even if the actual SDL2 library is linked dynamically.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@jansol jansol mentioned this pull request Oct 20, 2022
Closed
13 tasks
@ofborg ofborg bot requested a review from cpages October 20, 2022 03:41
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Oct 20, 2022
@SuperSandro2000 SuperSandro2000 mentioned this pull request Nov 7, 2022
Closed
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 7, 2022

FYI https://github.com/libsdl-org/SDL/releases/tag/release-2.24.2

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 7, 2022

@ofborg build devilutionx

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 7, 2022 •
edited
Loading

pipewire seems to fail to build.

Verified on top staging-next and unrelated.

@SuperSandro2000 SuperSandro2000 changed the base branch from staging to staging-next November 7, 2022 14:41
@SuperSandro2000 SuperSandro2000 changed the title SDL2: 2.24.0 -> 2.24.1 SDL2: 2.24.0 -> 2.24.2 Nov 7, 2022
@mweinelt mweinelt merged commit 625f479 into NixOS:staging-next Nov 7, 2022
@jansol jansol deleted the SDL2main-fix branch November 7, 2022 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@cpages cpages Awaiting requested review from cpages

Assignees

No one assigned

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jansol @SuperSandro2000 @mweinelt