-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config #39077
Conversation
dg0yt
commented
Jun 1, 2024
•
edited
Loading
edited
- 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 |
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess you probably want to remove this patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed. And removed another orphan patch file.
"port-version": 7 | ||
}, | ||
{ | ||
"git-tree": "bad8797d669a583736212969fbbf6298497880b2", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You overwrote the old git tree
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I resolved the merge conflict: 6.1.1#6 now from vcpkg master, 6.1.1#7 now by this PR