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

lcevcdec: fix pkg-config version data #392810

Merged
merged 1 commit into from
Mar 24, 2025

Conversation

FliegendeWurst
Copy link
Member

@FliegendeWurst FliegendeWurst commented Mar 24, 2025

Upstream now installs their own .pc file, which
we must patch to specify the correct version.

Fixes #392771

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.

Upstream now installs their own .pc file, which
we must patch to specify the correct version.
@FliegendeWurst FliegendeWurst mentioned this pull request Mar 24, 2025
3 tasks
Copy link
Member

@thefossguy thefossguy left a comment

Choose a reason for hiding this comment

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

LGTM

@FliegendeWurst
Copy link
Member Author

Note: the new .pc file is equal to the previous one, except for the Version line. I'll merge after ffmpeg-full built successfully.

@FliegendeWurst
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392810


x86_64-linux

✅ 10 packages built:
  • ffmpeg-full
  • ffmpeg-full.bin (ffmpeg-full.bin.bin ,ffmpeg-full.bin.data ,ffmpeg-full.bin.dev ,ffmpeg-full.bin.doc ,ffmpeg-full.bin.lib ,ffmpeg-full.bin.man)
  • ffmpeg-full.data (ffmpeg-full.data.bin ,ffmpeg-full.data.data ,ffmpeg-full.data.dev ,ffmpeg-full.data.doc ,ffmpeg-full.data.lib ,ffmpeg-full.data.man)
  • ffmpeg-full.dev (ffmpeg-full.dev.bin ,ffmpeg-full.dev.data ,ffmpeg-full.dev.dev ,ffmpeg-full.dev.doc ,ffmpeg-full.dev.lib ,ffmpeg-full.dev.man)
  • ffmpeg-full.doc (ffmpeg-full.doc.bin ,ffmpeg-full.doc.data ,ffmpeg-full.doc.dev ,ffmpeg-full.doc.doc ,ffmpeg-full.doc.lib ,ffmpeg-full.doc.man)
  • ffmpeg-full.lib (ffmpeg-full.lib.bin ,ffmpeg-full.lib.data ,ffmpeg-full.lib.dev ,ffmpeg-full.lib.doc ,ffmpeg-full.lib.lib ,ffmpeg-full.lib.man)
  • ffmpeg-full.man (ffmpeg-full.man.bin ,ffmpeg-full.man.data ,ffmpeg-full.man.dev ,ffmpeg-full.man.doc ,ffmpeg-full.man.lib ,ffmpeg-full.man.man)
  • lcevcdec
  • lcevcdec.dev (lcevcdec.dev.dev ,lcevcdec.dev.lib)
  • lcevcdec.lib (lcevcdec.lib.dev ,lcevcdec.lib.lib)

No regressions expected, as explained above.

@FliegendeWurst FliegendeWurst added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 24, 2025
@FliegendeWurst FliegendeWurst merged commit 668b92c into NixOS:master Mar 24, 2025
42 of 46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: ffmpeg-full
2 participants