Merge branch 'master' into ffmpeg

ports/abseil/portfile.cmake

@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
+    SHA512 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f
     HEAD_REF master
 )
 

ports/abseil/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "abseil",
-  "version": "20230802.0",
+  "version": "20230802.1",
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",

ports/ade/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/ade
-    REF v0.1.2
-    SHA512 2761cf9ccb92d1df6f2d61964a64085470fff78b92d040fd8411d4c3a1f238b95eb4484a9624ab800e8fb4e5144eea32dee9a9047b9b67fad83d0856d32c91e9
+    REF "v${VERSION}"
+    SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711
     HEAD_REF master
 )
 

ports/ade/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ade",
-  "version": "0.1.2",
+  "version-string": "0.1.2c",
   "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.",
   "dependencies": [
     {

ports/apr/portfile.cmake

@@ -1,10 +1,10 @@
 
-set(VERSION 1.7.2)
+set(VERSION 1.7.4)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
-    SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
+    SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH

ports/apr/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "apr",
-  "version": "1.7.2",
-  "port-version": 1,
+  "version": "1.7.4",
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",

ports/asio/portfile.cmake

@@ -3,10 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-28-0
-    SHA512 0d635c40a28b6427e2cb6b9c89ab53dba7d3a237df2279148ca05fa899d6f8039a131929230e5ca1dbc7477be784e3da9a6cb68456cbf194178510621556e467
+    REF asio-1-28-1
+    SHA512 4ba0944b203e18524016de2e21ffa0fa6325414af5f6cff6d02450c15e0d7111cec91f7f125ae78d3b3a6f76c6b2c7155738d1830b3250e98c68b5304328f345
     HEAD_REF master
-    PATCHES fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313
 )
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency

ports/asio/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "asio",
-  "version": "1.28.0",
-  "port-version": 1,
+  "version": "1.28.1",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",

ports/bde/portfile.cmake

@@ -11,8 +11,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH TOOLS_PATH
     REPO "bloomberg/bde-tools"
     REF "${BDE_TOOLS_VERSION}"
-    SHA512 3c39da8d1ea40459e36e11ada93cc2821ae1b16a831f93cccab463996394a400cc08bb1654642eae1aa5187f139d7fb80c4729e464051eee182133eb8a74158d
-    HEAD_REF main
+    SHA512 e59560810acfe562d85a13585d908decce17ec76c89bd61f43dac56cddfdf6c56269566da75730f8eda14b5fc046d2ebce959b24110a428e8eac0e358d2597c2
+    HEAD_REF 3.123.0.0
 )
 
 message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}")
@@ -24,8 +24,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "bloomberg/bde"
     REF "${VERSION}"
-    SHA512 810b4a06a08739dcd990751dd543aa7dc58355f9d64a7c96ef0cf45c81501946434db42ad5bcf5d16110d5a463586b587ce09a446136e824298f39a8a871b490
-    HEAD_REF main
+    SHA512 f1c3c5ddec7ff1d301ca6f8ab00e6be42ab6a5fa3c889639e7797df74f68425d57d8b71978098331c9247820c7c831edeaf4427ae64c890d81f704343b1bb112
+    HEAD_REF 3.123.0.0
 )
 
 vcpkg_cmake_configure(
@@ -49,12 +49,16 @@ vcpkg_cmake_build()
 # Install release
 vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/)
+list(APPEND SUBPACKAGES "ryu" "inteldfp" "pcre2" "s_baltst" "bsl" "bdl" "bal")
+include(GNUInstallDirs) # needed for CMAKE_INSTALL_LIBDIR
+foreach(subpackage IN LISTS SUBPACKAGES)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME ${subpackage} CONFIG_PATH /${CMAKE_INSTALL_LIBDIR}/cmake/${subpackage} DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endforeach()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/${CMAKE_INSTALL_LIBDIR}/cmake")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE
      DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
      RENAME copyright
 )
-
 vcpkg_fixup_pkgconfig()

ports/bde/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "bde",
-  "version": "3.117.0.0",
+  "version": "3.123.0.0",
   "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
   "supports": "!windows & !arm & !android & !osx",
   "dependencies": [

ports/bext-sml2/portfile.cmake

@@ -0,0 +1,15 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boost-ext/sml2
+    REF 6989e01776ab0d51a7b9463c307855d4a274888f
+    SHA512 215e404769b80da01735d4038ec8fd63804ef3dfb6b65fcbce38b9e90491d4758c28338a1d259776b2258e35f14a4fb27330fa730800cf7289d147cf5e580d4e
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/sml2"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost"
+)
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")

ports/bext-sml2/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "bext-sml2",
+  "version-date": "2023-09-20",
+  "description": "Your scalable C++20 one header only State Machine Library with no dependencies",
+  "homepage": "https://github.com/boost-ext/sml2",
+  "license": "BSL-1.0"
+}

ports/brotli/fix-arm-uwp.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6c6054..2c4b757 100644
+index d868883..e4c5ecc 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")
+@@ -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()
 
- function(transform_sources_list INPUT_FILE OUTPUT_FILE)
+ if(BROTLI_EMSCRIPTEN)

ports/brotli/install.patch

@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ff3401..46492d0 100644
+index 61378cd..d868883 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -185,14 +185,13 @@ endforeach()
+@@ -142,14 +142,13 @@ endif()
 
- foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS)
+ foreach(lib ${BROTLI_LIBRARIES_CORE})
    target_link_libraries(${lib} ${LIBM_LIBRARY})
 -  set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
    set_target_properties(${lib} PROPERTIES
@@ -13,12 +13,12 @@ index 4ff3401..46492d0 100644
    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}>")
 +  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,36 @@ if(NOT BROTLI_EMSCRIPTEN)
+@@ -176,11 +175,14 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES})
  if(NOT BROTLI_BUNDLED_MODE)
    install(
      TARGETS brotli
@@ -28,32 +28,20 @@ index 4ff3401..46492d0 100644
 +    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()
-
+@@ -189,7 +191,10 @@ if(NOT BROTLI_BUNDLED_MODE)
    install(
      DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 +    CONFIGURATIONS Release
    )
 +  
-+  install(EXPORT brotli FILE unofficial-brotli-targets.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
++  install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
  endif()  # BROTLI_BUNDLED_MODE
- endif()  # BROTLI_EMSCRIPTEN
 
+ # Tests

ports/brotli/pkgconfig.patch

@@ -1,18 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cdb73b..33a80a7 100644
+index e4c5ecc..0589fc1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -406,6 +406,13 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+@@ -348,6 +348,12 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
 
    string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
 
-+  string(REPLACE [[ -R${libdir}]] "" TEXT ${TEXT})
 +  if(NOT BUILD_SHARED_LIBS)
-+    string(REGEX REPLACE [[( -lbrotli[a-z]*)]] [[\1-static]] TEXT ${TEXT})
 +    if(LIBM_LIBRARY)
-+      string(REPLACE " -lbrotlicommon-static" " -lbrotlicommon-static -l${LIBM_LIBRARY}" TEXT ${TEXT})
++      string(REPLACE " -lbrotlicommon" " -lbrotlicommon -l${LIBM_LIBRARY}" TEXT ${TEXT})
 +    endif()
 +  endif()
++
    file(WRITE ${OUTPUT_FILE} ${TEXT})
  endfunction()