diff --git a/ports/libjxl/fix-tools-build.patch b/ports/libjxl/fix-tools-build.patch deleted file mode 100644 index 8209d20cf5..0000000000 --- a/ports/libjxl/fix-tools-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/jxl_extras.cmake b/lib/jxl_extras.cmake -index 597f691..b1c184c 100644 ---- a/lib/jxl_extras.cmake -+++ b/lib/jxl_extras.cmake -@@ -151,7 +151,7 @@ endif() - - ### Library that does not depend on internal parts of jxl library. - ### Used by cjxl and djxl binaries. --add_library(jxl_extras_codec -+add_library(jxl_extras_codec STATIC - $ - ) - target_link_libraries(jxl_extras_codec PRIVATE diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake index 3d01b49beb..a29781b852 100644 --- a/ports/libjxl/portfile.cmake +++ b/ports/libjxl/portfile.cmake @@ -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 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index 907d1a2426..13cc893b4c 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index b63b081e63..7436a27033 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4669,8 +4669,8 @@ "port-version": 0 }, "libjxl": { - "baseline": "0.10.2", - "port-version": 4 + "baseline": "0.11.0", + "port-version": 0 }, "libkeyfinder": { "baseline": "2.2.8", diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index 1ad64a03bc..73342e4a92 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b34b45d6f795bc96a17c6288365baa25bac6cfb", + "version-semver": "0.11.0", + "port-version": 0 + }, { "git-tree": "41e26aeaddac21391e72200277a3bcda04cd7072", "version-semver": "0.10.2",