aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lu <6320810+kevinlul@users.noreply.github.com>2020-05-11 17:59:30 -0400
committerGitHub <noreply@github.com>2020-05-11 14:59:30 -0700
commita7904a65b94adedaf66c756086c466e6755dd3cc (patch)
tree32b6ab08fd7ea2e31446d5ca8a809ef802e89805
parent6d5a1a897eca21b956d7b1de71af9a1f25c08e33 (diff)
downloadvcpkg-a7904a65b94adedaf66c756086c466e6755dd3cc.tar.gz
vcpkg-a7904a65b94adedaf66c756086c466e6755dd3cc.zip
[libpng] Fix missing symbols when compiling for ARM (#11162)
* [libpng] Fix missing symbols when compiling for ARM * [libpng] create src directory when it's not exists Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
-rw-r--r--ports/libpng/CONTROL2
-rw-r--r--ports/libpng/portfile.cmake6
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index 173c3a0d3..309a6dfc0 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,5 +1,5 @@
Source: libpng
-Version: 1.6.37-7
+Version: 1.6.37-8
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 cc3ee459c..af2ab012c 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
set(LIBPNG_VER 1.6.37)
# Download the apng patch
@@ -8,6 +6,9 @@ if ("apng" IN_LIST FEATURES)
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})
+ if (NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src)
+ file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src)
+ endif()
vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE
URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APG_PATCH_NAME}.gz"
FILENAME "${LIBPNG_APG_PATCH_NAME}.gz"
@@ -58,6 +59,7 @@ vcpkg_configure_cmake(
OPTIONS
${LIBPNG_APNG_OPTION}
${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
+ -DPNG_ARM_NEON=on
-DPNG_STATIC=${PNG_STATIC_LIBS}
-DPNG_SHARED=${PNG_SHARED_LIBS}
-DPNG_TESTS=OFF