Skip to content

Commit 34009f6

Browse files
committed
update zenoh cpp vendor patch
Signed-off-by: wep21 <daisuke.nishimatsu1021@gmail.com>
1 parent fa2c7c8 commit 34009f6

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

patch/ros-kilted-zenoh-cpp-vendor.patch

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 5b7cf79..db6328b 100644
2+
index 78a7ff4..db6328b 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -17,46 +17,10 @@ find_package(ament_cmake_vendor_package REQUIRED)
5+
@@ -17,44 +17,10 @@ find_package(ament_cmake_vendor_package REQUIRED)
66
# when expanded.
77
set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memory zenoh/transport_compression zenoh/transport_tcp zenoh/transport_udp zenoh/transport_tls")
88

99
-# Set VCS_VERSION to include latest changes from zenoh/zenoh-c/zenoh-cpp to benefit from:
10-
-# - Reword SHM warning log about "setting scheduling priority":
11-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1778
12-
-# - Performances improvements at launch time:
13-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1786
14-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1789
15-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1793
16-
-# - Fixed open timeout
17-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1796
18-
-# - Improve ACL behaviour, notably for S-ROS
19-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1781
20-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1785
21-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1795
22-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1806
23-
-# - Reduce the number of threads in case of scouting
24-
-# - https://github.com/eclipse-zenoh/zenoh-c/pull/937
25-
-# - Namespace prefix support
26-
-# - https://github.com/eclipse-zenoh/zenoh/pull/1792
27-
-# - Fix debug mode crash
28-
-# - https://github.com/eclipse-zenoh/zenoh-cpp/pull/432
10+
-# - Fix a bug leading to invalid inapropriate "Unable to push non droppable network message" log and transport closure:
11+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1855
12+
-# - Fix crash with highly chunked keys:
13+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1826
14+
-# - Resolve issue with closing the Session in atexit:
15+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1632
16+
-# - Change `Session::close()` implementation so it can be safely waited and awaited in `atexit``
17+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1632
18+
-# - Add QoS overwrite interceptor allowing for instance a Router to be configured to change QoS on the fly
19+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1825
20+
-# - Add link protocols as subject to interceptors (access_control, downsampling or qos overwrite):
21+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1850
22+
-# - Add new non periodic last sample miss detection mechanism for Advanced Publisher:
23+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1861
24+
-# - Improve tracing for better analysis on the system like rmw_zenoh
25+
-# - https://github.com/eclipse-zenoh/zenoh/pull/1844
2926
-ament_vendor(zenoh_c_vendor
3027
- VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
31-
- VCS_VERSION e6a1971139f405f7887bf5bb54f0efe402123032
28+
- VCS_VERSION f60bbaba51417256b267f59f909a48eb99f1833b
3229
- CMAKE_ARGS
3330
- "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
3431
- "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE"
3532
- "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"
33+
- PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/pin-rust-1.75.0.patch
3634
-)
3735
-
3836
+find_package(zenohc REQUIRED)
3937
ament_export_dependencies(zenohc)
4038

4139
-ament_vendor(zenoh_cpp_vendor
4240
- VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp
43-
- VCS_VERSION 8ad67f6c7a9031acd437c8739bbc8ddab0ca8173
41+
- VCS_VERSION 868fdad0e7418e8f8cb96e94c89a3aed05905e63
4442
- CMAKE_ARGS
4543
- -DZENOHCXX_ZENOHC=OFF
4644
-)

0 commit comments

Comments
 (0)