Merge remote-tracking branch 'upstream/master' into paraview_5.12

# Conflicts: # ports/openmvs/portfile.cmake # versions/o-/openmvs.json
microsoft · Apr 24, 2024 · a35d9cd · a35d9cd
2 parents 6f4248a + 6d2c971
commit a35d9cd
Show file tree

Hide file tree

Showing 337 changed files with 3,009 additions and 1,601 deletions.
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29
+        SHA512 cf28ca68e460b163d1af2858dddf597306dac7a048ea1d8c69d74e65d671594ce16ecd5f3b1b571e2be6e0e860a7bbedf7372a2c6aea9427d1c8f83f73b99e12
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec
+        SHA512 7eefc6ec2cb3ad862deffe341dab81e75a75a73acf429c8b64229e63de6ec2baa01e6bbef1643519cfd7312cc70564aa2836d57824667ea4f456659f01ba3fd5
     )
 endif()
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ace",
-  "version": "7.1.2",
-  "port-version": 1,
+  "version": "7.1.4",
   "maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/ports/arrow/android.patch b/ports/arrow/android.patch
@@ -1,8 +1,8 @@
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 05c05c6..f2754a5 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -973,7 +973,7 @@ if(WIN32)
+diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
+index 026bb5c..5c1b5e3 100644
+--- a/cpp/src/arrow/CMakeLists.txt
++++ b/cpp/src/arrow/CMakeLists.txt
+@@ -166,7 +166,7 @@ if(WIN32)
    list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
  endif()
 

diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_download_distfile(
     ARCHIVE_PATH
     URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
     FILENAME apache-arrow-${VERSION}.tar.gz
-    SHA512 6c83e3be1e5840c30387f088315b74aca8e7c2d060793af70a156effb496a71e3e6af0693188c0f46f8a4a061a263a47095912ef04a5dc8141abd59075b14c78
+    SHA512 773f4f3eef603032c8ba0cfdc023bfd2a24bb5e41c82da354a22d7854ab153294ede1f4782cc32b27451cf1b58303f105bac61ceeb3568faea747b93e21d79e4
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
@@ -12,6 +12,7 @@ vcpkg_extract_source_archive(
         msvc-static-name.patch
         utf8proc.patch
         thrift.patch
+        remove-dll-suffix.patch #Upstream PR: https://github.com/apache/arrow/pull/41341
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/arrow/remove-dll-suffix.patch b/ports/arrow/remove-dll-suffix.patch
@@ -0,0 +1,39 @@
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 941f5db..473e380 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -711,7 +711,7 @@ list(APPEND ARROW_TEST_LINK_LIBS ${ARROW_GTEST_GMOCK} ${ARROW_GTEST_GTEST_MAIN})
+ if(ARROW_BUILD_BENCHMARKS)
+   set(ARROW_BENCHMARK_LINK_LIBS benchmark::benchmark_main ${ARROW_TEST_LINK_LIBS})
+   if(WIN32)
+-    list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi.dll)
++    list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi)
+   endif()
+ endif()
+
+diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
+index 5c1b5e3..f16ee55 100644
+--- a/cpp/src/arrow/CMakeLists.txt
++++ b/cpp/src/arrow/CMakeLists.txt
+@@ -163,7 +163,7 @@ if(CMAKE_THREAD_LIBS_INIT)
+ endif()
+
+ if(WIN32)
+-  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
++  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
+ endif()
+
+ if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+@@ -628,9 +628,9 @@ else()
+   list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS ArrowTesting::gtest)
+ endif()
+ if(WIN32)
+-  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32.dll")
+-  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32.dll")
+-  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32.dll")
++  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32")
++  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32")
++  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32")
+ endif()
+
+ set(ARROW_TESTING_SRCS
diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arrow",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "port-version": 1,
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",