[fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release (#13559)

12 files changed, 57 insertions, 70 deletions

diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
index 39a63bc91..9c904f326 100644
--- a/ports/ensmallen/CONTROL
+++ b/ports/ensmallen/CONTROL
@@ -1,6 +1,5 @@
 Source: ensmallen
-Version: 2.11.2
-Port-Version: 2
+Version: 2.14.2
 Homepage: https://github.com/mlpack/ensmallen
 Description: A header-only C++ library for mathematical optimization.
 Build-Depends: openblas, lapack, armadillo
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake
index 065d12981..76be857ea 100644
--- a/ports/ensmallen/portfile.cmake
+++ b/ports/ensmallen/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO mlpack/ensmallen

-    REF ba0897d57f52db9578e5e44426eb3220d5bd917f # v2.11.2
-    SHA512 715c87b407487c1b5f1b2e95c23151c80d84bda8e5bd879f71e41871bc9a10bb157acf67fa2814b180da4c426a842bf84f29ce0d3bd3a2df4bfab382f5bb04d3

+    REF 8d9c03715346f2048e61e3e370a6a6c7a5e55d3b # 2.14.2
+    SHA512 2aebdd485265f8f6adcf9eb00c78e5f79f5d19e62566bdfcd024c44443d5658a7b92ea4ca62c29041f1b512cf67f8148fdc8b6894c9aa4c69ef305580916e24a

     HEAD_REF master

 )

 

@@ -10,11 +10,13 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

-      -DBUILD_TESTS=OFF

+        -DBUILD_TESTS=OFF

 )

 vcpkg_install_cmake()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)

 

-file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ensmallen TARGET_PATH share/ensmallen)

 

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)

 

+file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL
index 6acb9a941..87775a41a 100644
--- a/ports/fastcdr/CONTROL
+++ b/ports/fastcdr/CONTROL
@@ -1,3 +1,5 @@
 Source: fastcdr

-Version: 1.0.11

+Version: 1.0.15

+Homepage: https://github.com/eProsima/Fast-CDR

 Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.

+Supports: !linux

diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake
index 27ac7e328..cfb26720a 100644
--- a/ports/fastcdr/portfile.cmake
+++ b/ports/fastcdr/portfile.cmake
@@ -1,10 +1,10 @@
-include(vcpkg_common_functions)

+vcpkg_fail_port_install(ON_TARGET "linux")

 

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO eProsima/Fast-CDR

-    REF v1.0.11

-    SHA512 04b84437ffad6425ba7f934adb9ae6a88e710e50ca9259ae0ecdb9dbfcdbd59944fd21e85e81ba4d341df1ee2c76fa7040ab902b869ef3185cacee6e866f5e80

+    REF 065d49248bd4afbae670836ee1f1c718b9760dde # v1.0.15

+    SHA512 1e011f1848abace94299368a5150f9f7513a676ccdc2b2247cebcb098f7b397e9bd20f5663bc35ea9921b1c91654af39e19b867b73c38bdc5612e0e2b926743a

     HEAD_REF master

     PATCHES install-cmake.patch

 )

@@ -13,21 +13,17 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

-        -DLICENSE_INSTALL_DIR=share/fastcdr

         -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON

 )

 

 vcpkg_install_cmake()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastcdr/cmake)

-

-file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" _contents)

-string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdr-targets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdr-targets.cmake)" _contents "${_contents}")

-file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" "${_contents}")

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fastcdr)

 

 vcpkg_copy_pdbs()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H)

@@ -39,6 +35,4 @@ else()
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h "${FASTCDR_H}")

 endif()

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastcdr)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/fastcdr/license ${CURRENT_PACKAGES_DIR}/share/fastcdr/copyright)

+file(INSTALL ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL
index 0de5cc858..8ab0cde2f 100644
--- a/ports/fcl/CONTROL
+++ b/ports/fcl/CONTROL
@@ -1,5 +1,5 @@
 Source: fcl

-Version: 0.6.0-1

+Version: 0.6.1

 Homepage: https://github.com/flexible-collision-library/fcl

 Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles

 Build-Depends: ccd, octomap, eigen3

diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake
index f5585ec6e..0bd74661d 100644
--- a/ports/fcl/portfile.cmake
+++ b/ports/fcl/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO flexible-collision-library/fcl
-    REF a13c681e41eb8180cba7d4fd32637511f588cb82 #v0.6.0
-    SHA512 b0fe70f411871ff50b6e5978c01e5849099bec7b68983c6d1ff1afa1628980eaabafd59748ee06e4337efeb77dba6c65af93868a5fc5df980a133a3f667ddccf
+    REF 97455a46de121fb7c0f749e21a58b1b54cd2c6be # 0.6.1
+    SHA512 1ed1f43866a2da045fcb82ec54a7812c3fc46306386bc04ccf33b5e169773743b2985997373a63bf480098a321600321fdf5061b1448b48e993cf92cad032891
     HEAD_REF master
 )
 
@@ -38,12 +38,6 @@ else()
   vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fcl)
 endif()
 
-
-file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG)
-string(REPLACE "unset(_expectedTargets)"
-               "unset(_expectedTargets)\n\nfind_package(octomap REQUIRED)\nfind_package(ccd REQUIRED)" FCL_CONFIG "${FCL_CONFIG}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake "${FCL_CONFIG}")
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/hwloc/CMakeLists.txt b/ports/hwloc/CMakeLists.txt
index 1b2e1c802..9407322a6 100644
--- a/ports/hwloc/CMakeLists.txt
+++ b/ports/hwloc/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(hwloc
     LANGUAGES C
-    VERSION 1.11.7)
+    VERSION 2.2.0)
 
 configure_file(contrib/windows/hwloc_config.h include/hwloc/autogen/config.h COPYONLY)
 configure_file(contrib/windows/static-components.h include/static-components.h COPYONLY)
@@ -18,24 +18,24 @@ endif()
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/private/autogen/config.h "${PRIVATE_CONFIG_H}")
 
 add_library(libhwloc
-    src/base64.c
-    src/bind.c
-    src/bitmap.c
-    src/components.c
-    src/distances.c
-    src/diff.c
-    src/misc.c
-    src/pci-common.c
-    src/topology-custom.c
-    src/topology-noos.c
-    src/topology-synthetic.c
-    src/topology-windows.c
-    src/topology-x86.c
-    src/topology-xml-nolibxml.c
-    src/topology-xml.c
-    src/topology.c
-    src/traversal.c
-    src/dolib.c)
+    hwloc/base64.c
+    hwloc/bind.c
+    hwloc/bitmap.c
+    hwloc/components.c
+    hwloc/distances.c
+    hwloc/diff.c
+    hwloc/misc.c
+    hwloc/pci-common.c
+    hwloc/shmem.c
+    hwloc/topology-noos.c
+    hwloc/topology-synthetic.c
+    hwloc/topology-windows.c
+    hwloc/topology-x86.c
+    hwloc/topology-xml-nolibxml.c
+    hwloc/topology-xml.c
+    hwloc/topology.c
+    hwloc/traversal.c
+    hwloc/dolib.c)
 
 set_target_properties(libhwloc PROPERTIES DEFINE_SYMBOL _USRDLL)
 
@@ -45,7 +45,7 @@ add_executable(hwloc-info
 target_link_libraries(hwloc-info PRIVATE libhwloc)
 
 foreach(Target IN ITEMS libhwloc hwloc-info)
-    target_include_directories(${Target} PRIVATE ./include ./src ${CMAKE_CURRENT_BINARY_DIR}/include)
+    target_include_directories(${Target} PRIVATE ./include ./hwloc ${CMAKE_CURRENT_BINARY_DIR}/include)
     target_compile_definitions(${Target} PRIVATE _CRT_SECURE_NO_WARNINGS)
 endforeach(Target)
 
diff --git a/ports/hwloc/CONTROL b/ports/hwloc/CONTROL
index f2bf754b7..f2a7afc6b 100644
--- a/ports/hwloc/CONTROL
+++ b/ports/hwloc/CONTROL
@@ -1,6 +1,6 @@
 Source: hwloc
-Version: 1.11.7-4
+Version: 2.2.0
 Homepage: https://github.com/open-mpi/hwloc
 Description: Portable Hardware Locality (hwloc) 
   The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs. 
-Supports: !uwp
\ No newline at end of file
+Supports: !(uwp|arm|arm64)
\ No newline at end of file
diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake
index 540255222..47036a028 100644
--- a/ports/hwloc/portfile.cmake
+++ b/ports/hwloc/portfile.cmake
@@ -1,10 +1,10 @@
-vcpkg_fail_port_install(ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-mpi/hwloc
-    REF hwloc-1.11.7
-    SHA512 bc3a74c60bfbed1e860c2fe2b5b49956eca5cfd9c00a262f6cd3026a42ae8b5411fa296e471a95cba657d943b8853675442e796e648034398af3015e5f59476e
+    REF 263908a2c1f21c0e221a8d1f6472daf3a1fc07b9 # hwloc-2.2.0
+    SHA512 87f3d267781fd1f8907b0c080868b56943c7c2caecae5c0fbe9a55f8c5e9453bb6b7892834ba37696c1ebadd8d7bfdd5e513ea72a075211b808a1d5803ea4b8e
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
@@ -30,8 +30,11 @@ else()
     message(WARNING "${PORT} currently requires the following tool from the system package manager:\n    libtool")
 
     vcpkg_configure_make(
-            SOURCE_PATH ${SOURCE_PATH}
-            AUTOCONFIG
+        SOURCE_PATH ${SOURCE_PATH}
+        AUTOCONFIG
+        OPTIONS
+            --disable-libxml2
+            --disable-opencl
     )
     
     vcpkg_install_make()
diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL
index fb3fed91f..3337ea212 100644
--- a/ports/jack2/CONTROL
+++ b/ports/jack2/CONTROL
@@ -1,5 +1,6 @@
 Source: jack2

-Version: 1.9.12-2

+Version: 1.9.14

 Homepage: https://github.com/jackaudio/jack2

 Description: Cross-platform API that enables device sharing and inter-application audio routing

+Supports: !uwp

 

diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake
index 3cb59189e..1c65a2167 100644
--- a/ports/jack2/portfile.cmake
+++ b/ports/jack2/portfile.cmake
@@ -1,12 +1,12 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "uwp")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jackaudio/jack2
-    REF v1.9.12
-    SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
+    REF b54a09bf7ef760d81fdb8544ad10e45575394624 # v1.9.14
+    SHA512 a5f920ed1df71d9f5e3c4889ea2aa4d9ed9082d0b9070437a068e24a2caa5dffaa71b19352e9da056e9f23e930edab56816235ceb9293cc33d8870265f392c1d
     HEAD_REF master
 )
 
@@ -20,8 +20,6 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# Remove duplicate headers
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/jack2 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index dbaef250c..e46724771 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -389,7 +389,6 @@ farmhash:x64-uwp=fail
 farmhash:x64-windows=fail
 farmhash:x64-windows-static=fail
 farmhash:x86-windows=fail
-fastcdr:x64-linux=fail
 fastrtps:arm-uwp=fail
 fastrtps:x64-linux=fail
 fastrtps:x64-osx=fail
@@ -547,9 +546,6 @@ hiredis:x64-uwp=fail
 hpx:x64-windows-static=fail
 hpx:x64-linux=fail
 libhsplasma:x64-windows-static=fail
-hwloc:arm64-windows=fail
-hwloc:arm-uwp=fail
-hwloc:x64-uwp=fail
 icu:arm64-windows=fail
 icu:arm-uwp=fail
 icu:x64-uwp=fail
@@ -593,8 +589,6 @@ isal:x64-uwp=fail
 isal:x64-windows=fail
 isal:x64-windows-static=fail
 isal:x86-windows=fail
-jack2:arm-uwp=fail
-jack2:x64-uwp=fail
 jaeger-client-cpp:arm64-windows=fail
 jbig2dec:arm-uwp=fail
 jbig2dec:x64-uwp=fail