From f5398d978f8843c03ed466c7fdb8a54167cd5f51 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrewdkaster@gmail.com>
Date: Wed, 7 Aug 2024 22:39:15 -0600
Subject: [PATCH] [libpng] Remove -DPNG_PREFIX=a option when apng feature
 enabled (#40280)

---
 ports/libpng/portfile.cmake | 3 ---
 ports/libpng/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/l-/libpng.json     | 5 +++++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index bffb074e6ec2b1..24eb37e4b92ed9 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -1,6 +1,5 @@
 # Download the apng patch
 set(LIBPNG_APNG_PATCH_PATH "")
-set(LIBPNG_APNG_OPTION "")
 if ("apng" IN_LIST FEATURES)
     if(VCPKG_HOST_IS_WINDOWS)
         # Get (g)awk and gzip installed
@@ -25,7 +24,6 @@ if ("apng" IN_LIST FEATURES)
             LOGNAME extract-patch.log
         )
     endif()
-    set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a")
 endif()
 
 vcpkg_from_github(
@@ -73,7 +71,6 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        ${LIBPNG_APNG_OPTION}
         ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
         ${LD_VERSION_SCRIPT_OPTION}
         -DPNG_STATIC=${PNG_STATIC}
diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json
index 68f027d13fa4dd..10c54485a0aebd 100644
--- a/ports/libpng/vcpkg.json
+++ b/ports/libpng/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpng",
   "version": "1.6.43",
-  "port-version": 2,
+  "port-version": 3,
   "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 f005ff4bfabb52..c11e8b96890bcf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4882,7 +4882,7 @@
     },
     "libpng": {
       "baseline": "1.6.43",
-      "port-version": 2
+      "port-version": 3
     },
     "libpopt": {
       "baseline": "1.16",
diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json
index 35eb13586e283d..f6b5ac36b53714 100644
--- a/versions/l-/libpng.json
+++ b/versions/l-/libpng.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9c7fd06f1cdd1dfc08b35ca9d6b0ba470cdd2470",
+      "version": "1.6.43",
+      "port-version": 3
+    },
     {
       "git-tree": "915cc8e8e0adbfb2708a310635217811a849d709",
       "version": "1.6.43",