Skip to content
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

[libjxl] Update to v0.11.0 #40971

Merged
merged 1 commit into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ports/libjxl/fix-tools-build.patch

This file was deleted.

3 changes: 1 addition & 2 deletions ports/libjxl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libjxl/libjxl
REF "v${VERSION}"
SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e
SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053
HEAD_REF main
PATCHES
fix-dependencies.patch
fix-tools-build.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch has been applied to the new version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to not mention it, but this was indeed patched upstream in libjxl/libjxl@a741085

)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
3 changes: 1 addition & 2 deletions ports/libjxl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libjxl",
"version-semver": "0.10.2",
"port-version": 4,
"version-semver": "0.11.0",
"description": "JPEG XL image format reference implementation",
"homepage": "https://github.com/libjxl/libjxl",
"license": "BSD-3-Clause",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4665,8 +4665,8 @@
"port-version": 0
},
"libjxl": {
"baseline": "0.10.2",
"port-version": 4
"baseline": "0.11.0",
"port-version": 0
},
"libkeyfinder": {
"baseline": "2.2.8",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libjxl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4b34b45d6f795bc96a17c6288365baa25bac6cfb",
"version-semver": "0.11.0",
"port-version": 0
},
{
"git-tree": "41e26aeaddac21391e72200277a3bcda04cd7072",
"version-semver": "0.10.2",
Expand Down