Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg_7: 7.0.2 -> 7.1; xeve: 0.5.0 -> 0.5.1 #346552

Merged
merged 2 commits into from
Oct 6, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Oct 5, 2024

I’ll look into upstreaming the tests fix some other time.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@emilazy emilazy requested review from jopejoe1 and Atemu October 5, 2024 00:33
@emilazy
Copy link
Member Author

emilazy commented Oct 6, 2024

@Atemu @jopejoe1 Any objections to just merging this? It looks like, in classic FFmpeg fashion, they’ve broken at least one API, but I expect it to be less bad than 6 → 7 which has gone smoothly so far, and it’d be nice to ship 24.11 on the latest release.

Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Diff LGTM.

The changelog looks small enough and odd API breakages like that one can only really be found by pushing this to unstable.

I'd like to see the patch upstreamed though.

@Atemu
Copy link
Member

Atemu commented Oct 6, 2024

Result of nixpkgs-review pr 346552 --checkout commit run on x86_64-linux 1

7 packages built:
  • ffmpeg_7-full
  • ffmpeg_7-full.bin (ffmpeg_7-full.bin.bin ,ffmpeg_7-full.bin.data ,ffmpeg_7-full.bin.dev ,ffmpeg_7-full.bin.doc ,ffmpeg_7-full.bin.lib ,ffmpeg_7-full.bin.man)
  • ffmpeg_7-full.data (ffmpeg_7-full.data.bin ,ffmpeg_7-full.data.data ,ffmpeg_7-full.data.dev ,ffmpeg_7-full.data.doc ,ffmpeg_7-full.data.lib ,ffmpeg_7-full.data.man)
  • ffmpeg_7-full.dev (ffmpeg_7-full.dev.bin ,ffmpeg_7-full.dev.data ,ffmpeg_7-full.dev.dev ,ffmpeg_7-full.dev.doc ,ffmpeg_7-full.dev.lib ,ffmpeg_7-full.dev.man)
  • ffmpeg_7-full.doc (ffmpeg_7-full.doc.bin ,ffmpeg_7-full.doc.data ,ffmpeg_7-full.doc.dev ,ffmpeg_7-full.doc.doc ,ffmpeg_7-full.doc.lib ,ffmpeg_7-full.doc.man)
  • ffmpeg_7-full.lib (ffmpeg_7-full.lib.bin ,ffmpeg_7-full.lib.data ,ffmpeg_7-full.lib.dev ,ffmpeg_7-full.lib.doc ,ffmpeg_7-full.lib.lib ,ffmpeg_7-full.lib.man)
  • ffmpeg_7-full.man (ffmpeg_7-full.man.bin ,ffmpeg_7-full.man.data ,ffmpeg_7-full.man.dev ,ffmpeg_7-full.man.doc ,ffmpeg_7-full.man.lib ,ffmpeg_7-full.man.man)

@emilazy
Copy link
Member Author

emilazy commented Oct 6, 2024

The FFmpeg site is down right now. I’ll put myself through finally learning git send-email when it comes back up.

@emilazy emilazy merged commit 92663c9 into NixOS:staging Oct 6, 2024
33 checks passed
@emilazy emilazy deleted the push-qvykyplnrynr branch October 6, 2024 13:23
@emilazy
Copy link
Member Author

emilazy commented Oct 7, 2024

Patch sent upstream as https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected]/.

@wegank wegank mentioned this pull request Nov 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants