[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config #39077
Conversation
This file contains 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
Contributor
dg0yt
commented
Jun 1, 2024
•
dg0yt
commented
- Setup and use pkg-config for ffmpeg dependencies. [ffmpeg] Update to 7.0. #38011 (comment).
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes [ffmpeg] Build error on arm64-android #36852.
|
If there wasn't the lipo hack, I would have tried to port ffmpeg to |
dg0yt
changed the title
Thomas1664
reviewed
Jun 2, 2024
ports/ffmpeg/portfile.cmake
Outdated
| 0005-fix-nasm.patch #upstreamed in future version | ||
| 0006-fix-StaticFeatures.patch | ||
| #0006-fix-StaticFeatures.patch |
There was a problem hiding this comment.
I guess you probably want to remove this patch?
There was a problem hiding this comment.
Removed. And removed another orphan patch file.
Cheney-W
added
category:code-cleanup
Cheney-W
previously approved these changes
Jun 4, 2024
Thomas1664
reviewed
Jun 4, 2024
| "port-version": 7 | ||
| }, | ||
| { | ||
| "git-tree": "bad8797d669a583736212969fbbf6298497880b2", |
There was a problem hiding this comment.
You overwrote the old git tree
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
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.