From c6b58e366a5740f9c04a074b7afa008b37f0a5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 26 Feb 2020 06:18:40 +0800
Subject: [PATCH] [brotli] Fix build failure on arm64-uwp (#10116)

* [brotli] Fix build failure on arm64-uwp

* update baseline
---
 ports/brotli/CONTROL           |  2 +-
 ports/brotli/fix-arm-uwp.patch | 13 +++++++++++++
 ports/brotli/portfile.cmake    | 12 ++++++------
 scripts/ci.baseline.txt        |  2 --
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 ports/brotli/fix-arm-uwp.patch

diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index aef306101..ff152f83b 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,4 +1,4 @@
 Source: brotli
-Version: 1.0.7
+Version: 1.0.7-1
 Homepage: https://github.com/google/brotli
 Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/fix-arm-uwp.patch b/ports/brotli/fix-arm-uwp.patch
new file mode 100644
index 000000000..7ed3fcd3d
--- /dev/null
+++ b/ports/brotli/fix-arm-uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6c6054..2c4b757 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   add_definitions(-DOS_FREEBSD)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+   add_definitions(-DOS_MACOSX)
++elseif(MSVC)
++  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ endif()
+ 
+ function(transform_sources_list INPUT_FILE OUTPUT_FILE)
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index fa0413711..6fa75937c 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -1,12 +1,12 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/brotli
     REF v1.0.7
     SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
     HEAD_REF master
-    PATCHES install.patch
+    PATCHES
+        install.patch
+        fix-arm-uwp.patch
 )
 
 vcpkg_configure_cmake(
@@ -17,10 +17,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/brotli RENAME copyright)
-
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b31beb813..47186487a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -187,8 +187,6 @@ box2d:x64-uwp=fail
 box2d:arm-uwp=fail
 breakpad:arm64-windows=fail
 breakpad:x64-osx=fail
-brotli:arm-uwp=fail
-brotli:x64-uwp=fail
 bullet3:arm64-windows=fail
 bullet3:arm-uwp=fail
 bullet3:x64-uwp=fail