diff --git a/ports/tcp-pubsub/use-ports-for-asio-and-recycle.patch b/ports/tcp-pubsub/fix-finding-asio-recycle-deps.patch similarity index 50% rename from ports/tcp-pubsub/use-ports-for-asio-and-recycle.patch rename to ports/tcp-pubsub/fix-finding-asio-recycle-deps.patch index f7ecc6942fb82b..79829eb611027e 100644 --- a/ports/tcp-pubsub/use-ports-for-asio-and-recycle.patch +++ b/ports/tcp-pubsub/fix-finding-asio-recycle-deps.patch @@ -1,19 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cdf73fa..9fea965 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,9 +30,6 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX reldbg) - # Add main tcp_pubsub library - add_subdirectory(tcp_pubsub) - --# Recycle dependency. It's header only and not in the API, so we add it with EXCLUDE_FOR_ALL, so it won't be installed --add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL) -- - # Generic samples - if (TCP_PUBSUB_BUILD_SAMPLES) - add_subdirectory(samples/performance_publisher) +From 23277e275fe3b255a2d8ff40ef501e7b95047a6f Mon Sep 17 00:00:00 2001 +From: Adrien Bourdeaux +Date: Mon, 14 Apr 2025 11:35:20 -0400 +Subject: [PATCH] fix-deps + +--- + tcp_pubsub/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/tcp_pubsub/CMakeLists.txt b/tcp_pubsub/CMakeLists.txt -index d2a5777..772319a 100644 +index 2ef4582..0f8cc58 100644 --- a/tcp_pubsub/CMakeLists.txt +++ b/tcp_pubsub/CMakeLists.txt @@ -10,8 +10,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) @@ -35,16 +30,14 @@ index d2a5777..772319a 100644 ) target_compile_definitions(${PROJECT_NAME} -@@ -100,6 +99,7 @@ target_include_directories(${PROJECT_NAME} - $ - PRIVATE - src/ -+ ${RECYCLE_INCLUDE_DIRS} +@@ -81,6 +80,7 @@ target_compile_definitions(${PROJECT_NAME} + ASIO_STANDALONE + ASIO_DISABLE_VISIBILITY + _WIN32_WINNT=0x0601 ++ ${RECYCLE_INCLUDE_DIRS} ) - set_target_properties(${PROJECT_NAME} PROPERTIES -@@ -177,4 +177,3 @@ install( - DESTINATION ${TCP_PUBSUB_INSTALL_CMAKE_DIR} - COMPONENT tcp_pubsub_dev - ) -- + # Check if tcp_pubsub is an object library. If so, define TCP_PUBSUB_STATIC_DEFINE, +-- +2.47.1.windows.2 + diff --git a/ports/tcp-pubsub/fix-package-config-file.patch b/ports/tcp-pubsub/fix-package-config-file.patch deleted file mode 100644 index e3e786f72f008a..00000000000000 --- a/ports/tcp-pubsub/fix-package-config-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in b/tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in -index e4dd17a..553b0b1 100644 ---- a/tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in -+++ b/tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in -@@ -1,4 +1,6 @@ - @PACKAGE_INIT@ - --INCLUDE("@PACKAGE_TCP_PUBSUB_INSTALL_CMAKE_DIR@/tcp_pubsubTargets.cmake") --find_package(Threads) -+include(CMakeFindDependencyMacro) -+find_dependency(Threads) -+ -+include("${CMAKE_CURRENT_LIST_DIR}/tcp_pubsubTargets.cmake") diff --git a/ports/tcp-pubsub/portfile.cmake b/ports/tcp-pubsub/portfile.cmake index b3119a428479e0..04f40e87db3d93 100644 --- a/ports/tcp-pubsub/portfile.cmake +++ b/ports/tcp-pubsub/portfile.cmake @@ -4,10 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse-ecal/tcp_pubsub REF "v${VERSION}" - SHA512 f89b9d9cdbd8e5787ac8923ec65cc2fc259e7d12269b1466a4c29657d8d466e39b95ec8b8483e975bf393f71b5c2d8f59cfd3d955e4e72d69716ec59fe0429af + SHA512 f8dfe5d506449c641fdb1876cbee144ca72a96fc829f2294c51a46ed2b3b0987356b36356ce43d44360ee36546f9e2af584631ddc851b89c9e9a22ced6d55f74 PATCHES - "fix-package-config-file.patch" - "use-ports-for-asio-and-recycle.patch" + fix-finding-asio-recycle-deps.patch ) vcpkg_cmake_configure( @@ -15,6 +14,8 @@ vcpkg_cmake_configure( OPTIONS -DTCP_PUBSUB_BUILD_SAMPLES=OFF -DTCP_PUBSUB_BUILD_ECAL_SAMPLES=OFF + -DTCP_PUBSUB_USE_BUILTIN_RECYCLE=OFF # A bit confusing, this means to use recycle that is installed on the system + -DTCP_PUBSUB_USE_BUILTIN_ASIO=OFF # A bit confusing, this means to use asio that is installed on the system ) vcpkg_cmake_install() diff --git a/ports/tcp-pubsub/vcpkg.json b/ports/tcp-pubsub/vcpkg.json index dbac6ff08e46ec..04e73a61b4a7a3 100644 --- a/ports/tcp-pubsub/vcpkg.json +++ b/ports/tcp-pubsub/vcpkg.json @@ -1,12 +1,13 @@ { "name": "tcp-pubsub", - "version": "1.0.3", + "version": "2.0.1", "description": "TCP based publish-subscribe library for C++", "homepage": "https://github.com/eclipse-ecal/tcp_pubsub", "license": "MIT", "supports": "!uwp", "dependencies": [ "asio", + "pthreads", "recycle", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 733b6d55605a3f..adccb44e2a7fee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9169,7 +9169,7 @@ "port-version": 0 }, "tcp-pubsub": { - "baseline": "1.0.3", + "baseline": "2.0.1", "port-version": 0 }, "tdscpp": { diff --git a/versions/t-/tcp-pubsub.json b/versions/t-/tcp-pubsub.json index 301c2e0ad2abc1..9104e9de263d36 100644 --- a/versions/t-/tcp-pubsub.json +++ b/versions/t-/tcp-pubsub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6631bc62241e7af5a5668d51803c35dcbde73e53", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "075f0da2c8e03d545d28b625ecadde2a58135382", "version": "1.0.3",