From 5a48f2eb0f2ecba30cdf83dd4cf76d65eb259c3f Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 4 Jan 2024 02:38:33 +0100
Subject: [PATCH] [libpng] Search libm in implicit link dirs (#35924)

---
 ports/libpng/libm.patch     | 17 +++++++++++++++++
 ports/libpng/portfile.cmake |  1 +
 ports/libpng/vcpkg.json     |  1 +
 versions/baseline.json      |  2 +-
 versions/l-/libpng.json     |  5 +++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ports/libpng/libm.patch

diff --git a/ports/libpng/libm.patch b/ports/libpng/libm.patch
new file mode 100644
index 0000000000..a60e65cd1c
--- /dev/null
+++ b/ports/libpng/libm.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 958b1d6..21c8941 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,6 +84,12 @@ endif()
+ 
+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN)
+   find_library(M_LIBRARY m)
++  if(NOT M_LIBRARY)
++    find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
++    if(M_LIBRARY)
++      set(M_LIBRARY m)
++    endif()
++  endif()
+   if(NOT M_LIBRARY)
+     set(M_LIBRARY "")
+   endif()
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index dc7ea22cd8..1f09145668 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -38,6 +38,7 @@ vcpkg_from_github(
         "${LIBPNG_APNG_PATCH_PATH}"
         cmake.patch
         fix-export-targets.patch
+        libm.patch
         pkgconfig.patch
         fix-msa-support-for-mips.patch
 )
diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json
index 46bb5bca96..7661399e25 100644
--- a/ports/libpng/vcpkg.json
+++ b/ports/libpng/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libpng",
   "version": "1.6.40",
+  "port-version": 1,
   "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
   "homepage": "https://github.com/glennrp/libpng",
   "license": "libpng-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7a36704709..f9196b835d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4682,7 +4682,7 @@
     },
     "libpng": {
       "baseline": "1.6.40",
-      "port-version": 0
+      "port-version": 1
     },
     "libpopt": {
       "baseline": "1.16",
diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json
index 22ee644dc2..b3dbf52a54 100644
--- a/versions/l-/libpng.json
+++ b/versions/l-/libpng.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8b6d2c1150541a94c0ca5b2f060eb21eed4a40b2",
+      "version": "1.6.40",
+      "port-version": 1
+    },
     {
       "git-tree": "1a2a7f489e57c9e55e049b7c5f0a28c8ff4464ed",
       "version": "1.6.40",