Merge branch 'master' of https://github.com/microsoft/vcpkg into patch-1

microsoft · Aug 26, 2024 · cb32d09 · cb32d09
2 parents c171ce8 + 509f71e
commit cb32d09
Show file tree

Hide file tree

Showing 44 changed files with 233 additions and 82 deletions.
diff --git a/ports/cuda-api-wrappers/portfile.cmake b/ports/cuda-api-wrappers/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eyalroz/cuda-api-wrappers
     REF "v${VERSION}"
-    SHA512 c6e9e2ce6e1007f314b953b30ff1981e7fd426a9a5bdd45930dd71bdf8ea240120640504c0bf11c62e52bf7302d49c853e40b03983772bacf9ceec4980e532b3
+    SHA512 5281557d05faa95f25a509a03d331ecf60b881cfbe0d80f560a9a1be1957d5b3b7a9afa99e1ffb35175f30b357fea3103058665f56bcecea55df9efa23179619
     HEAD_REF master
 )
 

diff --git a/ports/cuda-api-wrappers/vcpkg.json b/ports/cuda-api-wrappers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cuda-api-wrappers",
-  "version": "0.6.9",
+  "version": "0.7.1",
   "description": "Header-only library of integrated wrappers around the core parts of NVIDIA's CUDA execution ecosystem",
   "homepage": "https://github.com/eyalroz/cuda-api-wrappers",
   "license": "BSD-3-Clause",

diff --git a/ports/curlcpp/fix-cmake.patch b/ports/curlcpp/fix-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f3c6d78..a457717 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -43,7 +43,7 @@ if(NOT BUILD_SHARED_LIBS)
+         ${CURLCPP_HEADER_LIST}
+     )
+ else()
+-    add_library(curlcpp ${BUILD_SHARED_LIBS}
++    add_library(curlcpp SHARED
+         curl_easy.cpp
+         curl_header.cpp
+         curl_global.cpp
diff --git a/ports/curlcpp/portfile.cmake b/ports/curlcpp/portfile.cmake
@@ -0,0 +1,27 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO JosephP91/curlcpp
+    REF "${VERSION}"
+    SHA512 9c84dff893ac4f7a02b6b360d72f9cf65a69ca33bed6c35ceef21cef2f20c1eb36664fdb3e2918a39a88f88bd4104d9d09f5d40168847a3be83135958bd41046
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME "curlcpp")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/curlcpp/vcpkg.json b/ports/curlcpp/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "curlcpp",
+  "version": "3.1",
+  "description": "An object oriented C++ wrapper for CURL (libcurl)",
+  "homepage": "https://josephp91.github.io/curlcpp/",
+  "license": "MIT",
+  "dependencies": [
+    "curl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "google-cloud-cpp",
   "version": "2.28.0",
+  "port-version": 1,
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -260,6 +261,19 @@
         }
       ]
     },
+    "bigquerycontrol": {
+      "description": "Cloud BigQuery Control API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common",
+            "rest-common"
+          ]
+        }
+      ]
+    },
     "bigtable": {
       "description": "The Google Cloud Bigtable C++ client library",
       "dependencies": [
@@ -709,19 +723,6 @@
         }
       ]
     },
-    "experimental-bigquerycontrol": {
-      "description": "Cloud BigQuery Control API C++ Client Library",
-      "dependencies": [
-        {
-          "name": "google-cloud-cpp",
-          "default-features": false,
-          "features": [
-            "grpc-common",
-            "rest-common"
-          ]
-        }
-      ]
-    },
     "experimental-storage-grpc": {
       "description": "The GCS+gRPC plugin",
       "dependencies": [

diff --git a/ports/libcap/portfile.cmake b/ports/libcap/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_download_distfile(ARCHIVE
     URLS "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz"
          "https://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz"
     FILENAME "libcap-${VERSION}.tar.xz"
-    SHA512 647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f
+    SHA512 4e0bf0efeccb654c409afe9727b2b53c1d4da8190d7a0a9848fc52550ff3e13502add3eacde04a68a5b7bec09e91df487f64c5746ba987f873236a9e53b3d4e8
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH

diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libcap",
-  "version": "2.69",
-  "port-version": 5,
+  "version": "2.70",
   "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.",
   "homepage": "https://sites.google.com/site/fullycapable/",
   "license": "BSD-3-Clause OR GPL-2.0-only",

diff --git a/ports/libdwarf/portfile.cmake b/ports/libdwarf/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO davea42/libdwarf-code
     REF "v${VERSION}"
-    SHA512 8288db7a88ad7db7212fe524d5c877b1355b5a422c7fa95eee320f41f9f0f9f1c98500060986de8ebe5f1f6de36dd1a7017775168b0d140d82200da26c242c93
+    SHA512 5c8e01e3a2c559515af1833c2b7626634e74bd2f3de2e3ff4fc2127ac68885af9ee339608fc274499fae7326bbe7af41bc471ba4d807145c00c6cd0010a4b1aa
     HEAD_REF main
     PATCHES
         include-dir.diff # avoid dwarf.h conflict with elfutils

diff --git a/ports/libdwarf/vcpkg.json b/ports/libdwarf/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libdwarf",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "A library for reading DWARF2 and later DWARF.",
   "homepage": "https://github.com/davea42/libdwarf-code",
   "license": null,

diff --git a/ports/libgxps/portfile.cmake b/ports/libgxps/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 set(LIBGXPS_VERSION 0.3.2)
 string(SUBSTRING ${LIBGXPS_VERSION} 0 3 MAJOR_MINOR) # e.g. 0.3
 

diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgxps",
   "version": "0.3.2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "libgxps is a GObject based library for handling and rendering XPS documents.",
   "homepage": "https://wiki.gnome.org/Projects/libgxps",
   "dependencies": [

diff --git a/ports/libstemmer/LICENSE b/ports/libstemmer/LICENSE
diff --git a/ports/libstemmer/portfile.cmake b/ports/libstemmer/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+string(SUBSTRING "${VERSION}" 5 -1 VERSION)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://snowball.tartarus.org/dist/libstemmer_c.tgz"
-    FILENAME "libstemmer_c.tgz"
-    SHA512 9ab5b8bfd5b4071dbbd63d769e09fae3971b49ee441ad970aa95d90b3297f5ffc9deed1613d99974d1485bf3b69292663591957f52bbeddcadbf9d9a4af432f2
+    URLS "https://snowballstem.org/dist/libstemmer_c-${VERSION}.tar.gz"
+    FILENAME "libstemmer_c-${VERSION}.tar.gz"
+    SHA512 a61a06a046a6a5e9ada12310653c71afb27b5833fa9e21992ba4bdf615255de991352186a8736d0156ed754248a0ffb7b7712e8d5ea16f75174d1c8ddd37ba4a
 )
 
 vcpkg_extract_source_archive(
@@ -20,4 +21,4 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libstemmer/vcpkg.json b/ports/libstemmer/vcpkg.json
@@ -1,17 +1,12 @@
 {
   "name": "libstemmer",
-  "version": "2017-9",
-  "port-version": 8,
+  "version": "2021.2.2.0",
   "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval",
-  "homepage": "https://snowball.tartarus.org/",
+  "homepage": "https://snowballstem.org/",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/ports/liburing/disable-tests-and-examples.patch b/ports/liburing/disable-tests-and-examples.patch
@@ -9,5 +9,5 @@ index 686be4f..28d0a7f 100644
 -	@$(MAKE) -C test
 -	@$(MAKE) -C examples
 
- .PHONY: all install default clean test
- .PHONY: FORCE cscope
+ library:
+ 	@$(MAKE) -C src
diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO axboe/liburing
     REF "liburing-${VERSION}"
-    SHA512 e5ce61e80fe90f95128e62abfec7771912fe98674f7dbf5806ed61cb386adecedf495c50cb77b684f5b61f48deb44ccb4e3ba032613920213366132bbbc908db
+    SHA512 c65146ee53defba4f9b752674be8489757f60be0855b361c6d1136119c74803351e5ccc8a1890c0777bfe61da4c0fd997230fc8817ff3929a7e2186b389cdc28
     HEAD_REF master
     PATCHES
         fix-configure.patch     # ignore unsupported options, handle ENABLE_SHARED
@@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     COPY_SOURCE
+    DETERMINE_BUILD_TRIPLET
     OPTIONS
         [[--libdevdir=\${prefix}/lib]] # must match libdir
 )

diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "liburing",
-  "version": "2.6",
-  "port-version": 1,
+  "version": "2.7",
   "description": "Linux-native io_uring I/O access library",
   "homepage": "https://github.com/axboe/liburing",
   "license": "(MIT OR LGPL-2.1) AND (MIT OR (GPL-2.0 WITH Linux-syscall-note))",

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
   REF "v${VERSION}"
-  SHA512 05dec8310e04e6b2eeae265f9605446ce2da134b624951fa1dc4f7d3f16e62f5c5f3bfceae29f09111e2e22003310b6fba063945e75ba97e0cef82f7f31d4cae
+  SHA512 4c771c292d73d4a1c1498011fe8969b9f04a58853d2977c3ce4895d5ad6c1a282c8bfba5e4f1d045e56e0820e57a3a21d3cc0d178efe6ad73c82121aa75b1cdf
   HEAD_REF master
   PATCHES
     fix-cmake.patch
@@ -19,8 +19,11 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lunasvg.h" "defined(LUNASVG_BUILD_STATIC)" "1")
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunasvg",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",

diff --git a/ports/openscap/fix-dependencies.patch b/ports/openscap/fix-dependencies.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 494512e..22ab043 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,8 +84,12 @@ include(CMakeDependentOption)
+ find_package(ACL)
+ if(ACL_FOUND)
+        check_library_exists("${ACL_LIBRARY}" acl_extended_file "" HAVE_ACL_EXTENDED_FILE)
+-       check_include_file(acl/libacl.h HAVE_ACL_LIBACL_H)
+-       check_include_file(sys/acl.h HAVE_SYS_ACL_H)
++       if(EXISTS "${ACL_INCLUDE_DIR}/acl/libacl.h")
++                set(HAVE_ACL_LIBACL_H 1)
++        endif()
++       if(EXISTS "${ACL_INCLUDE_DIR}/sys/acl.h")
++                set(HAVE_SYS_ACL_H 1)
++        endif()
+ endif()
+
+ find_package(Blkid)
+diff --git a/cmake/FindACL.cmake b/cmake/FindACL.cmake
+index a41f2c1..9675498 100644
+--- a/cmake/FindACL.cmake
++++ b/cmake/FindACL.cmake
+@@ -12,7 +12,7 @@ libfind_pkg_check_modules(ACL_PKGCONF libacl)
+
+ # Include dir
+ find_path(ACL_INCLUDE_DIR
+-       NAMES "acl/libacl.h" "sys/libacl.h"
++       NAMES "acl/libacl.h" "sys/acl.h"
+        PATHS ${ACL_PKGCONF_INCLUDE_DIRS}
+ )
+
diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenSCAP/openscap
@@ -8,6 +10,7 @@ vcpkg_from_github(
         fix-build.patch
         fix-buildflag-and-install.patch
         fix-utils.patch
+        fix-dependencies.patch
 )
 file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake")
 

diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json
@@ -1,11 +1,16 @@
 {
   "name": "openscap",
   "version": "1.4.0",
+  "port-version": 1,
   "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
   "homepage": "https://github.com/OpenSCAP/openscap",
   "license": "LGPL-2.1-or-later",
   "supports": "!xbox",
   "dependencies": [
+    {
+      "name": "acl",
+      "platform": "linux"
+    },
     "curl",
     "glib",
     "libpopt",

diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pybind/pybind11
     REF "v${VERSION}"
-    SHA512 5938c758da5450be645b366190579aa7943294471a0c639c2aeb9d8e9d201ef4fb4dfd0cb1db91390f74dc59f175f6cf47b0c45c20d45ab9f3eeb1a834886de7
+    SHA512 bf9ebfbd8e694fbb421d8bdb5362a207a3782685d48988e77aed98363b2fa302e7384b570b02b117d45d5509b1633b096d4fc1ef16f65e6cc8c888b863c1e2cb
     HEAD_REF master
 )
 

diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pybind11",
-  "version": "2.13.4",
+  "version": "2.13.5",
   "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code",
   "homepage": "https://github.com/pybind/pybind11",
   "license": "BSD-3-Clause",

diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO RoaringBitmap/CRoaring
     REF "v${VERSION}"
-    SHA512 541ec786e97bf9ad3862d35270da5fb6fb119490efeb767e8f935797216c8036768d3dd7cd226274339f71d7f211830bdd938db50d51d98a835640ef7871efc0
+    SHA512 f2963c1ece4f8ce5b88b594b821972eb29c0fd2d5d4b66518877e89c232d34e4f0fa5722823093d8089f6ec5dea769c1a7d09c212509b5817646b9f990ada8f8
     HEAD_REF master
 )
 

diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "roaring",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "A better compressed bitset in C (and C++)",
   "homepage": "https://github.com/RoaringBitmap/CRoaring",
   "license": "Apache-2.0 OR MIT",