Skip to content

sdl3: 3.2.12 -> 3.2.14#407485

Merged
pbsds merged 1 commit intoNixOS:stagingfrom
MisileLab:sdl3
May 19, 2025
Merged

sdl3: 3.2.12 -> 3.2.14#407485
pbsds merged 1 commit intoNixOS:stagingfrom
MisileLab:sdl3

Conversation

@MisileLab
Copy link
Copy Markdown
Contributor

@MisileLab MisileLab commented May 16, 2025

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

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels May 16, 2025
@nix-owners nix-owners bot requested a review from getchoo May 16, 2025 00:28
@LordGrimmauld
Copy link
Copy Markdown
Contributor

LordGrimmauld commented May 18, 2025

cc @NixOS/sdl

LordGrimmauld
LordGrimmauld approved these changes May 18, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@LordGrimmauld LordGrimmauld left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The merge base here is awkward. For the future, you might want to consider git merge-base origin/master origin/staging to get a state that is easier to review. This works for packages that are relatively slow-moving like SDL, where you don't have to expect merge conflicts from using an old merge base.

Upstream release notes are supposedly non-breaking, so i'll be adding the backport tag. I did not review all upstream commits, there is way too many of those.

I did confirm sdl3-* and sdl2-compat still build.

@LordGrimmauld LordGrimmauld added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. backport staging-25.05 labels May 18, 2025
@MisileLab
Copy link
Copy Markdown
Contributor Author

MisileLab commented May 18, 2025

The merge base here is awkward. For the future, you might want to consider git merge-base origin/master origin/staging to get a state that is easier to review. This works for packages that are relatively slow-moving like SDL, where you don't have to expect merge conflicts from using an old merge base.

Upstream release notes are supposedly non-breaking, so i'll be adding the backport tag. I did not review all upstream commits, there is way too many of those.

I did confirm sdl3-* and sdl2-compat still build.

I didn't know that, thanks

@pbsds
Copy link
Copy Markdown
Member

pbsds commented May 19, 2025

tested by cherry-picking the commit on master, LGTM

@pbsds pbsds merged commit 6cf64b3 into NixOS:staging May 19, 2025
23 of 24 checks passed
@nixpkgs-ci
Copy link
Copy Markdown
Contributor

nixpkgs-ci bot commented May 19, 2025

Successfully created backport PR for staging-25.05:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 19, 2025
Merged
1 task
@nixpkgs-ci nixpkgs-ci bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 19, 2025
@MisileLab MisileLab deleted the sdl3 branch May 19, 2025 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LordGrimmauld LordGrimmauld LordGrimmauld approved these changes

@getchoo getchoo Awaiting requested review from getchoo

Assignees

No one assigned

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MisileLab @LordGrimmauld @pbsds