[brotli] update to 1.2.0 (#47994)

ports/brotli/emscripten.patch

@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0589fc1..9b32b60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,10 +153,8 @@ foreach(lib ${BROTLI_LIBRARIES_CORE})
-   set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
- endforeach()
- 
--if(NOT BROTLI_EMSCRIPTEN)
- target_link_libraries(brotlidec brotlicommon)
- target_link_libraries(brotlienc brotlicommon)
--endif()
- 
- # For projects stuck on older versions of CMake, this will set the
- # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still

ports/brotli/fix-arm-uwp.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d868883..e4c5ecc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,6 +114,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   add_definitions(-DOS_MACOSX)
-   set(CMAKE_MACOS_RPATH TRUE)
-   set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+elseif(MSVC)
-+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- endif()
- 
- if(BROTLI_EMSCRIPTEN)

ports/brotli/install.patch

@@ -1,46 +1,46 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 61378cd..d868883 100644
+index 22b21d2..90003a8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,14 +142,13 @@ endif()
+@@ -152,14 +152,13 @@ endif()  # BUILD_SHARED_LIBS
  
- foreach(lib ${BROTLI_LIBRARIES_CORE})
+ foreach(lib ${BROTLI_SHARED_LIBRARIES} ${BROTLI_STATIC_LIBRARIES})
    target_link_libraries(${lib} ${LIBM_LIBRARY})
 -  set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
    set_target_properties(${lib} PROPERTIES
      VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}"
      SOVERSION "${BROTLI_ABI_COMPATIBILITY}")
-   if(NOT BROTLI_EMSCRIPTEN)
+   if (NOT BROTLI_EMSCRIPTEN)
      set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
    endif()
 -  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>")
 +  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
- endforeach()
+ endforeach()  # BROTLI_xxx_LIBRARIES
  
- if(NOT BROTLI_EMSCRIPTEN)
-@@ -176,11 +175,14 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES})
- if(NOT BROTLI_BUNDLED_MODE)
-   install(
-     TARGETS brotli
--    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+    RUNTIME DESTINATION tools/brotli
-+    BUNDLE DESTINATION tools/brotli
-+    CONFIGURATIONS Release
-   )
+ target_link_libraries(brotlidec brotlicommon)
+@@ -187,12 +186,15 @@ if (NOT BROTLI_BUNDLED_MODE)
+   if (BROTLI_BUILD_TOOLS)
+     install(
+       TARGETS brotli
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION tools/brotli
++      BUNDLE DESTINATION tools/brotli
++      CONFIGURATIONS Release
+     )
+   endif()
  
    install(
-     TARGETS ${BROTLI_LIBRARIES_CORE}
+     TARGETS ${BROTLI_SHARED_LIBRARIES} ${BROTLI_STATIC_LIBRARIES}
 +    EXPORT brotli
      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-@@ -189,7 +191,10 @@ if(NOT BROTLI_BUNDLED_MODE)
+@@ -201,7 +203,9 @@ if (NOT BROTLI_BUNDLED_MODE)
    install(
      DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 +    CONFIGURATIONS Release
    )
-+  
 +  install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
  endif()  # BROTLI_BUNDLED_MODE
  

ports/brotli/pkgconfig.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4c5ecc..0589fc1 100644
+index 90003a8..10632c8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -348,6 +348,12 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+@@ -368,6 +368,12 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
  
    string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
  

ports/brotli/portfile.cmake

@@ -2,13 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/brotli
     REF v${VERSION} # v1.1.0 
-    SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9
+    SHA512 f94542afd2ecd96cc41fd21a805a3da314281ae558c10650f3e6d9ca732b8425bba8fde312823f0a564c7de3993bdaab5b43378edab65ebb798cefb6fd702256
     HEAD_REF master
     PATCHES
         install.patch
-        fix-arm-uwp.patch
         pkgconfig.patch
-        emscripten.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,6 +20,9 @@ vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
 
 # Under emscripten the brotli executable tool is produced with .js extension but vcpkg_copy_tools
 # has no special behaviour in this case and searches for the tool name with no extension

ports/brotli/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "brotli",
-  "version": "1.1.0",
-  "port-version": 1,
+  "version": "1.2.0",
   "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.",
   "homepage": "https://github.com/google/brotli",
   "license": "MIT",

versions/b-/brotli.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0fb79bb13588702a9e06057745b4aed95ce5c861",
+      "version": "1.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4e5b5ae1ad26c80535c893cc0307121f0398549e",
       "version": "1.1.0",

versions/baseline.json

@@ -1457,8 +1457,8 @@
       "port-version": 3
     },
     "brotli": {
-      "baseline": "1.1.0",
-      "port-version": 1
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "brpc": {
       "baseline": "1.14.1",