[libpng] fix Android ARM triplet build failure (#18115)

* [libpng] use check for PNG_ARM_NEON

* arm-android build keeps failing

* [libpng] add host dependency

* [libpng] update baseline

* [libpng] use 'version-string'

* Update ports/libpng/vcpkg.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [libpng] update baseline

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

ports/libpng/CONTROL

@@ -1,9 +0,0 @@
-Source: libpng
-Version: 1.6.37
-Port-Version: 14
-Build-Depends: zlib
-Homepage: https://github.com/glennrp/libpng
-Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
-
-Feature: apng
-Description: This is backward compatible with the regular libpng, both in library usage and format.

ports/libpng/portfile.cmake

@@ -55,24 +55,26 @@ else()
 endif()
 
 set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION )
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL iOS)
+if(VCPKG_TARGET_IS_IOS)
-    set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF")
+    list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF")
 endif()
 
 set(LD_VERSION_SCRIPT_OPTION )
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Android)
+if(VCPKG_TARGET_IS_ANDROID)
     set(LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF")
+    # for armeabi-v7a, check whether NEON is available
+    list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check")
+else()
+    list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on")
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DPNG_MAN_DIR=share/${PORT}/man
         ${LIBPNG_APNG_OPTION}
         ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
         ${LD_VERSION_SCRIPT_OPTION}
-        -DPNG_ARM_NEON=on
         -DPNG_STATIC=${PNG_STATIC_LIBS}
         -DPNG_SHARED=${PNG_SHARED_LIBS}
         -DPNG_TESTS=OFF
@@ -82,9 +84,9 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng)
 set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc")
 if(EXISTS ${_file})
     file(READ "${_file}" _contents)

ports/libpng/vcpkg.json

@@ -0,0 +1,23 @@
+{
+  "name": "libpng",
+  "version": "1.6.37",
+  "port-version": 15,
+  "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
+  "homepage": "https://github.com/glennrp/libpng",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ],
+  "features": {
+    "apng": {
+      "description": "This is backward compatible with the regular libpng, both in library usage and format"
+    }
+  }
+}

versions/baseline.json

@@ -3442,7 +3442,7 @@
     },
     "libpng": {
       "baseline": "1.6.37",
-      "port-version": 14
+      "port-version": 15
     },
     "libpopt": {
       "baseline": "1.16-13",

versions/l-/libpng.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09cdb4f54e6cc8a6a1eebbbc4c9f786d0ee652b8",
+      "version": "1.6.37",
+      "port-version": 15
+    },
     {
       "git-tree": "67dd33a2c4a539e58ec4898b7b908baca3840063",
       "version-string": "1.6.37",