Skip to content

Commit

Permalink
[libjxl] Fix wasm32-emscripten build (microsoft#38785)
Browse files Browse the repository at this point in the history
Fixes error during the CMake configuration step caused by the missing
execution of the third-party dependencies fetch script required for
Emscripten in libjxl CMakeLists.txt.
`
CMake Error at third_party/CMakeLists.txt:128 (message):
  Please run

C:/Users/david/vcpkg/buildtrees/libjxl/src/v0.10.2-fef900ea4e.clean/deps.sh
  to fetch the build dependencies.
`
Fix by using libpng provided by vcpkg disabling the bundled libpng
option.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- ~~[ ] SHA512s are updated for each updated download.~~
- ~~[ ] The "supports" clause reflects platforms that may be fixed by
this new version.~~
- ~~[ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- ~~[ ] Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
  • Loading branch information
davidepianca98 authored May 17, 2024
1 parent f8d65dc commit 7eb700c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions ports/libjxl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ vcpkg_cmake_configure(
-DJPEGXL_ENABLE_TCMALLOC=OFF
-DBUILD_TESTING=OFF
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
-DJPEGXL_BUNDLE_LIBPNG=OFF
MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_GIF
CMAKE_DISABLE_FIND_PACKAGE_JPEG
Expand Down
2 changes: 1 addition & 1 deletion ports/libjxl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libjxl",
"version-semver": "0.10.2",
"port-version": 2,
"port-version": 3,
"description": "JPEG XL image format reference implementation",
"homepage": "https://github.com/libjxl/libjxl",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4570,7 +4570,7 @@
},
"libjxl": {
"baseline": "0.10.2",
"port-version": 2
"port-version": 3
},
"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": "d400085f5ae0a78f03ae828d6c51ea9882e80f76",
"version-semver": "0.10.2",
"port-version": 3
},
{
"git-tree": "3dc92cfa2158aa56d401920855db77bb200395bf",
"version-semver": "0.10.2",
Expand Down

0 comments on commit 7eb700c

Please sign in to comment.