diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
| commit | d9e39bb4056795a70028b228a746da4889ca7c15 (patch) | |
| tree | 4853304e1e71e45becedfba5d83e3f5321e0b9c9 /ports/libflac | |
| parent | 1a9dadf855ab93ff0803fd1ce4ecceec5bf211f0 (diff) | |
| parent | ffa114aaa43e8bcdf880d6e2c47ee0ed46125070 (diff) | |
| download | vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.tar.gz vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/libflac')
| -rw-r--r-- | ports/libflac/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libflac/portfile.cmake | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL index 1a16c7a6a..afdb70cbe 100644 --- a/ports/libflac/CONTROL +++ b/ports/libflac/CONTROL @@ -1,4 +1,4 @@ Source: libflac
-Version: 1.3.2-5
+Version: 1.3.2-6
Description: Library for manipulating FLAC files
Build-Depends: libogg
diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index 236f51c8e..894107447 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -1,17 +1,20 @@ include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2)
-vcpkg_download_distfile(ARCHIVE
- URLS "http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz"
- FILENAME "flac-1.3.2.tar.xz"
- SHA512 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
- SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2
+vcpkg_download_distfile(FLAC_MAX_MIN_PATCH
+ URLS "https://github.com/xiph/flac/commit/64f47c2d71ffba5aa8cd1d2a447339fd95f362f9.patch"
+ FILENAME "flac-max-min.patch"
+ SHA512 7ce9ccf9f081b478664cccd677c10269567672a8aa3a60839ef203b3d0a626d2b2c2f34d4c7fc897c31a436d7c22fb740bca5449a465dab39d60655417fe7772)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO xiph/flac
+ REF 1.3.2
+ SHA512 d0e177cadee371940516864bf72e1eb3d101a5f2779c854ecb8a3361a654a9b9e7efd303c83e2f308bacc7e54298d37705f677e2b955d4a9fe3470c364fa45f3
+ HEAD_REF master
PATCHES
- "${CMAKE_CURRENT_LIST_DIR}/uwp-library-console.patch"
- "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile2.patch"
+ "${FLAC_MAX_MIN_PATCH}"
+ "${CMAKE_CURRENT_LIST_DIR}/uwp-library-console.patch"
+ "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile2.patch"
)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
|