Skip to content

[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config#39077

Merged
vicroms merged 17 commits intomicrosoft:masterfrom
dg0yt:fdk-aac
Jun 6, 2024
Merged

[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config#39077
vicroms merged 17 commits intomicrosoft:masterfrom
dg0yt:fdk-aac

Conversation

@dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Jun 1, 2024

@dg0yt dg0yt mentioned this pull request Jun 1, 2024
@dg0yt
Copy link
Contributor Author

dg0yt commented Jun 1, 2024

If there wasn't the lipo hack, I would have tried to port ffmpeg to vcpkg_configure_make a long time ago.

@dg0yt dg0yt changed the title [fdk-aac,ffmpeg] Fix and use pkg-config [alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config Jun 1, 2024
@dg0yt dg0yt marked this pull request as ready for review June 2, 2024 17:16
0004-dependencies.patch
0005-fix-nasm.patch #upstreamed in future version
0006-fix-StaticFeatures.patch
#0006-fix-StaticFeatures.patch
Copy link
Contributor

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?

Copy link
Contributor Author

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.

@Cheney-W Cheney-W added category:code-cleanup category:port-bug The issue is with a library, which is something the port should already support labels Jun 3, 2024
Cheney-W
Cheney-W previously approved these changes Jun 4, 2024
@Cheney-W Cheney-W added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jun 4, 2024
"port-version": 7
},
{
"git-tree": "bad8797d669a583736212969fbbf6298497880b2",
Copy link
Contributor

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

Copy link
Contributor Author

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

@vicroms vicroms merged commit 2017886 into microsoft:master Jun 6, 2024
@dg0yt dg0yt deleted the fdk-aac branch June 6, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[ffmpeg] Build error on arm64-android

4 participants