aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorAlbert Huang <alberthdev@users.noreply.github.com>2020-10-13 16:48:57 -0400
committerGitHub <noreply@github.com>2020-10-13 13:48:57 -0700
commitc633ef256fc2702090cd27925d0eeb5075beb844 (patch)
tree11c67c1cfe26038e83fc00255d75e23ae0ba3f6b /ports
parentee736e7656e0e323f4156dd928e6b1732f262bcb (diff)
downloadvcpkg-c633ef256fc2702090cd27925d0eeb5075beb844.tar.gz
vcpkg-c633ef256fc2702090cd27925d0eeb5075beb844.zip
[libpng[apng]] Add msys installation to use awk (#13838)
* libpng[apng] - add msys installation to use awk, which fixes the apng prefix problem * [libpng] Update CONTROL version * Fix incorrect args to vcpkg_acquire_msys Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Diffstat (limited to 'ports')
-rw-r--r--ports/libpng/CONTROL2
-rw-r--r--ports/libpng/portfile.cmake5
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index 988f95ebf..7c953c3fa 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,6 +1,6 @@
Source: libpng
Version: 1.6.37
-Port-Version: 11
+Port-Version: 12
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.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index d366283b1..d2087caa6 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -3,6 +3,11 @@ set(LIBPNG_VER 1.6.37)
# Download the apng patch
set(LIBPNG_APNG_OPTION )
if ("apng" IN_LIST FEATURES)
+ # Get (g)awk installed
+ vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
+ set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin")
+ vcpkg_add_to_path("${AWK_EXE_PATH}")
+
set(LIBPNG_APG_PATCH_NAME libpng-${LIBPNG_VER}-apng.patch)
set(LIBPNG_APG_PATCH_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APG_PATCH_NAME})
if (NOT EXISTS ${LIBPNG_APG_PATCH_PATH})