[staging-next] ffmpeg-5: fix Vulkan builds#218281
Merged
K900 merged 1 commit intoNixOS:staging-nextfrom Feb 25, 2023
Merged
Conversation
- add vulkan-headers as a dependency - hack around ffmpeg using unstable VK_EXT names for extensions - drive-by cleanup: remove unused inherit
Contributor
Author
|
Result of 1 package marked as broken and skipped:
4 packages failed to build:
49 packages built:
|
Contributor
Author
|
Python failures seem unrelated. |
Atemu
reviewed
Feb 25, 2023
Comment on lines
+345
to
+348
| '' + lib.optionalString withVulkan '' | ||
| # FIXME: horrible hack, remove for next release | ||
| substituteInPlace libavutil/hwcontext_vulkan.c \ | ||
| --replace VK_EXT_VIDEO_DECODE VK_KHR_VIDEO_DECODE |
Member
There was a problem hiding this comment.
Is there a patch we could backport instead?
Contributor
Author
There was a problem hiding this comment.
Not directly, there's FFmpeg/FFmpeg@eb0455d, but it doesn't apply cleanly.
Member
|
How can I test this? |
Contributor
Author
|
Well, it didn't build before and it does now. |
fabianhjr
approved these changes
Feb 25, 2023
Member
|
Unrelated to this merge request but is there a blocker on switching |
Member
|
@fabianhjr lots of packages that aren't compatible I imagine. Some packages even depend on features that are already deprecated in ffmpeg_4. We'd probably need a hydra jobset and then put all newly failing packages back to ffmpeg_4. If you're motivated to do that, go ahead! |
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)