From 27149f3d4fe3956c63a75e6d288bed920ef0b8c2 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Mon, 30 Jun 2025 10:03:09 -0700
Subject: [PATCH 1/2] Fix setting JPEGXL_REQUIRES_TYPEand minimize the patch.

Fixes https://github.com/microsoft/vcpkg/pull/46177/files#r2172842117
---
 ports/libjxl/msvc-remove-libm.patch | 35 +++++++++++++----------------
 ports/libjxl/vcpkg.json             |  2 +-
 versions/l-/libjxl.json             |  5 +++++
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ports/libjxl/msvc-remove-libm.patch b/ports/libjxl/msvc-remove-libm.patch
index 49b8ddd7f0bfa6..051557a8014026 100644
--- a/ports/libjxl/msvc-remove-libm.patch
+++ b/ports/libjxl/msvc-remove-libm.patch
@@ -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"
diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json
index 3dadafa5d83ea1..d3077d8d81f97b 100644
--- a/ports/libjxl/vcpkg.json
+++ b/ports/libjxl/vcpkg.json
@@ -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",
diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json
index 4710eddb39c805..e4a59e538ee91a 100644
--- a/versions/l-/libjxl.json
+++ b/versions/l-/libjxl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec154d710200dced15443c1c292fbfa623a18439",
+      "version-semver": "0.11.1",
+      "port-version": 3
+    },
     {
       "git-tree": "1ff477143618a294bb1f624cc075c4ea42059377",
       "version-semver": "0.11.1",

From d4a32a93625f5be2f5a663c1e088e3c324e6d60c Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Mon, 30 Jun 2025 10:11:56 -0700
Subject: [PATCH 2/2] Go home Git, you're drunk

---
 versions/baseline.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 31b3247c0b867b..52c66fd08a1a73 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4906,7 +4906,7 @@
     },
     "libjxl": {
       "baseline": "0.11.1",
-      "port-version": 2
+      "port-version": 3
     },
     "libkeyfinder": {
       "baseline": "2.2.8",