Skip to content

ffmpeg_4: 4.4.4 -> 4.4.5#331353

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
jopejoe1:ffmpeg/update/4.4.5
Aug 6, 2024
Merged

ffmpeg_4: 4.4.4 -> 4.4.5#331353
vcunat merged 1 commit intoNixOS:stagingfrom
jopejoe1:ffmpeg/update/4.4.5

Conversation

@jopejoe1
Copy link
Member

@jopejoe1 jopejoe1 commented Jul 31, 2024 •
edited
Loading

Description of changes

ChangeLog: https://github.com/FFmpeg/FFmpeg/blob/n4.4.5/Changelog

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.

@ofborg ofborg bot requested a review from Atemu July 31, 2024 20:52
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jul 31, 2024
@jopejoe1 jopejoe1 requested a review from emilazy July 31, 2024 20:56
Atemu
Atemu approved these changes Jul 31, 2024
View reviewed changes
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 but I'd like to see this built on a Darwin machine before we merge.

@emilazy
Copy link
Member

emilazy commented Jul 31, 2024

Can you rebase the revision on master so I can test the build on Darwin more easily? (While keeping the branch target as it is, of course.)

If I just got the changes I have locally pushed out this wouldn’t need to target staging at all…

@jopejoe1 jopejoe1 force-pushed the ffmpeg/update/4.4.5 branch from 29c2372 to e53cf6c Compare August 1, 2024 20:13
@jopejoe1
Copy link
Member Author

jopejoe1 commented Aug 1, 2024

Can you rebase the revision on master so I can test the build on Darwin more easily? (While keeping the branch target as it is, of course.)

sure

If I just got the changes I have locally pushed out this wouldn’t need to target staging at all…

Would be nice to not have to to through staging.

emilazy
emilazy approved these changes Aug 1, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Would be nice to not have to to through staging.

Slowly but surely, I’m making it happen.

I can confirm a successful build of all variants on both x86_64-darwin and aarch64-darwin. Hey, if we’re lucky maybe this will be the last time we have to bump FFmpeg 4…

@ofborg ofborg bot requested review from Atemu and emilazy August 1, 2024 22:28
@ofborg ofborg bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Aug 1, 2024
@wegank wegank 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. labels Aug 4, 2024
@vcunat vcunat merged commit 44a4c39 into NixOS:staging Aug 6, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Sep 22, 2024

Backport failed for staging-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.05
git worktree add -d .worktree/backport-331353-to-staging-24.05 origin/staging-24.05
cd .worktree/backport-331353-to-staging-24.05
git switch --create backport-331353-to-staging-24.05
git cherry-pick -x e53cf6ca74e8faaa5081137eb367cda363444c07

@Atemu
Copy link
Member

Atemu commented Sep 22, 2024

Do we really need this backported? Don't we have all the security fixes ported as patches already?

@jopejoe1 jopejoe1 deleted the ffmpeg/update/4.4.5 branch November 14, 2024 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy Awaiting requested review from emilazy

@Atemu Atemu Awaiting requested review from Atemu

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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.

5 participants

@jopejoe1 @emilazy @Atemu @vcunat @wegank

Comments