Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

3 files changed, 34 insertions, 23 deletions

diff --git a/ports/libflac/CMakeLists.txt b/ports/libflac/CMakeLists.txt
index 518419c4f..d6f01399a 100644
--- a/ports/libflac/CMakeLists.txt
+++ b/ports/libflac/CMakeLists.txt
@@ -7,15 +7,22 @@ if(NOT DEFINED LIBFLAC_ARCHITECTURE)
     message(FATAL_ERROR "Target architecture not specified")
 endif()
 
-file(GLOB LIBFLAC_SOURCES
-    ${PROJECT_SOURCE_DIR}/src/libFLAC/*.c
-    ${PROJECT_SOURCE_DIR}/src/share/win_utf8_io/win_utf8_io.c)
+file(GLOB LIBFLAC_SOURCES src/libFLAC/*.c)
 
-file(GLOB LIBFLACXX_SOURCES
-    ${PROJECT_SOURCE_DIR}/src/libFLAC++/*.cpp)
+if(WIN32)
+    list(APPEND LIBFLAC_SOURCES src/share/win_utf8_io/win_utf8_io.c)
+else()
+    list(FILTER LIBFLAC_SOURCES EXCLUDE REGEX "windows[^/]*$")
+
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config.h "#include <inttypes.h>")
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    add_definitions(-DHAVE_CONFIG_H)
+endif()
+
+file(GLOB LIBFLACXX_SOURCES src/libFLAC++/*.cpp)
 
-include_directories(${PROJECT_SOURCE_DIR}/include)
-include_directories(${PROJECT_SOURCE_DIR}/src/libFLAC/include)
+include_directories(include)
+include_directories(src/libFLAC/include)
 
 if(NOT LIBFLAC_ARCHITECTURE MATCHES arm)
     add_definitions(-DFLAC__SSE_OS)
@@ -44,14 +51,15 @@ endif()
 add_definitions(-DPACKAGE_VERSION="1.3.2")
 add_definitions(-DFLAC__HAS_OGG)
 add_definitions(-DFLAC__ALIGN_MALLOC_DATA) # 32 byte boundary
+add_definitions(-DHAVE_LROUND)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
 
 add_library(libFLAC ${LIBFLAC_SOURCES})
 add_library(libFLACXX ${LIBFLACXX_SOURCES})
 
-set_target_properties(libFLAC PROPERTIES OUTPUT_NAME flac)
-set_target_properties(libFLACXX PROPERTIES OUTPUT_NAME flac++)
+set_target_properties(libFLAC PROPERTIES OUTPUT_NAME FLAC)
+set_target_properties(libFLACXX PROPERTIES OUTPUT_NAME FLAC++)
 
 find_library(OGG_LIBRARY ogg)
 find_path(OGG_INCLUDE_DIR ogg/ogg.h)
@@ -73,10 +81,10 @@ install(TARGETS libFLAC libFLACXX
     LIBRARY DESTINATION lib)
 
 if(NOT DEFINED LIBFLAC_SKIP_HEADERS)
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/FLAC/
+    install(DIRECTORY include/FLAC/
         DESTINATION include/FLAC
         FILES_MATCHING PATTERN "*.h")
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/FLAC++/
+    install(DIRECTORY include/FLAC++/
         DESTINATION include/FLAC++
         FILES_MATCHING PATTERN "*.h")
 endif()
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL
index ca2995d68..afdb70cbe 100644
--- a/ports/libflac/CONTROL
+++ b/ports/libflac/CONTROL
@@ -1,4 +1,4 @@
 Source: libflac

-Version: 1.3.2-4

+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)