[asmjit][botan][brotli] Update version (#13676)

4 files changed, 74 insertions, 72 deletions

diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index 7db9ffb6c..ce085e32f 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,5 +1,4 @@
 Source: brotli

-Version: 1.0.7

-Port-Version: 3

+Version: 1.0.9

 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/install.patch b/ports/brotli/install.patch
index 7896fbbb3..af3d3f3ea 100644
--- a/ports/brotli/install.patch
+++ b/ports/brotli/install.patch
@@ -1,56 +1,58 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index ac55f6b..e016967 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -166,12 +166,11 @@ endforeach()

- 

- foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static)

-   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}"

-     POSITION_INDEPENDENT_CODE TRUE)

--  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}")

-+  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)

- endforeach()

- 

- target_link_libraries(brotlidec brotlicommon)

-@@ -199,27 +198,35 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC})

- if(NOT BROTLI_BUNDLED_MODE)

-   install(

-     TARGETS brotli

--    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

-+    RUNTIME DESTINATION tools/brotli

-+    CONFIGURATIONS Release

-   )

- 

-+  if(BUILD_SHARED_LIBS)

-   install(

-     TARGETS ${BROTLI_LIBRARIES_CORE}

-+    EXPORT brotli

-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

-   )

--

-+  else()

-   install(

-     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}

-+    EXPORT brotli

-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

-   )

-+  endif()

- 

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

- 

- # Tests

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ff3401..46492d0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,14 +185,13 @@ endforeach()
+ 
+ foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS)
+   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)
+     set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+   endif()
+-  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}")
++  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
+ endforeach()
+ 
+ if(NOT BROTLI_EMSCRIPTEN)
+@@ -223,27 +222,35 @@ if(NOT BROTLI_EMSCRIPTEN)
+ if(NOT BROTLI_BUNDLED_MODE)
+   install(
+     TARGETS brotli
+-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    RUNTIME DESTINATION tools/brotli
++    CONFIGURATIONS Release
+   )
+ 
++  if(BUILD_SHARED_LIBS)
+   install(
+     TARGETS ${BROTLI_LIBRARIES_CORE}
++    EXPORT brotli
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
+-
++  else()
+   install(
+     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
++    EXPORT brotli
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
++  endif()
+ 
+   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
+ endif()  # BROTLI_EMSCRIPTEN
+ 
diff --git a/ports/brotli/pkgconfig.patch b/ports/brotli/pkgconfig.patch
index 8ceafe1b1..c11e0d493 100644
--- a/ports/brotli/pkgconfig.patch
+++ b/ports/brotli/pkgconfig.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c4b757f9..eed560c1d 100644
+index b1c654b..fcd9024 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -351,7 +351,7 @@ function(generate_pkg_config_path outvar path)
+@@ -390,7 +390,7 @@ function(generate_pkg_config_path outvar path)
    set("${outvar}" "${${outvar}}" PARENT_SCOPE)
  endfunction(generate_pkg_config_path)
  
@@ -11,17 +11,18 @@ index 2c4b757f9..eed560c1d 100644
    file(READ ${INPUT_FILE} TEXT)
  
    set(PREFIX "${CMAKE_INSTALL_PREFIX}")
-@@ -366,14 +366,21 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+@@ -404,15 +404,22 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+   string(REGEX REPLACE "@includedir@" "${INCLUDEDIR}" TEXT ${TEXT})
  
    string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
- 
++  
 +  if(BUILD_SHARED_LIBS)
 +    set(LIB_NAME "${SHARED_TARGET}")
 +  else()
 +    set(LIB_NAME "${STATIC_TARGET}")
 +  endif()
 +  string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT})
-+
+ 
    file(WRITE ${OUTPUT_FILE} ${TEXT})
  endfunction()
  
@@ -34,40 +35,40 @@ index 2c4b757f9..eed560c1d 100644
 -transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
 +transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static)
  
+ if(NOT BROTLI_EMSCRIPTEN)
  if(NOT BROTLI_BUNDLED_MODE)
-   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc"
 diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
-index 2a8cf7a35..464a21292 100644
+index 10ca969..7736344 100644
 --- a/scripts/libbrotlicommon.pc.in
 +++ b/scripts/libbrotlicommon.pc.in
 @@ -7,5 +7,5 @@ Name: libbrotlicommon
  URL: https://github.com/google/brotli
  Description: Brotli common dictionary library
  Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lbrotlicommon
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
 +Libs: -L${libdir} -l@lib_name@
  Cflags: -I${includedir}
 diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
-index 6f8ef2e41..f87d3f65f 100644
+index e7c3124..a7dc8ce 100644
 --- a/scripts/libbrotlidec.pc.in
 +++ b/scripts/libbrotlidec.pc.in
 @@ -7,6 +7,6 @@ Name: libbrotlidec
  URL: https://github.com/google/brotli
  Description: Brotli decoder library
  Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lbrotlidec
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
 +Libs: -L${libdir} -l@lib_name@
  Requires.private: libbrotlicommon >= 1.0.2
  Cflags: -I${includedir}
 diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
-index 2098afe2c..7b6371bcb 100644
+index 4dd0811..eb2712e 100644
 --- a/scripts/libbrotlienc.pc.in
 +++ b/scripts/libbrotlienc.pc.in
 @@ -7,6 +7,6 @@ Name: libbrotlienc
  URL: https://github.com/google/brotli
  Description: Brotli encoder library
  Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lbrotlienc
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
 +Libs: -L${libdir} -l@lib_name@
  Requires.private: libbrotlicommon >= 1.0.2
  Cflags: -I${includedir}
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index 81960a9ee..6d28f2650 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/brotli
-    REF v1.0.7
-    SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
+    REF e61745a6b7add50d380cfd7d3883dd6c62fc2c71 # v1.0.9
+    SHA512 303444695600b70ce59708e06bf21647d9b8dd33d772c53bbe49320f2f8f95ca8a7d6df2d29b7f36ff99001967e2d28380e0e305d778031940a3a5c6585f9a4f
     HEAD_REF master
     PATCHES
         install.patch