[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config#39077
Merged
vicroms merged 17 commits intomicrosoft:masterfrom Jun 6, 2024
Merged
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config#39077vicroms merged 17 commits intomicrosoft:masterfrom
vicroms merged 17 commits intomicrosoft:masterfrom
Conversation
Contributor
Author
|
If there wasn't the lipo hack, I would have tried to port ffmpeg to |
Thomas1664
reviewed
Jun 2, 2024
ports/ffmpeg/portfile.cmake
Outdated
| 0004-dependencies.patch | ||
| 0005-fix-nasm.patch #upstreamed in future version | ||
| 0006-fix-StaticFeatures.patch | ||
| #0006-fix-StaticFeatures.patch |
Contributor
There was a problem hiding this comment.
I guess you probably want to remove this patch?
Contributor
Author
There was a problem hiding this comment.
Removed. And removed another orphan patch file.
Cheney-W
previously approved these changes
Jun 4, 2024
Thomas1664
reviewed
Jun 4, 2024
| "port-version": 7 | ||
| }, | ||
| { | ||
| "git-tree": "bad8797d669a583736212969fbbf6298497880b2", |
Contributor
There was a problem hiding this comment.
You overwrote the old git tree
Contributor
Author
There was a problem hiding this comment.
No, I resolved the merge conflict: 6.1.1#6 now from vcpkg master, 6.1.1#7 now by this PR
7 tasks
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
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.
Uh oh!
There was an error while loading. Please reload this page.