Skip to content

Meta: Update vcpkg for patched libjxl port and remove our overlay port - #5239

Merged
ADKaster merged 1 commit into
LadybirdBrowser:masterfrom
ayeteadoe:vcpkg-get-new-libjxl-version
Jul 9, 2025
Merged

ADKaster merged 1 commit into
LadybirdBrowser:masterfrom
ayeteadoe:vcpkg-get-new-libjxl-version

Conversation

@ayeteadoe

Copy link
Copy Markdown
Contributor

microsoft/vcpkg#46177 has been merged into vcpkg, so this updates our vcpkg to the commit that fixes libjxl, removes our custom overlay port that has the same patch, and bumps our libjxl version in the vcpkg manifest to point to the port with my patch

@ADKaster ADKaster added the windows Related to the Windows platform label Jun 28, 2025
@ayeteadoe
ayeteadoe force-pushed the vcpkg-get-new-libjxl-version branch 2 times, most recently from cc63fbc to 9136f4a Compare July 1, 2025 20:19
@github-actions github-actions Bot added the conflicts Pull request has merge conflicts that need resolution label Jul 2, 2025
@github-actions

github-actions Bot commented Jul 2, 2025

Copy link
Copy Markdown

Your pull request has conflicts that need to be resolved before it can be reviewed and merged. Make sure to rebase your branch on top of the latest master.

@ayeteadoe
ayeteadoe force-pushed the vcpkg-get-new-libjxl-version branch from 9136f4a to ab0d0e7 Compare July 3, 2025 01:58
@github-actions github-actions Bot removed the conflicts Pull request has merge conflicts that need resolution label Jul 3, 2025
@ayeteadoe
ayeteadoe force-pushed the vcpkg-get-new-libjxl-version branch from ab0d0e7 to 73bb8b0 Compare July 4, 2025 14:55
@ADKaster
ADKaster force-pushed the vcpkg-get-new-libjxl-version branch from 73bb8b0 to 28ba821 Compare July 9, 2025 21:55
@ADKaster
ADKaster merged commit 8b778de into LadybirdBrowser:master Jul 9, 2025
@ayeteadoe
ayeteadoe deleted the vcpkg-get-new-libjxl-version branch July 10, 2025 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

windows Related to the Windows platform

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants