From c50ed424775a4227d3e8a784d0ce5cccfe19caa4 Mon Sep 17 00:00:00 2001
From: Sina Behmanesh <sinabehmanesh.work@gmail.com>
Date: Tue, 2 Dec 2025 05:59:36 +0100
Subject: [PATCH] Update/c fastdds port (#48529)

Co-authored-by: Kai Pastor <dg0yt@darc.de>
---
 ports/fastdds/fix-deps.patch | 24 ++++++++++++++----------
 ports/fastdds/portfile.cmake |  5 +----
 ports/fastdds/vcpkg.json     |  2 +-
 versions/baseline.json       |  2 +-
 versions/f-/fastdds.json     |  5 +++++
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ports/fastdds/fix-deps.patch b/ports/fastdds/fix-deps.patch
index c346e4b16d..dbe8d76077 100644
--- a/ports/fastdds/fix-deps.patch
+++ b/ports/fastdds/fix-deps.patch
@@ -1,36 +1,40 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7974e8b..8afdb5a 100644
+index 9f7a02666..91609a491 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -255,8 +255,8 @@ if(NOT BUILD_SHARED_LIBS)
+@@ -244,8 +244,8 @@ if(NOT BUILD_SHARED_LIBS)
  endif()
- 
+
  eprosima_find_package(fastcdr 2 REQUIRED)
 -eprosima_find_thirdparty(Asio asio VERSION 1.13.0)
 -eprosima_find_thirdparty(TinyXML2 tinyxml2)
 +find_package(asio CONFIG REQUIRED)
 +find_package(tinyxml2 CONFIG REQUIRED)
- 
+
  find_package(foonathan_memory REQUIRED)
  message(STATUS "Found foonathan_memory: ${foonathan_memory_DIR}")
-@@ -268,7 +268,7 @@ if(ANDROID)
+@@ -257,7 +257,7 @@ if(ANDROID)
      endif()
  endif()
- 
+
 -include_directories(thirdparty/nlohmann-json)
 +find_package(nlohmann_json CONFIG REQUIRED)
  include_directories(thirdparty/filewatch)
- 
+
  ###############################################################################
 diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 3f4a3aa..3394cc3 100644
+index 070597df6..c0b2d6b64 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
-@@ -508,8 +508,9 @@ target_link_libraries(${PROJECT_NAME}
-     ${PRIVACY}
+@@ -169,11 +169,12 @@ target_link_libraries(${PROJECT_NAME}
+     PUBLIC
      fastcdr
      foonathan_memory
+-
 +    nlohmann_json::nlohmann_json
++
+     PRIVATE
+     eProsima_atomic
      ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}
 -    ${TINYXML2_LIBRARY}
 +    tinyxml2::tinyxml2
diff --git a/ports/fastdds/portfile.cmake b/ports/fastdds/portfile.cmake
index 050a3f7c80..fd3c41686d 100644
--- a/ports/fastdds/portfile.cmake
+++ b/ports/fastdds/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-DDS
     REF "v${VERSION}"
-    SHA512 970b80dc87224183f730b32f21dba4cdd55cf9ac88ce662c0a0f710a2bca6233754d1274a71cca64a543407a4d5f09db3badf73201b6bb5f49ff68c81b368509
+    SHA512 92869a930fe0b67ae4b457a00cb273aba6e52af3f7c39f7fc2ded8e7285237871d99579b31c28e831bebde820aeef190a70827c9e8a02c7119ca1908b181f3b6
     HEAD_REF master
     PATCHES
         fix-deps.patch
@@ -74,9 +74,6 @@ elseif(VCPKG_TARGET_IS_LINUX)
 endif()
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fastdds/discovery/parser.py" "tool_path / '../../../bin'" "tool_path / '../../${PORT}'")
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fastdds/fast-discovery-server-targets-debug.cmake" [[${_IMPORT_PREFIX}/tools/fastdds/fast-discovery-serverd-1.0.1]] [[${_IMPORT_PREFIX}/tools/fastdds/fast-discovery-server-1.0.1]])
-endif()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
diff --git a/ports/fastdds/vcpkg.json b/ports/fastdds/vcpkg.json
index 46dbd822e3..eb22e3e3f6 100644
--- a/ports/fastdds/vcpkg.json
+++ b/ports/fastdds/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fastdds",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "eprosima Fast DDS (formerly Fast RTPS) is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
   "homepage": "https://www.eprosima.com/",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 216f8380a2..4790d82c03 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2869,7 +2869,7 @@
       "port-version": 5
     },
     "fastdds": {
-      "baseline": "3.3.0",
+      "baseline": "3.4.1",
       "port-version": 0
     },
     "fastfeat": {
diff --git a/versions/f-/fastdds.json b/versions/f-/fastdds.json
index c9c8731508..af78ae54ca 100644
--- a/versions/f-/fastdds.json
+++ b/versions/f-/fastdds.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "31623c76c617f17e68239135e23835b90ad4502a",
+      "version": "3.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "06f094b701b48aaa0de221e69cc2dfead6d18801",
       "version": "3.3.0",