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.

Sign up for GitHub

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

Jump to bottom

Ffmpeg reenable avfoundation quirc #329380

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Ffmpeg reenable avfoundation quirc #329380

merged 2 commits into from
Jul 23, 2024

Conversation

toonn
Copy link
Contributor

@toonn toonn commented Jul 23, 2024

Description of changes

#322724 was merged before it was updated to align with #328424 and #328420, which were merged prior and made it unnecessary to disable AVFoundation and quirc support.

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.

toonn added 2 commits July 23, 2024 12:55
@toonn
ffmpeg_7: Reenable withAVFoundation
fd067e4 
This was disabled in NixOS#322724 after NixOS#328424 provided a patch fixing it.
@toonn
ffmpeg_7-full: Reenable withQuirc
b0c3089 
This was disabled in NixOS#322724 after NixOS#328420 fixed quirc.
@toonn toonn requested a review from emilazy July 23, 2024 11:24
@eclairevoyant eclairevoyant added the 6.topic: darwin Running or building packages on Darwin label Jul 23, 2024
@ofborg ofborg bot requested review from jopejoe1 and Atemu July 23, 2024 11:55
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 23, 2024
jopejoe1
jopejoe1 approved these changes Jul 23, 2024
View reviewed changes
Copy link
Member

@jopejoe1 jopejoe1 left a comment

Choose a reason for hiding this comment

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

Makes sense to me

emilazy
emilazy approved these changes Jul 23, 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.

ffmpeg_7-full builds for me after these changes.

@emilazy emilazy merged commit e42cb97 into NixOS:master Jul 23, 2024
26 of 29 checks passed
@jopejoe1 jopejoe1 mentioned this pull request Aug 17, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy approved these changes

@jopejoe1 jopejoe1 jopejoe1 approved these changes

@Atemu Atemu Awaiting requested review from Atemu

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@toonn @emilazy @jopejoe1 @eclairevoyant