Merge pull request #1362 from microsoft/master

Merge from microsoft/vcpkg
Jimmy-Hu · May 14, 2023 · 6c22d50 · 6c22d50
2 parents 209d09b + 9f0d3d4
commit 6c22d50
Show file tree

Hide file tree

Showing 78 changed files with 748 additions and 201 deletions.
diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-common_12.3.1
-    SHA512 4c062c23637ed94b7688292649d02fb0c67d6402ec682b7a077f3a2aa7dc322cf01e979c5042407876b8c1407cba339252c0c1dde2b7e7aa6727ecfcbe9633ca
+    REF azure-storage-common_12.3.2
+    SHA512 e437c12ba1056838a1d68257522f412f709b4bcbd3e58d4f7fc47768f125a61258667e0f4fcb93927522da9ab2a9495c3d8c53d81f01a86feb142a7025b1ee4c
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )

diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-storage-common-cpp",
-  "version-semver": "12.3.1",
+  "version-semver": "12.3.2",
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."
@@ -11,7 +11,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.8.0"
+      "version>=": "1.9.0"
     },
     {
       "name": "libxml2",

diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-datalake_12.5.0
-    SHA512 fe6b7ffe6efa24c273e3151fdeadb4b981e277bf9aa7b19b23759d5070bfc0c65c365296add83fb4f364b0653a651be31d9ccbd06bfc4c6ac62cf0c5330a66dc
+    REF azure-storage-files-datalake_12.6.0
+    SHA512 29f1f929abdb7a013593679143ad7a90b52af10f630832c15c133c11925c27528d9221c73ad1b53aad59d7017c82347a4d06bfaf96aaa9ae60ea5a23d8355fcc
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )

diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-storage-files-datalake-cpp",
-  "version-semver": "12.5.0",
+  "version-semver": "12.6.0",
   "description": [
     "Microsoft Azure Storage Files Data Lake SDK for C++",
     "This library provides Azure Storage Files Data Lake SDK."
@@ -11,7 +11,7 @@
     {
       "name": "azure-storage-blobs-cpp",
       "default-features": false,
-      "version>=": "12.6.2"
+      "version>=": "12.7.0"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-shares_12.4.0
-    SHA512 e064d808b92de3ec32d4328ce274c9a67ea03f106f71afe311182ed9eff3adad1dfb00ade83da98b10a8e6a7d3b6082d965a1af4b495fd92879d21b669c55ba0
+    REF azure-storage-files-shares_12.5.0
+    SHA512 e56a3af0df71f9887248fdf48274345b236a56a7556235d1c3bab61668fee0c1163e86339c080166445c6b66dfbbba1938204592ca6f6a2b232303836317d7f6
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )

diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-storage-files-shares-cpp",
-  "version-semver": "12.4.0",
+  "version-semver": "12.5.0",
   "description": [
     "Microsoft Azure Storage Files Shares SDK for C++",
     "This library provides Azure Storage Files Shares SDK."
@@ -11,7 +11,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.3.1"
+      "version>=": "12.3.2"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/binlog/portfile.cmake b/ports/binlog/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_cmake_configure(
         -DBINLOG_BUILD_EXAMPLES=OFF
         -DBINLOG_BUILD_UNIT_TESTS=OFF
         -DBINLOG_BUILD_INTEGRATION_TESTS=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_benchmark=ON
 )
 
 vcpkg_cmake_install()

diff --git a/ports/binlog/vcpkg.json b/ports/binlog/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "binlog",
   "version-date": "2021-04-16",
+  "port-version": 1,
   "description": "Binlog is a high performance C++ log library to produce structured binary logs.",
   "homepage": "http://opensource.morganstanley.com/binlog/",
   "license": "Apache-2.0",

diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6
-    SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76
+    REF bac5b8b24a62ff2a818de1b08f6f31f897e42222 # 0.19.1
+    SHA512 c61f3cce4d4707f19db8c1b1a8b2c4655335a7a29c77a0c9692775c9fcdc90d6dce75d3122804c31cf66c47f37d3a3674ad18df67d1204c7f52eb4740ff766af
     HEAD_REF master
     PATCHES
         fix_dependency.patch

diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "caf",
-  "version": "0.18.6",
-  "port-version": 1,
+  "version": "0.19.1",
   "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
   "homepage": "https://github.com/actor-framework/actor-framework",
   "license": "BSD-3-Clause",

diff --git a/ports/easyloggingpp/0001_add_cmake_options.patch b/ports/easyloggingpp/0001_add_cmake_options.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 538cc8a..9221dab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,10 @@ option(test "Build all tests" OFF)
+ option(build_static_lib "Build easyloggingpp as a static library" OFF)
+ option(lib_utc_datetime "Build library with UTC date/time logging" OFF)
+
++option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF)
++option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF)
++option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF)
++
+ set(ELPP_MAJOR_VERSION "9")
+ set(ELPP_MINOR_VERSION "96")
+ set(ELPP_PATCH_VERSION "7")
+@@ -57,6 +61,18 @@ if (build_static_lib)
+                 add_definitions(-DELPP_UTC_DATETIME)
+         endif()
+
++        if (no_default_logfile)
++                add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
++        endif()
++
++        if (thread_safe)
++                add_definitions(-DELPP_THREAD_SAFE)
++        endif()
++
++        if (use_std_threads)
++                add_definitions(-DELPP_FORCE_USE_STD_THREAD)
++        endif()
++
+         require_cpp11()
+         add_library(easyloggingpp STATIC src/easylogging++.cc)
+         set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake
@@ -6,11 +6,21 @@ vcpkg_from_github(
     REF v9.97.0
     SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d
     HEAD_REF master
+    PATCHES
+        0001_add_cmake_options.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+		std-locking     use_std_threads
+		thread-safe     thread_safe
+		no-defaultfile  no_default_logfile
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -Dbuild_static_lib=ON
 )
 vcpkg_cmake_install()

diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "easyloggingpp",
   "version": "9.97.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Easylogging++ is a single header efficient logging library for C++ applications.",
   "homepage": "https://github.com/amrayn/easyloggingpp",
   "dependencies": [
@@ -13,5 +13,16 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "no-defaultfile": {
+      "description": "Do not write to default log file \"myeasylog.log\" (compile with ELPP_NO_DEFAULT_LOG_FILE)"
+    },
+    "std-locking": {
+      "description": "Use std::mutex for thread synchronization (compile with ELPP_FORCE_USE_STD_THREAD)"
+    },
+    "thread-safe": {
+      "description": "Make easyloggingpp thread safe (compile with ELPP_THREAD_SAFE)"
+    }
+  }
 }
diff --git a/ports/libde265/fix-interface-include.patch b/ports/libde265/fix-interface-include.patch
@@ -0,0 +1,13 @@
+diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
+index d0d6762..06e1660 100644
+--- a/libde265/CMakeLists.txt
++++ b/libde265/CMakeLists.txt
+@@ -114,7 +114,7 @@ endif()
+
+ add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS})
+ target_link_libraries(de265 PRIVATE Threads::Threads)
+-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
++target_include_directories(de265 PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}> PUBLIC $<INSTALL_INTERFACE:include>)
+
+ write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion)
+
diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch
diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake
@@ -1,13 +1,11 @@
-# Used for .pc file
-set(VERSION "1.0.8")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO strukturag/libde265
-    REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8
-    SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006
+    REF "v${VERSION}"
+    SHA512 aa744c521fb15e68940956f70997ab969094aee1c129d404ee9a52f318248353bb8d53250b575b4040402645e44701086b78143f1e1122b61a925e9b6cd07566
     HEAD_REF master
     PATCHES
-        fix-libde265-headers.patch
+        fix-interface-include.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -24,7 +22,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265)
-vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN)
 
 set(prefix "")
 set(exec_prefix [[${prefix}]])
@@ -51,4 +49,4 @@ else()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libde265",
-  "version": "1.0.8",
-  "port-version": 7,
+  "version": "1.0.11",
   "description": "Open h.265 video codec implementation.",
   "homepage": "https://www.libde265.org/",
   "license": "LGPL-3.0-only",

diff --git a/ports/libproxy/fix-install-py.patch b/ports/libproxy/fix-install-py.patch
@@ -6,11 +6,11 @@ index 7c36e51..ee2c5bc 100644
  add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm)
 -install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net )
 diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt
-index 2800a85..c5d8e0f 100644
+index 29e656d..dec5799 100644
 --- a/bindings/perl/src/CMakeLists.txt
 +++ b/bindings/perl/src/CMakeLists.txt
-@@ -21,5 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
- target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS})
+@@ -20,5 +20,3 @@ endif()
+ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
  set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
  set_target_properties(PLlibproxy PROPERTIES PREFIX "")
 -

diff --git a/ports/libproxy/fix-tools-path.patch b/ports/libproxy/fix-tools-path.patch
diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake
@@ -1,11 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libproxy/libproxy
-    REF 8fec01ed4b95afc71bf7710bf5b736a5de03b343 #0.4.18
-    SHA512 6367d21b8816d7e5e3c75ee124c230ec89abbffa09538b6700c9ae61be33629f864617f51a2317e18d2fb960b09e26cae0e3503d747112f23921d1910856b109
+    REF "${VERSION}"
+    SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
     HEAD_REF master
     PATCHES
-        fix-tools-path.patch
         support-windows.patch
         fix-install-py.patch
         fix-module-lib-name.patch
@@ -38,16 +37,23 @@ vcpkg_cmake_configure(
         WITH_PYTHON3
         WITH_VALA
         MSVC_STATIC
+        BUILD_TOOLS
+        WITH_GNOME3
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules)
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
+vcpkg_copy_tools(TOOL_NAMES proxy AUTO_CLEAN)
+
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
           "${CMAKE_CURRENT_LIST_DIR}/usage"
           DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libproxy/support-windows.patch b/ports/libproxy/support-windows.patch
@@ -29,3 +29,13 @@ index de68e5c..9356486 100644
 -install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
 +install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
  install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
+diff --git a/libproxy/cmake/pkgconfig.cmk b/libproxy/cmake/pkgconfig.cmk
+index 89bfc62..ffa0897 100644
+--- a/libproxy/cmake/pkgconfig.cmk
++++ b/libproxy/cmake/pkgconfig.cmk
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32)
+   find_package(PkgConfig)
+
+   # Define our magical px_check_modules function
diff --git a/ports/libproxy/usage b/ports/libproxy/usage
@@ -1,5 +1,5 @@
 The package libproxy provides CMake targets:
 
-    find_package(libproxy CONFIG REQUIRED)
+    find_package(libproxy REQUIRED)
     target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR})
     target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES})