Skip to content

Commit b75e821

Browse files
authored
[fastdds] update to 3.3.0 (#46414)
1 parent adc180b commit b75e821

File tree

6 files changed

+20
-30
lines changed

6 files changed

+20
-30
lines changed

ports/fastdds/fix-deps.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index b2ea15f4c..8996d18f1 100644
2+
index 7974e8b..8afdb5a 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -255,8 +255,8 @@ if(NOT BUILD_SHARED_LIBS)
66
endif()
77

88
eprosima_find_package(fastcdr 2 REQUIRED)
9-
-eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
9+
-eprosima_find_thirdparty(Asio asio VERSION 1.13.0)
1010
-eprosima_find_thirdparty(TinyXML2 tinyxml2)
1111
+find_package(asio CONFIG REQUIRED)
1212
+find_package(tinyxml2 CONFIG REQUIRED)
@@ -23,10 +23,10 @@ index b2ea15f4c..8996d18f1 100644
2323

2424
###############################################################################
2525
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
26-
index 44a74948c..09330717b 100644
26+
index 3f4a3aa..3394cc3 100644
2727
--- a/src/cpp/CMakeLists.txt
2828
+++ b/src/cpp/CMakeLists.txt
29-
@@ -505,8 +505,9 @@ target_link_libraries(${PROJECT_NAME}
29+
@@ -508,8 +508,9 @@ target_link_libraries(${PROJECT_NAME}
3030
${PRIVACY}
3131
fastcdr
3232
foonathan_memory

ports/fastdds/include-cstdint.patch

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
1-
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
2-
index d4759de..66c2f7a 100644
3-
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
4-
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
5-
@@ -20,7 +20,7 @@
6-
#define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERCOMPOUNDCONDITION_HPP_
1+
diff --git a/src/cpp/rtps/security/common/SharedSecretHandle.h b/src/cpp/rtps/security/common/SharedSecretHandle.h
2+
index c53b153..b2b6507 100644
3+
--- a/src/cpp/rtps/security/common/SharedSecretHandle.h
4+
+++ b/src/cpp/rtps/security/common/SharedSecretHandle.h
5+
@@ -21,6 +21,7 @@
6+
#include <rtps/security/common/Handle.h>
77

8-
#include <memory>
9-
-
8+
#include <vector>
109
+#include <cstdint>
11-
#include "DDSFilterCondition.hpp"
1210

1311
namespace eprosima {
14-
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
15-
index 4ae70cb..f66790e 100644
16-
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
17-
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
18-
@@ -23,7 +23,7 @@
19-
20-
#include <memory>
21-
#include <regex>
22-
-
23-
+#include <cstdint>
24-
namespace eprosima {
2512
namespace fastdds {
26-
namespace dds {

ports/fastdds/portfile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO eProsima/Fast-DDS
44
REF "v${VERSION}"
5-
SHA512 ddef07c182d5d0b6096c8714595775d13fbbf9bedcd7e296c38f5b8ce0488d89b7a0048741143dbffbb9c21c3707b1084d1cd80ae7d019c0cac90e0f5eba5519
5+
SHA512 970b80dc87224183f730b32f21dba4cdd55cf9ac88ce662c0a0f710a2bca6233754d1274a71cca64a543407a4d5f09db3badf73201b6bb5f49ff68c81b368509
66
HEAD_REF master
77
PATCHES
88
fix-deps.patch

ports/fastdds/vcpkg.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "fastdds",
3-
"version": "3.2.2",
4-
"port-version": 2,
3+
"version": "3.3.0",
54
"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.",
65
"homepage": "https://www.eprosima.com/",
76
"license": "Apache-2.0",

versions/baseline.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,8 +2797,8 @@
27972797
"port-version": 5
27982798
},
27992799
"fastdds": {
2800-
"baseline": "3.2.2",
2801-
"port-version": 2
2800+
"baseline": "3.3.0",
2801+
"port-version": 0
28022802
},
28032803
"fastfeat": {
28042804
"baseline": "391d5e9",

versions/f-/fastdds.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "06f094b701b48aaa0de221e69cc2dfead6d18801",
5+
"version": "3.3.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "c6aec23afb0337f6b4c9dedfe33337637ef258bd",
510
"version": "3.2.2",

0 commit comments

Comments
 (0)