Skip to content

[libjxl] Fix setting JPEGXL_REQUIRES_TYPE and minimize the patch #46240

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.

Sign up for GitHub

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

Merged
Billy O'Neal (BillyONeal) merged 2 commits into from
Jun 30, 2025
+22 −22
Merged

[libjxl] Fix setting JPEGXL_REQUIRES_TYPE and minimize the patch #46240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27149f3
Fix setting JPEGXL_REQUIRES_TYPEand minimize the patch.
BillyONeal Jun 30, 2025
d4a32a9
Go home Git, you're drunk
BillyONeal Jun 30, 2025
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
35 changes: 15 additions & 20 deletions ports/libjxl/msvc-remove-libm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
--- a/lib/jxl.cmake 2024-11-26 05:02:35.000000000 -0800
+++ b/lib/jxl.cmake 2025-06-26 08:37:25.999263200 -0700
@@ -269,12 +269,15 @@
set(JPEGXL_LIBRARY_REQUIRES
"libhwy libbrotlienc libbrotlidec libjxl_cms")
diff --git a/lib/jxl.cmake b/lib/jxl.cmake
index 404b976..119f49e 100644
--- a/lib/jxl.cmake
+++ b/lib/jxl.cmake
@@ -271,10 +271,14 @@ set(JPEGXL_LIBRARY_REQUIRES

-if (BUILD_SHARED_LIBS)
- set(JPEGXL_REQUIRES_TYPE "Requires.private")
- set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
-else()
- set(JPEGXL_REQUIRES_TYPE "Requires")
- set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
+# MSVCRT bundles math functions
+if(NOT MSVC)
+ if (BUILD_SHARED_LIBS)
+ set(JPEGXL_REQUIRES_TYPE "Requires.private")
+ set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
+ else()
+ set(JPEGXL_REQUIRES_TYPE "Requires")
+ set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
+ endif()
if (BUILD_SHARED_LIBS)
set(JPEGXL_REQUIRES_TYPE "Requires.private")
+ if (NOT MSVC)
set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
+ endif()
else()
set(JPEGXL_REQUIRES_TYPE "Requires")
+ if (NOT MSVC)
set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
+ endif()
endif()

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl.pc.in"
2 changes: 1 addition & 1 deletion ports/libjxl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libjxl",
"version-semver": "0.11.1",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4906,7 +4906,7 @@
},
"libjxl": {
"baseline": "0.11.1",
"port-version": 2
"port-version": 3
},
"libkeyfinder": {
"baseline": "2.2.8",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libjxl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ec154d710200dced15443c1c292fbfa623a18439",
"version-semver": "0.11.1",
"port-version": 3
},
{
"git-tree": "1ff477143618a294bb1f624cc075c4ea42059377",
"version-semver": "0.11.1",
Expand Down