[nsync] Update to 1.28.1

ports/nsync/fix-install.patch → ports/nsync/fix-cmake.patch

@@ -1,32 +1,31 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6b1f1dc..328f9b6 100644
+index fcc3f41..610710f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@ set (NSYNC_OS_CPP_SRC
- #    https://cmake.org/cmake/help/v3.1/policy/CMP0054.html
+@@ -88,7 +88,7 @@ if ("${CMAKE_C_COMPILER_ID}X" STREQUAL "MSVCX")
+ endif ()
 
  # Pick the include directory for the operating system.
 -if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX")
-+if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX")
++if (("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") OR ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX"))
  	include_directories ("${PROJECT_SOURCE_DIR}/platform/win32")
  	set (NSYNC_CPP_FLAGS "/TP")
 
-@@ -230,7 +230,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X"))
+@@ -232,7 +232,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X"))
  endif ()
 
  # Windows uses some include files from the posix directory also.
 -if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX")
-+if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX")
++if (("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") OR ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX"))
  	include_directories ("${PROJECT_SOURCE_DIR}/platform/posix")
  endif ()
 
-@@ -396,7 +396,8 @@ if (NSYNC_ENABLE_TESTS)
+@@ -398,7 +398,7 @@ if (NSYNC_ENABLE_TESTS)
  	endforeach (t)
  endif ()
 
 -set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
-+# By default, install nsync always
-+# set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
++set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY FALSE)
 
- install (TARGETS nsync
+ install (TARGETS nsync EXPORT nsync
  	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries

ports/nsync/portfile.cmake

@@ -5,12 +5,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/nsync
-    REF 1.26.0
-    SHA512 8aa49997f100f161f0f32e99c9004ee845d7b16c1391e7eb62eea0897e2f91b7f9e5181055fdca637518751b6b26e16a1cd53e45adceda145285752c4b74f3bf
+    REF "${VERSION}"
+    SHA512 2706501a45396172b5b39716ba29ea3ef3d8f5fdd9b0e0b22e6217d93ed64eb3cce4e5610818867ae43ce5fc677581932e67507425299e8b6a8353369eb79ecf
     HEAD_REF master
     PATCHES
-        fix-install.patch
-        export-targets.patch
+        fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
@@ -19,9 +18,9 @@ vcpkg_cmake_configure(
         -DNSYNC_ENABLE_TESTS=OFF
 )
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME nsync CONFIG_PATH share/nsync)
+vcpkg_cmake_config_fixup(PACKAGE_NAME nsync CONFIG_PATH lib/cmake/nsync DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME nsync_cpp CONFIG_PATH lib/cmake/nsync_cpp)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/nsync/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "nsync",
-  "version": "1.26.0",
+  "version": "1.28.1",
   "description": "nsync is a C library that exports various synchronization primitives, such as mutexes",
   "homepage": "https://github.com/google/nsync",
   "license": "Apache-2.0",

ports/onnxruntime/onnxruntime_external_deps.cmake

@@ -94,14 +94,22 @@ if (NOT WIN32)
     google_nsync
     URL ${DEP_URL_google_nsync}
     URL_HASH SHA1=${DEP_SHA1_google_nsync}
-    FIND_PACKAGE_ARGS NAMES nsync unofficial-nsync
+    FIND_PACKAGE_ARGS NAMES nsync_cpp nsync unofficial-nsync CONFIG
   )
   #nsync tests failed on Mac Build
   set(NSYNC_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
   onnxruntime_fetchcontent_makeavailable(google_nsync)
 
-  if (google_nsync_SOURCE_DIR)
+  find_package(nsync_cpp CONFIG)
+  if(nsync_cpp_FOUND)
+    if(NOT TARGET nsync::nsync_cpp)
+      message(STATUS "Aliasing nsync_cpp to nsync::nsync_cpp")
+      add_library(nsync::nsync_cpp ALIAS nsync_cpp)
+    endif()
+  endif()
+  if (google_nsync_SOURCE_DIR AND NOT TARGET nsync::nsync_cpp)
     add_library(nsync::nsync_cpp ALIAS nsync_cpp)
+    message(STATUS "Aliasing nsync_cpp to nsync::nsync_cpp")
     target_include_directories(nsync_cpp PUBLIC ${google_nsync_SOURCE_DIR}/public)
   endif()
   if(TARGET unofficial::nsync::nsync_cpp AND NOT TARGET nsync::nsync_cpp)

ports/onnxruntime/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "onnxruntime",
   "version-semver": "1.18.1",
+  "port-version": 1,
   "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator",
   "homepage": "https://onnxruntime.ai/",
   "license": "MIT",

versions/baseline.json

@@ -101,7 +101,7 @@
       "port-version": 0
     },
     "nsync": {
-      "baseline": "1.26.0",
+      "baseline": "1.28.1",
       "port-version": 0
     },
     "nvidia-cnmem": {
@@ -138,7 +138,7 @@
     },
     "onnxruntime": {
       "baseline": "1.18.1",
-      "port-version": 0
+      "port-version": 1
     },
     "opencl": {
       "baseline": "v2024.05.08",

versions/n-/nsync.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c5a83a6c92723488257cdac7a7752fc54d9298bc",
+      "version": "1.28.1",
+      "port-version": 0
+    },
     {
       "git-tree": "94bea01a643709904887893487309b35e962bbdd",
       "version": "1.26.0",

versions/o-/onnxruntime.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8641a25170bba46fe4fc7c1cc873efa444ce5d04",
+      "version-semver": "1.18.1",
+      "port-version": 1
+    },
     {
       "git-tree": "afebd79a5253d8547428a61094a2a39e4b2f0a9a",
       "version-semver": "1.18.1",