From e2b2f49dc6a90d9ff0a3e6dad2d67ab3ed800e0a Mon Sep 17 00:00:00 2001 From: jasjuang Date: Mon, 6 Nov 2017 22:05:04 -0800 Subject: [PATCH] [libpng] use vcpkg_from_github --- ports/libpng/CONTROL | 2 +- ports/libpng/portfile.cmake | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index b5f59e6cf16813..89ea0706533aad 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.34-1 +Version: 1.6.34-2 Build-Depends: zlib 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 3b154506cbc40a..fe4fb72509c88c 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -1,14 +1,13 @@ include(vcpkg_common_functions) -set(LIBPNG_VERSION 1.6.34) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-${LIBPNG_VERSION}) - -vcpkg_download_distfile(ARCHIVE - URLS "https://downloads.sourceforge.net/project/libpng/libpng16/${LIBPNG_VERSION}/libpng-${LIBPNG_VERSION}.tar.xz" - "https://downloads.sourceforge.net/project/libpng/libpng16/older-releases/${LIBPNG_VERSION}/libpng-${LIBPNG_VERSION}.tar.xz" - FILENAME "libpng-${LIBPNG_VERSION}.tar.xz" - SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO glennrp/libpng + REF v1.6.34 + SHA512 23b6112a1d16a34c8037d5c5812944d4385fc96ed819a22172776bdd5acd3a34e55f073b46087b77d1c12cecc68f9e8ba7754c86b5ab6ed3016063e1c795de7a + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) + vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES