From 7a7de390cd7d6b401f58ec4816485fc37f30d378 Mon Sep 17 00:00:00 2001 From: wep21 Date: Mon, 4 May 2026 16:53:13 +0900 Subject: [PATCH 01/10] chore: update rattler-build Signed-off-by: wep21 --- pixi.lock | 70 +++++++++++++++++++++++++++++-------------------------- pixi.toml | 3 +-- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/pixi.lock b/pixi.lock index 980dc74b..42caae34 100644 --- a/pixi.lock +++ b/pixi.lock @@ -41,7 +41,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/linux-64/patchelf-0.18.0-h3f2d84a_2.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/python-3.14.4-habeac84_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.57.2-he64ecbb_1.conda + - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.63.1-ha759004_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-index-0.27.21-h58ba7e0_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/readline-8.3-h853b02a_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/rhash-1.4.6-hb9d3cd8_1.conda @@ -108,7 +108,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/patchelf-0.18.0-h5ad3122_2.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/python-3.14.4-hfd9ac0a_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.57.2-hb434046_1.conda + - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.63.1-h1d7f6d8_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-index-0.27.21-h9889dc0_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/readline-8.3-hb682ff5_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rhash-1.4.6-h86ecc28_1.conda @@ -168,7 +168,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/osx-64/openssl-3.6.2-hc881268_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/python-3.14.4-h7c6738f_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.57.2-h4728fb8_1.conda + - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.63.1-h6193a51_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-index-0.27.21-hbc4d974_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/readline-8.3-h68b038d_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/rhash-1.4.6-h6e16a3a_1.conda @@ -227,7 +227,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/osx-arm64/openssl-3.6.2-hd24854e_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/python-3.14.4-h4c637c5_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.57.2-h6fdd925_1.conda + - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.63.1-h20b3172_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-index-0.27.21-hcb0414c_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/readline-8.3-h46df422_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rhash-1.4.6-h5505292_1.conda @@ -284,7 +284,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.2-hf411b9b_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/python-3.14.4-h4b44e0e_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.57.2-h18a1a76_1.conda + - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.63.1-he94b42d_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-index-0.27.21-h91801bb_0.conda - conda: https://repo.prefix.dev/conda-forge/noarch/setuptools-81.0.0-pyh332efcf_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h6ed50ae_3.conda @@ -2133,62 +2133,66 @@ packages: version: 6.0.3 sha256: 34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310 requires_python: '>=3.8' -- conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.57.2-he64ecbb_1.conda - sha256: 7050df6859e1f3c1223dead79b1f4aa5b92f7519db7ad7cb5982d87fd2999852 - md5: 4d9aed902b2afb49657a4e85f493aedd +- conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.63.1-ha759004_0.conda + sha256: b74a2b56deced516b2aa41f6be29e564e6c2e34420cab47fa13e9163473f0cfd + md5: 08283f85aed2327953f475aa4bb74eeb depends: - patchelf - __glibc >=2.17,<3.0.a0 + - libstdcxx >=14 - libgcc >=14 - - openssl >=3.5.5,<4.0a0 + - openssl >=3.5.6,<4.0a0 constrains: - __glibc >=2.17 license: BSD-3-Clause license_family: BSD purls: [] - size: 19271452 - timestamp: 1770649397185 -- conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.57.2-hb434046_1.conda - sha256: 51a369b6cfe24fa0f8f7a7ea9bb77158f8806f43b196ce5a30a61892092afe64 - md5: 9f14051749d3c1b3e0318a6b8a54b0ca + size: 18960593 + timestamp: 1777302457090 +- conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.63.1-h1d7f6d8_0.conda + sha256: 33de2460d8766b5cf0476ad792b154c70ac44fa23383d1e033ff4d929c9978a2 + md5: 8e8ff2b83e52a9cb9dd140887c4c39cd depends: - patchelf - libgcc >=14 - - openssl >=3.5.5,<4.0a0 + - libstdcxx >=14 + - openssl >=3.5.6,<4.0a0 constrains: - __glibc >=2.17 license: BSD-3-Clause license_family: BSD purls: [] - size: 19846896 - timestamp: 1770649419199 -- conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.57.2-h4728fb8_1.conda - sha256: 5ec581b4f39060c1b90687627f4b0bf04ee62d405f43072de7c83a46a9448324 - md5: 286416d9d4b0c9fedd90e0ed56be240c + size: 18551002 + timestamp: 1777302460064 +- conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.63.1-h6193a51_0.conda + sha256: 24d50cf6a1bbefc1b2869e35743bb16f389968a762fb12d4dfe2847bb4728c0c + md5: 5b62b4143dfe3e879de9cd515ff415e4 depends: - - __osx >=10.13 + - libcxx >=19 + - __osx >=11.0 constrains: - __osx >=10.13 license: BSD-3-Clause license_family: BSD purls: [] - size: 17788466 - timestamp: 1770649457751 -- conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.57.2-h6fdd925_1.conda - sha256: 7fa90a0d2ecb767796cadfa6f1384e52229c9cdd10c11ce49a3428048f64b91c - md5: a28d853fd6fff4914e3248343b158837 + size: 18002171 + timestamp: 1777302510485 +- conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.63.1-h20b3172_0.conda + sha256: e76f76378a7fd0caac13c9d7c3ad3136348e2d7c497a3a5c85ff2bc2ce53568d + md5: fbdf97e22cd76aa0ea3e33b8133a9b61 depends: + - libcxx >=19 - __osx >=11.0 constrains: - __osx >=11.0 license: BSD-3-Clause license_family: BSD purls: [] - size: 16253611 - timestamp: 1770649407683 -- conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.57.2-h18a1a76_1.conda - sha256: 9b575a5eaae1c427251d75ad36f6707f541e59056adcde35fca410c7f5aa29aa - md5: 545404bf30528513fd12c111b01c95a0 + size: 16559962 + timestamp: 1777302492090 +- conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.63.1-he94b42d_0.conda + sha256: f5829597b638eb91987aa14ff9c9fd1fb7b8c604c1065eb2325bc0be2be3cb73 + md5: 11a121945114bf59d8cee7186b4b6942 depends: - vc >=14.3,<15 - vc14_runtime >=14.44.35208 @@ -2196,8 +2200,8 @@ packages: license: BSD-3-Clause license_family: BSD purls: [] - size: 16311008 - timestamp: 1770649439173 + size: 18551451 + timestamp: 1777302475749 - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-index-0.27.21-h58ba7e0_0.conda sha256: 60b930d658567ee55617707f52ed358e1f0be6adcf4ce97ba45ddfedc3529393 md5: b08575bd7d14d08369990817233911ae diff --git a/pixi.toml b/pixi.toml index b2cc8aef..7b67c075 100644 --- a/pixi.toml +++ b/pixi.toml @@ -12,8 +12,7 @@ libc = { family="glibc", version="2.17" } [dependencies] python = ">=3.14.0,<3.15" # Include the latest rattler-build fixes w.r.t. to patches handling -# rattler-build regression, pinning to 0.57 -rattler-build = "<0.58.0" +rattler-build = ">=0.63.1" cmake = "<4.0" setuptools = "<82.0" rattler-index = ">=0.27.16" From 389fe5fee4e1cff1d65db70dd03862ddcbcc812c Mon Sep 17 00:00:00 2001 From: wep21 Date: Mon, 4 May 2026 21:26:45 +0900 Subject: [PATCH 02/10] bump rattler-build Signed-off-by: wep21 --- pixi.lock | 69 ++++++++++++++++++++++++++----------------------------- pixi.toml | 2 +- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/pixi.lock b/pixi.lock index 42caae34..d7923565 100644 --- a/pixi.lock +++ b/pixi.lock @@ -41,7 +41,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/linux-64/patchelf-0.18.0-h3f2d84a_2.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/python-3.14.4-habeac84_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.63.1-ha759004_0.conda + - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.64.0-ha759004_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-index-0.27.21-h58ba7e0_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/readline-8.3-h853b02a_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-64/rhash-1.4.6-hb9d3cd8_1.conda @@ -108,7 +108,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/patchelf-0.18.0-h5ad3122_2.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/python-3.14.4-hfd9ac0a_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.63.1-h1d7f6d8_0.conda + - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.64.0-h1d7f6d8_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-index-0.27.21-h9889dc0_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/readline-8.3-hb682ff5_0.conda - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rhash-1.4.6-h86ecc28_1.conda @@ -168,7 +168,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/osx-64/openssl-3.6.2-hc881268_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/python-3.14.4-h7c6738f_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.63.1-h6193a51_0.conda + - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.64.0-h6193a51_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-index-0.27.21-hbc4d974_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/readline-8.3-h68b038d_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-64/rhash-1.4.6-h6e16a3a_1.conda @@ -227,7 +227,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/osx-arm64/openssl-3.6.2-hd24854e_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/python-3.14.4-h4c637c5_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.63.1-h20b3172_0.conda + - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.64.0-h20b3172_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-index-0.27.21-hcb0414c_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/readline-8.3-h46df422_0.conda - conda: https://repo.prefix.dev/conda-forge/osx-arm64/rhash-1.4.6-h5505292_1.conda @@ -284,7 +284,7 @@ environments: - conda: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.2-hf411b9b_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/python-3.14.4-h4b44e0e_100_cp314.conda - conda: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.63.1-he94b42d_0.conda + - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.64.0-he94b42d_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/rattler-index-0.27.21-h91801bb_0.conda - conda: https://repo.prefix.dev/conda-forge/noarch/setuptools-81.0.0-pyh332efcf_0.conda - conda: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h6ed50ae_3.conda @@ -2133,75 +2133,70 @@ packages: version: 6.0.3 sha256: 34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310 requires_python: '>=3.8' -- conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.63.1-ha759004_0.conda - sha256: b74a2b56deced516b2aa41f6be29e564e6c2e34420cab47fa13e9163473f0cfd - md5: 08283f85aed2327953f475aa4bb74eeb +- conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-build-0.64.0-ha759004_0.conda + sha256: adbb297b5883306de7e9ea5111fcbaed5dba0e1d1d55f32817b2bd0182327377 + md5: c8a246df04576cb25a845b187219045e depends: - patchelf - - __glibc >=2.17,<3.0.a0 - libstdcxx >=14 - libgcc >=14 + - __glibc >=2.17,<3.0.a0 - openssl >=3.5.6,<4.0a0 constrains: - __glibc >=2.17 license: BSD-3-Clause - license_family: BSD purls: [] - size: 18960593 - timestamp: 1777302457090 -- conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.63.1-h1d7f6d8_0.conda - sha256: 33de2460d8766b5cf0476ad792b154c70ac44fa23383d1e033ff4d929c9978a2 - md5: 8e8ff2b83e52a9cb9dd140887c4c39cd + size: 19275482 + timestamp: 1777890024508 +- conda: https://repo.prefix.dev/conda-forge/linux-aarch64/rattler-build-0.64.0-h1d7f6d8_0.conda + sha256: 10008e0ec1b8af377bf8cf8168f0ca972d2097388f37fcc2453c59b213163c1f + md5: 40c0cdfebd1a3ef283642743173ac8ad depends: - patchelf - - libgcc >=14 - libstdcxx >=14 + - libgcc >=14 - openssl >=3.5.6,<4.0a0 constrains: - __glibc >=2.17 license: BSD-3-Clause - license_family: BSD purls: [] - size: 18551002 - timestamp: 1777302460064 -- conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.63.1-h6193a51_0.conda - sha256: 24d50cf6a1bbefc1b2869e35743bb16f389968a762fb12d4dfe2847bb4728c0c - md5: 5b62b4143dfe3e879de9cd515ff415e4 + size: 18876052 + timestamp: 1777890043675 +- conda: https://repo.prefix.dev/conda-forge/osx-64/rattler-build-0.64.0-h6193a51_0.conda + sha256: e23ec8e46b17ad398fc6d565e096dfa80b0f10417e24d906ee9135bad130a032 + md5: 5efe32528907e68c38fb67930e195f09 depends: - libcxx >=19 - __osx >=11.0 constrains: - __osx >=10.13 license: BSD-3-Clause - license_family: BSD purls: [] - size: 18002171 - timestamp: 1777302510485 -- conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.63.1-h20b3172_0.conda - sha256: e76f76378a7fd0caac13c9d7c3ad3136348e2d7c497a3a5c85ff2bc2ce53568d - md5: fbdf97e22cd76aa0ea3e33b8133a9b61 + size: 18434629 + timestamp: 1777890092226 +- conda: https://repo.prefix.dev/conda-forge/osx-arm64/rattler-build-0.64.0-h20b3172_0.conda + sha256: 2fc71f1b64ac2b00781981f53597431d1d7991030ea504cb5f6502df6e9e92fd + md5: 8dd8e67c86e3e68bab3901edad13c343 depends: - libcxx >=19 - __osx >=11.0 constrains: - __osx >=11.0 license: BSD-3-Clause - license_family: BSD purls: [] - size: 16559962 - timestamp: 1777302492090 -- conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.63.1-he94b42d_0.conda - sha256: f5829597b638eb91987aa14ff9c9fd1fb7b8c604c1065eb2325bc0be2be3cb73 - md5: 11a121945114bf59d8cee7186b4b6942 + size: 16868058 + timestamp: 1777890066736 +- conda: https://repo.prefix.dev/conda-forge/win-64/rattler-build-0.64.0-he94b42d_0.conda + sha256: 42ee78500232b4253c08ca3731aca9abf9091a16ced70d9ca5216fcd14cf26be + md5: 038dcbdd32f9e359f47f86e953e8d721 depends: - vc >=14.3,<15 - vc14_runtime >=14.44.35208 - ucrt >=10.0.20348.0 license: BSD-3-Clause - license_family: BSD purls: [] - size: 18551451 - timestamp: 1777302475749 + size: 19057671 + timestamp: 1777890059720 - conda: https://repo.prefix.dev/conda-forge/linux-64/rattler-index-0.27.21-h58ba7e0_0.conda sha256: 60b930d658567ee55617707f52ed358e1f0be6adcf4ce97ba45ddfedc3529393 md5: b08575bd7d14d08369990817233911ae diff --git a/pixi.toml b/pixi.toml index 7b67c075..8d180715 100644 --- a/pixi.toml +++ b/pixi.toml @@ -12,7 +12,7 @@ libc = { family="glibc", version="2.17" } [dependencies] python = ">=3.14.0,<3.15" # Include the latest rattler-build fixes w.r.t. to patches handling -rattler-build = ">=0.63.1" +rattler-build = ">=0.64.0" cmake = "<4.0" setuptools = "<82.0" rattler-index = ">=0.27.16" From f7fe50a1c13dc2e6a3e3122efb5fa646b6010ce2 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Mon, 4 May 2026 22:42:15 +0900 Subject: [PATCH 03/10] update patch Signed-off-by: Daisuke Nishimatsu --- .../ros-rolling-moveit-setup-srdf-plugins.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/patch/ros-rolling-moveit-setup-srdf-plugins.patch b/patch/ros-rolling-moveit-setup-srdf-plugins.patch index cb780f61..21fc156e 100644 --- a/patch/ros-rolling-moveit-setup-srdf-plugins.patch +++ b/patch/ros-rolling-moveit-setup-srdf-plugins.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6e34b6346..2820d3390 100644 +index 6e34b6346b..2820d3390c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ find_package(ament_cmake_ros REQUIRED) @@ -24,7 +24,7 @@ index 6e34b6346..2820d3390 100644 if(BUILD_TESTING) find_package(ament_cmake_gtest REQUIRED) diff --git a/include/moveit_setup_srdf_plugins/collision_matrix_model.hpp b/include/moveit_setup_srdf_plugins/collision_matrix_model.hpp -index 57e34ef04..296a6d8eb 100644 +index 57e34ef04c..296a6d8ebc 100644 --- a/include/moveit_setup_srdf_plugins/collision_matrix_model.hpp +++ b/include/moveit_setup_srdf_plugins/collision_matrix_model.hpp @@ -65,7 +65,7 @@ public: @@ -37,7 +37,7 @@ index 57e34ef04..296a6d8eb 100644 private: LinkPairMap::iterator item(const QModelIndex& index); diff --git a/src/collision_linear_model.cpp b/src/collision_linear_model.cpp -index 9fb5b65d1..cca8a6aeb 100644 +index 9fb5b65d1b..1a6f00ee55 100644 --- a/src/collision_linear_model.cpp +++ b/src/collision_linear_model.cpp @@ -39,6 +39,7 @@ @@ -48,18 +48,19 @@ index 9fb5b65d1..cca8a6aeb 100644 #include namespace moveit_setup { -@@ -264,7 +265,7 @@ bool SortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& s +@@ -264,8 +265,8 @@ bool SortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& s m->data(m->index(source_row, 2), Qt::CheckStateRole) != Qt::Checked) return false; // not accepted due to check state - const QRegExp regexp = filterRegExp(); -+ const QRegularExpression regexp = filterRegularExpression(); - if (regexp.isEmpty()) ++ const QRegularExpression regexp = filterRegularExpression(); + if (regexp.pattern().isEmpty()) - return true; + return true; + return m->data(m->index(source_row, 0, source_parent), Qt::DisplayRole).toString().contains(regexp) || diff --git a/src/collision_matrix_model.cpp b/src/collision_matrix_model.cpp -index f8de45156..6f06ee2f2 100644 +index f8de451567..6f06ee2f24 100644 --- a/src/collision_matrix_model.cpp +++ b/src/collision_matrix_model.cpp @@ -42,6 +42,7 @@ @@ -84,7 +85,7 @@ index f8de45156..6f06ee2f2 100644 for (int idx = 0, end = q_names_.size(); idx != end; ++idx) { diff --git a/src/default_collisions_widget.cpp b/src/default_collisions_widget.cpp -index 687378912..b09814513 100644 +index 6873789126..b09814513c 100644 --- a/src/default_collisions_widget.cpp +++ b/src/default_collisions_widget.cpp @@ -275,8 +275,8 @@ void DefaultCollisionsWidget::loadCollisionTable() From e8ad3ffaa82de2552b2869c46cc344f9c1a5ae8c Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Mon, 4 May 2026 22:49:54 +0900 Subject: [PATCH 04/10] cleanup Signed-off-by: Daisuke Nishimatsu --- .github/workflows/testpr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index ef280de5..5ba67032 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -7,7 +7,7 @@ env: # Change to 'true' to enable the cache upload as artifacts SAVE_CACHE_AS_ARTIFACT: 'true' # Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging - IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false' + IGNORE_CACHE_AND_DO_FULL_REBUILD: 'true' jobs: build: From 5ae59803e671feea169db1d9381dd6ce7b278e2c Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Mon, 4 May 2026 23:58:00 +0900 Subject: [PATCH 05/10] update Signed-off-by: Daisuke Nishimatsu --- .github/workflows/testpr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 5ba67032..5bf641d2 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -113,7 +113,7 @@ jobs: - name: Build recipes shell: bash -l {0} run: | - pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-rolling --skip-existing + pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-rolling --skip-existing - name: See packages that will be saved in cache shell: bash -l {0} From fc6b24cba8afa1d76730755f6925e8ca9b00050d Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Tue, 5 May 2026 00:36:01 +0900 Subject: [PATCH 06/10] update Signed-off-by: Daisuke Nishimatsu --- rosdistro_additional_recipes.yaml | 3 +++ vinca.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rosdistro_additional_recipes.yaml b/rosdistro_additional_recipes.yaml index fa1aae8c..bc8c71ef 100644 --- a/rosdistro_additional_recipes.yaml +++ b/rosdistro_additional_recipes.yaml @@ -423,3 +423,6 @@ ur_client_library: tag: release/rolling/ur_client_library/2.10.0-1 url: https://github.com/ros2-gbp/Universal_Robots_Client_Library-release.git version: 2.10.0 +# Remove all lines after this one on new full rebuild +moveit_setup_srdf_plugins: + build_number: 19 diff --git a/vinca.yaml b/vinca.yaml index 8d60587a..68654d17 100644 --- a/vinca.yaml +++ b/vinca.yaml @@ -5,7 +5,7 @@ conda_index: - robostack.yaml - packages-ignore.yaml -# Reminder for next full rebuild, the next build number should be 19 +# Reminder for next full rebuild, the next build number should be 20 build_number: 18 mutex_package: From fdbcdfb2e466879ed8e74ca349c7a818d2f09b04 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Tue, 5 May 2026 00:52:46 +0900 Subject: [PATCH 07/10] update Signed-off-by: Daisuke Nishimatsu --- .github/workflows/testpr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 5bf641d2..3cca7f22 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -101,7 +101,7 @@ jobs: - name: Delete specific outdated cache entries shell: bash -l {0} run: | - # rm -rf ${{ matrix.folder_cache }}/ros-rolling-rviz-visual-tools* 2>/dev/null || true + rm -rf ${{ matrix.folder_cache }}/ros-rolling-desktop* 2>/dev/null || true mkdir -p ${{ matrix.folder_cache }} pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force From 780aebfac76968205d06e8316e3701d94dfdaf31 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Tue, 5 May 2026 00:59:00 +0900 Subject: [PATCH 08/10] try fullrebuild Signed-off-by: Daisuke Nishimatsu --- .github/workflows/testpr.yml | 2 +- rosdistro_additional_recipes.yaml | 3 --- vinca.yaml | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 3cca7f22..2ea1ce30 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -101,7 +101,7 @@ jobs: - name: Delete specific outdated cache entries shell: bash -l {0} run: | - rm -rf ${{ matrix.folder_cache }}/ros-rolling-desktop* 2>/dev/null || true + # rm -rf ${{ matrix.folder_cache }}/ros-rolling-desktop* 2>/dev/null || true mkdir -p ${{ matrix.folder_cache }} pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force diff --git a/rosdistro_additional_recipes.yaml b/rosdistro_additional_recipes.yaml index bc8c71ef..fa1aae8c 100644 --- a/rosdistro_additional_recipes.yaml +++ b/rosdistro_additional_recipes.yaml @@ -423,6 +423,3 @@ ur_client_library: tag: release/rolling/ur_client_library/2.10.0-1 url: https://github.com/ros2-gbp/Universal_Robots_Client_Library-release.git version: 2.10.0 -# Remove all lines after this one on new full rebuild -moveit_setup_srdf_plugins: - build_number: 19 diff --git a/vinca.yaml b/vinca.yaml index 68654d17..416198d2 100644 --- a/vinca.yaml +++ b/vinca.yaml @@ -6,11 +6,11 @@ conda_index: - packages-ignore.yaml # Reminder for next full rebuild, the next build number should be 20 -build_number: 18 +build_number: 19 mutex_package: name: "ros2-distro-mutex" - version: "0.15.0" + version: "0.16.0" upper_bound: "x.x" run_constraints: - libboost 1.88.* From 93ec4583d496b24899fc4c43f2773b6420bc798a Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Tue, 5 May 2026 01:01:42 +0900 Subject: [PATCH 09/10] update snapshot Signed-off-by: Daisuke Nishimatsu --- rosdistro_snapshot.yaml | 336 ++++++++++++++++++++-------------------- 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/rosdistro_snapshot.yaml b/rosdistro_snapshot.yaml index 4e16bbe5..ea1b9113 100644 --- a/rosdistro_snapshot.yaml +++ b/rosdistro_snapshot.yaml @@ -1,4 +1,4 @@ -# Snapshot generated by vinca-snapshot on 2026-04-30T18:09:08Z UTC for distro rolling +# Snapshot generated by vinca-snapshot on 2026-05-04T16:00:45Z UTC for distro rolling acado_vendor: tag: release/rolling/acado_vendor/1.0.0-7 url: https://github.com/ros2-gbp/acado_vendor-release.git @@ -412,13 +412,13 @@ auto_apms_util: url: https://github.com/ros2-gbp/autoapms-release.git version: 1.5.1 automatika_embodied_agents: - tag: release/rolling/automatika_embodied_agents/0.7.0-2 + tag: release/rolling/automatika_embodied_agents/0.7.1-1 url: https://github.com/ros2-gbp/automatika_embodied_agents-release.git - version: 0.7.0 + version: 0.7.1 automatika_ros_sugar: - tag: release/rolling/automatika_ros_sugar/0.6.1-2 + tag: release/rolling/automatika_ros_sugar/0.7.0-1 url: https://github.com/ros2-gbp/automatika_ros_sugar-release.git - version: 0.6.1 + version: 0.7.0 automotive_autonomy_msgs: tag: release/rolling/automotive_autonomy_msgs/3.0.4-6 url: https://github.com/ros2-gbp/automotive_autonomy_msgs-release.git @@ -432,11 +432,11 @@ automotive_platform_msgs: url: https://github.com/ros2-gbp/automotive_autonomy_msgs-release.git version: 3.0.4 autoware_adapi_v1_msgs: - tag: release/rolling/autoware_adapi_v1_msgs/1.9.0-2 + tag: release/rolling/autoware_adapi_v1_msgs/1.9.0-3 url: https://github.com/ros2-gbp/autoware_adapi_msgs-release.git version: 1.9.0 autoware_adapi_version_msgs: - tag: release/rolling/autoware_adapi_version_msgs/1.9.0-2 + tag: release/rolling/autoware_adapi_version_msgs/1.9.0-3 url: https://github.com/ros2-gbp/autoware_adapi_msgs-release.git version: 1.9.0 autoware_auto_msgs: @@ -444,9 +444,9 @@ autoware_auto_msgs: url: https://github.com/ros2-gbp/autoware_auto_msgs-release.git version: 1.0.0 autoware_cmake: - tag: release/rolling/autoware_cmake/1.1.0-2 + tag: release/rolling/autoware_cmake/1.2.0-1 url: https://github.com/ros2-gbp/autoware_cmake-release.git - version: 1.1.0 + version: 1.2.0 autoware_common_msgs: tag: release/rolling/autoware_common_msgs/1.11.0-2 url: https://github.com/ros2-gbp/autoware_msgs-release.git @@ -480,17 +480,17 @@ autoware_internal_planning_msgs: url: https://github.com/ros2-gbp/autoware_internal_msgs-release.git version: 1.12.1 autoware_lanelet2_extension: - tag: release/rolling/autoware_lanelet2_extension/0.7.2-2 + tag: release/rolling/autoware_lanelet2_extension/1.0.0-1 url: https://github.com/ros2-gbp/autoware_lanelet2_extension-release.git - version: 0.7.2 + version: 1.0.0 autoware_lanelet2_extension_python: - tag: release/rolling/autoware_lanelet2_extension_python/0.7.2-2 + tag: release/rolling/autoware_lanelet2_extension_python/1.0.0-1 url: https://github.com/ros2-gbp/autoware_lanelet2_extension-release.git - version: 0.7.2 + version: 1.0.0 autoware_lint_common: - tag: release/rolling/autoware_lint_common/1.1.0-2 + tag: release/rolling/autoware_lint_common/1.2.0-1 url: https://github.com/ros2-gbp/autoware_cmake-release.git - version: 1.1.0 + version: 1.2.0 autoware_localization_msgs: tag: release/rolling/autoware_localization_msgs/1.11.0-2 url: https://github.com/ros2-gbp/autoware_msgs-release.git @@ -1532,17 +1532,17 @@ four_wheel_steering_msgs: url: https://github.com/ros2-gbp/four_wheel_steering_msgs-release.git version: 2.0.1 foxglove_bridge: - tag: release/rolling/foxglove_bridge/3.2.6-2 + tag: release/rolling/foxglove_bridge/3.3.0-1 url: https://github.com/ros2-gbp/foxglove_bridge-release.git - version: 3.2.6 + version: 3.3.0 foxglove_compressed_video_transport: tag: release/rolling/foxglove_compressed_video_transport/3.0.2-2 url: https://github.com/ros2-gbp/foxglove_compressed_video_transport-release.git version: 3.0.2 foxglove_msgs: - tag: release/rolling/foxglove_msgs/3.2.6-2 + tag: release/rolling/foxglove_msgs/3.3.0-1 url: https://github.com/ros2-gbp/foxglove_bridge-release.git - version: 3.2.6 + version: 3.3.0 foxglove_sdk_vendor: tag: release/rolling/foxglove_sdk_vendor/0.2.0-3 url: https://github.com/ros2-gbp/foxglove_sdk_vendor-release.git @@ -1728,7 +1728,7 @@ gz_cmake_vendor: url: https://github.com/ros2-gbp/gz_cmake_vendor-release.git version: 0.4.4 gz_common_vendor: - tag: release/rolling/gz_common_vendor/0.3.5-2 + tag: release/rolling/gz_common_vendor/0.3.5-3 url: https://github.com/ros2-gbp/gz_common_vendor-release.git version: 0.3.5 gz_dartsim_vendor: @@ -1812,9 +1812,9 @@ hash_library_vendor: url: https://github.com/ros2-gbp/hash_library_vendor-release.git version: 0.1.1 hatchbed_common: - tag: release/rolling/hatchbed_common/0.1.5-2 + tag: release/rolling/hatchbed_common/0.1.7-1 url: https://github.com/ros2-gbp/hatchbed_common-release.git - version: 0.1.5 + version: 0.1.7 heaphook: tag: release/rolling/heaphook/0.1.1-3 url: https://github.com/ros2-gbp/heaphook-release.git @@ -1916,13 +1916,13 @@ image_view: url: https://github.com/ros2-gbp/image_pipeline-release.git version: 7.1.3 imu_complementary_filter: - tag: release/rolling/imu_complementary_filter/2.2.2-2 + tag: release/rolling/imu_complementary_filter/2.2.3-1 url: https://github.com/ros2-gbp/imu_tools-release.git - version: 2.2.2 + version: 2.2.3 imu_filter_madgwick: - tag: release/rolling/imu_filter_madgwick/2.2.2-2 + tag: release/rolling/imu_filter_madgwick/2.2.3-1 url: https://github.com/ros2-gbp/imu_tools-release.git - version: 2.2.2 + version: 2.2.3 imu_pipeline: tag: release/rolling/imu_pipeline/0.6.1-2 url: https://github.com/ros2-gbp/imu_pipeline-release.git @@ -1936,9 +1936,9 @@ imu_sensor_broadcaster: url: https://github.com/ros2-gbp/ros2_controllers-release.git version: 6.6.0 imu_tools: - tag: release/rolling/imu_tools/2.2.2-2 + tag: release/rolling/imu_tools/2.2.3-1 url: https://github.com/ros2-gbp/imu_tools-release.git - version: 2.2.2 + version: 2.2.3 imu_transformer: tag: release/rolling/imu_transformer/0.6.1-2 url: https://github.com/ros2-gbp/imu_pipeline-release.git @@ -2028,9 +2028,9 @@ key_teleop: url: https://github.com/ros2-gbp/teleop_tools-release.git version: 2.0.0 keyboard_handler: - tag: release/rolling/keyboard_handler/0.5.0-2 + tag: release/rolling/keyboard_handler/0.5.1-1 url: https://github.com/ros2-gbp/keyboard_handler-release.git - version: 0.5.0 + version: 0.5.1 kinematics_interface: tag: release/rolling/kinematics_interface/2.4.0-3 url: https://github.com/ros2-gbp/kinematics_interface-release.git @@ -2056,9 +2056,9 @@ kinova_gen3_lite_moveit_config: url: https://github.com/ros2-gbp/ros2_kortex-release.git version: 0.2.5 kitti_metrics_eval: - tag: release/rolling/kitti_metrics_eval/2.7.0-2 + tag: release/rolling/kitti_metrics_eval/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 kobuki_core: tag: release/rolling/kobuki_core/1.4.0-4 url: https://github.com/ros2-gbp/kobuki_core-release.git @@ -2072,13 +2072,13 @@ kobuki_velocity_smoother: url: https://github.com/ros2-gbp/kobuki_velocity_smoother-release.git version: 0.15.1 kompass: - tag: release/rolling/kompass/0.4.1-2 + tag: release/rolling/kompass/0.5.0-1 url: https://github.com/ros2-gbp/kompass-release.git - version: 0.4.1 + version: 0.5.0 kompass_interfaces: - tag: release/rolling/kompass_interfaces/0.4.1-2 + tag: release/rolling/kompass_interfaces/0.5.0-1 url: https://github.com/ros2-gbp/kompass-release.git - version: 0.4.1 + version: 0.5.0 kortex_api: tag: release/rolling/kortex_api/0.2.5-2 url: https://github.com/ros2-gbp/ros2_kortex-release.git @@ -2284,9 +2284,9 @@ libcaer_vendor: url: https://github.com/ros2-gbp/libcaer_vendor-release.git version: 2.0.0 libcamera: - tag: release/rolling/libcamera/0.7.0-3 + tag: release/rolling/libcamera/0.7.1-2 url: https://github.com/ros2-gbp/libcamera-release.git - version: 0.7.0 + version: 0.7.1 libg2o: tag: release/rolling/libg2o/2020.5.29-6 url: https://github.com/ros2-gbp/libg2o-release.git @@ -2304,9 +2304,9 @@ librealsense2: url: https://github.com/ros2-gbp/librealsense2-release.git version: 2.57.7 libstatistics_collector: - tag: release/rolling/libstatistics_collector/2.1.1-2 + tag: release/rolling/libstatistics_collector/2.1.2-1 url: https://github.com/ros2-gbp/libstatistics_collector-release.git - version: 2.1.1 + version: 2.1.2 libyaml_vendor: tag: release/rolling/libyaml_vendor/1.8.1-2 url: https://github.com/ros2-gbp/libyaml_vendor-release.git @@ -2348,13 +2348,13 @@ logging_demo: url: https://github.com/ros2-gbp/demos-release.git version: 0.37.8 lttngpy: - tag: release/rolling/lttngpy/8.10.1-2 + tag: release/rolling/lttngpy/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 lz4_cmake_module: - tag: release/rolling/lz4_cmake_module/0.33.1-2 + tag: release/rolling/lz4_cmake_module/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 magic_enum: tag: release/rolling/magic_enum/0.9.7-2 url: https://github.com/ros2-gbp/magic_enum-release.git @@ -2372,9 +2372,9 @@ magnetometer_pipeline: url: https://github.com/ros2-gbp/compass-release.git version: 3.0.2 map_msgs: - tag: release/rolling/map_msgs/2.6.0-2 + tag: release/rolling/map_msgs/2.6.1-1 url: https://github.com/ros2-gbp/navigation_msgs-release.git - version: 2.6.0 + version: 2.6.1 mapviz: tag: release/rolling/mapviz/2.6.2-3 url: https://github.com/ros2-gbp/mapviz-release.git @@ -2456,9 +2456,9 @@ mavros_msgs: url: https://github.com/ros2-gbp/mavros-release.git version: 2.14.0 mcap_vendor: - tag: release/rolling/mcap_vendor/0.33.1-2 + tag: release/rolling/mcap_vendor/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 mecanum_drive_controller: tag: release/rolling/mecanum_drive_controller/6.6.0-2 url: https://github.com/ros2-gbp/ros2_controllers-release.git @@ -2520,133 +2520,133 @@ mobileye_560_660_msgs: url: https://github.com/ros2-gbp/astuff_sensor_msgs-release.git version: 4.0.0 mola: - tag: release/rolling/mola/2.7.0-2 + tag: release/rolling/mola/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_bridge_ros2: - tag: release/rolling/mola_bridge_ros2/2.7.0-2 + tag: release/rolling/mola_bridge_ros2/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_common: tag: release/rolling/mola_common/0.5.2-2 url: https://github.com/ros2-gbp/mola_common-release.git version: 0.5.2 mola_demos: - tag: release/rolling/mola_demos/2.7.0-2 + tag: release/rolling/mola_demos/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_georeferencing: - tag: release/rolling/mola_georeferencing/2.2.0-2 + tag: release/rolling/mola_georeferencing/2.3.0-1 url: https://github.com/ros2-gbp/mola_state_estimation-release.git - version: 2.2.0 + version: 2.3.0 mola_gnss_to_markers: tag: release/rolling/mola_gnss_to_markers/0.1.2-2 url: https://github.com/ros2-gbp/mola_gnss_to_markers-release.git version: 0.1.2 mola_gtsam_factors: - tag: release/rolling/mola_gtsam_factors/2.2.0-2 + tag: release/rolling/mola_gtsam_factors/2.3.0-1 url: https://github.com/ros2-gbp/mola_state_estimation-release.git - version: 2.2.0 + version: 2.3.0 mola_imu_preintegration: tag: release/rolling/mola_imu_preintegration/1.16.0-2 url: https://github.com/ros2-gbp/mola_imu_preintegration-release.git version: 1.16.0 mola_input_euroc_dataset: - tag: release/rolling/mola_input_euroc_dataset/2.7.0-2 + tag: release/rolling/mola_input_euroc_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_kitti360_dataset: - tag: release/rolling/mola_input_kitti360_dataset/2.7.0-2 + tag: release/rolling/mola_input_kitti360_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_kitti_dataset: - tag: release/rolling/mola_input_kitti_dataset/2.7.0-2 + tag: release/rolling/mola_input_kitti_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_lidar_bin_dataset: - tag: release/rolling/mola_input_lidar_bin_dataset/2.7.0-2 + tag: release/rolling/mola_input_lidar_bin_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_mulran_dataset: - tag: release/rolling/mola_input_mulran_dataset/2.7.0-2 + tag: release/rolling/mola_input_mulran_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_paris_luco_dataset: - tag: release/rolling/mola_input_paris_luco_dataset/2.7.0-2 + tag: release/rolling/mola_input_paris_luco_dataset/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_rawlog: - tag: release/rolling/mola_input_rawlog/2.7.0-2 + tag: release/rolling/mola_input_rawlog/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_rosbag2: - tag: release/rolling/mola_input_rosbag2/2.7.0-2 + tag: release/rolling/mola_input_rosbag2/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_input_video: - tag: release/rolling/mola_input_video/2.7.0-2 + tag: release/rolling/mola_input_video/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_kernel: - tag: release/rolling/mola_kernel/2.7.0-2 + tag: release/rolling/mola_kernel/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_launcher: - tag: release/rolling/mola_launcher/2.7.0-2 + tag: release/rolling/mola_launcher/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_lidar_odometry: - tag: release/rolling/mola_lidar_odometry/2.0.0-2 + tag: release/rolling/mola_lidar_odometry/2.1.0-1 url: https://github.com/ros2-gbp/mola_lidar_odometry-release.git - version: 2.0.0 + version: 2.1.0 mola_metric_maps: - tag: release/rolling/mola_metric_maps/2.7.0-2 + tag: release/rolling/mola_metric_maps/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_msgs: - tag: release/rolling/mola_msgs/2.7.0-2 + tag: release/rolling/mola_msgs/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_pose_list: - tag: release/rolling/mola_pose_list/2.7.0-2 + tag: release/rolling/mola_pose_list/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_relocalization: - tag: release/rolling/mola_relocalization/2.7.0-2 + tag: release/rolling/mola_relocalization/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_sm_loop_closure: - tag: release/rolling/mola_sm_loop_closure/1.0.0-2 + tag: release/rolling/mola_sm_loop_closure/1.1.0-1 url: https://github.com/ros2-gbp/mola_sm_loop_closure-release.git - version: 1.0.0 + version: 1.1.0 mola_state_estimation: - tag: release/rolling/mola_state_estimation/2.2.0-2 + tag: release/rolling/mola_state_estimation/2.3.0-1 url: https://github.com/ros2-gbp/mola_state_estimation-release.git - version: 2.2.0 + version: 2.3.0 mola_state_estimation_simple: - tag: release/rolling/mola_state_estimation_simple/2.2.0-2 + tag: release/rolling/mola_state_estimation_simple/2.3.0-1 url: https://github.com/ros2-gbp/mola_state_estimation-release.git - version: 2.2.0 + version: 2.3.0 mola_state_estimation_smoother: - tag: release/rolling/mola_state_estimation_smoother/2.2.0-2 + tag: release/rolling/mola_state_estimation_smoother/2.3.0-1 url: https://github.com/ros2-gbp/mola_state_estimation-release.git - version: 2.2.0 + version: 2.3.0 mola_test_datasets: tag: release/rolling/mola_test_datasets/0.4.2-2 url: https://github.com/ros2-gbp/mola_test_datasets-release.git version: 0.4.2 mola_traj_tools: - tag: release/rolling/mola_traj_tools/2.7.0-2 + tag: release/rolling/mola_traj_tools/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_viz: - tag: release/rolling/mola_viz/2.7.0-2 + tag: release/rolling/mola_viz/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 mola_yaml: - tag: release/rolling/mola_yaml/2.7.0-2 + tag: release/rolling/mola_yaml/2.8.0-1 url: https://github.com/ros2-gbp/mola-release.git - version: 2.7.0 + version: 2.8.0 motion_capture_tracking: tag: release/rolling/motion_capture_tracking/1.0.6-2 url: https://github.com/ros2-gbp/motion_capture_tracking-release.git @@ -2868,9 +2868,9 @@ moveit_visual_tools: url: https://github.com/ros2-gbp/moveit_visual_tools-release.git version: 4.1.2 mp2p_icp: - tag: release/rolling/mp2p_icp/2.9.0-2 + tag: release/rolling/mp2p_icp/2.10.0-1 url: https://github.com/ros2-gbp/mp2p_icp-release.git - version: 2.9.0 + version: 2.10.0 mp_units_vendor: tag: release/rolling/mp_units_vendor/2.5.0-3 url: https://github.com/ros2-gbp/mp_units_vendor-release.git @@ -3316,9 +3316,9 @@ osrf_pycommon: url: https://github.com/ros2-gbp/osrf_pycommon-release.git version: 2.1.7 osrf_testing_tools_cpp: - tag: release/rolling/osrf_testing_tools_cpp/2.3.0-2 + tag: release/rolling/osrf_testing_tools_cpp/2.3.1-1 url: https://github.com/ros2-gbp/osrf_testing_tools_cpp-release.git - version: 2.3.0 + version: 2.3.1 ouster_ros: tag: release/rolling/ouster_ros/0.14.2-2 url: https://github.com/ros2-gbp/ouster-ros-release.git @@ -4224,9 +4224,9 @@ ros2_control: url: https://github.com/ros2-gbp/ros2_control-release.git version: 6.7.0 ros2_control_cmake: - tag: release/rolling/ros2_control_cmake/0.3.0-2 + tag: release/rolling/ros2_control_cmake/1.0.0-1 url: https://github.com/ros2-gbp/ros2_control_cmake-release.git - version: 0.3.0 + version: 1.0.0 ros2_control_test_assets: tag: release/rolling/ros2_control_test_assets/6.7.0-2 url: https://github.com/ros2-gbp/ros2_control-release.git @@ -4244,9 +4244,9 @@ ros2_fmt_logger: url: https://github.com/ros2-gbp/ros2_fmt_logger-release.git version: 1.1.0 ros2_snapshot: - tag: release/rolling/ros2_snapshot/0.0.6-3 + tag: release/rolling/ros2_snapshot/0.0.7-2 url: https://github.com/ros2-gbp/ros2_snapshot-release.git - version: 0.0.6 + version: 0.0.7 ros2_socketcan: tag: release/rolling/ros2_socketcan/1.3.0-2 url: https://github.com/ros2-gbp/ros2_socketcan-release.git @@ -4264,9 +4264,9 @@ ros2action: url: https://github.com/ros2-gbp/ros2cli-release.git version: 0.40.6 ros2bag: - tag: release/rolling/ros2bag/0.33.1-2 + tag: release/rolling/ros2bag/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 ros2cli: tag: release/rolling/ros2cli/0.40.6-2 url: https://github.com/ros2-gbp/ros2cli-release.git @@ -4356,9 +4356,9 @@ ros2topic: url: https://github.com/ros2-gbp/ros2cli-release.git version: 0.40.6 ros2trace: - tag: release/rolling/ros2trace/8.10.1-2 + tag: release/rolling/ros2trace/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 ros2trace_analysis: tag: release/rolling/ros2trace_analysis/3.1.0-2 url: https://github.com/ros2-gbp/tracetools_analysis-release.git @@ -4436,85 +4436,85 @@ rosapi_msgs: url: https://github.com/ros2-gbp/rosbridge_suite-release.git version: 4.1.0 rosbag2: - tag: release/rolling/rosbag2/0.33.1-2 + tag: release/rolling/rosbag2/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_compression: - tag: release/rolling/rosbag2_compression/0.33.1-2 + tag: release/rolling/rosbag2_compression/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_compression_zstd: - tag: release/rolling/rosbag2_compression_zstd/0.33.1-2 + tag: release/rolling/rosbag2_compression_zstd/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_cpp: - tag: release/rolling/rosbag2_cpp/0.33.1-2 + tag: release/rolling/rosbag2_cpp/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_examples_cpp: - tag: release/rolling/rosbag2_examples_cpp/0.33.1-2 + tag: release/rolling/rosbag2_examples_cpp/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_examples_py: - tag: release/rolling/rosbag2_examples_py/0.33.1-2 + tag: release/rolling/rosbag2_examples_py/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_interfaces: - tag: release/rolling/rosbag2_interfaces/0.33.1-2 + tag: release/rolling/rosbag2_interfaces/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_performance_benchmarking: - tag: release/rolling/rosbag2_performance_benchmarking/0.33.1-2 + tag: release/rolling/rosbag2_performance_benchmarking/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_performance_benchmarking_msgs: - tag: release/rolling/rosbag2_performance_benchmarking_msgs/0.33.1-2 + tag: release/rolling/rosbag2_performance_benchmarking_msgs/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_py: - tag: release/rolling/rosbag2_py/0.33.1-2 + tag: release/rolling/rosbag2_py/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_storage: - tag: release/rolling/rosbag2_storage/0.33.1-2 + tag: release/rolling/rosbag2_storage/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_storage_broll: tag: release/rolling/rosbag2_storage_broll/0.1.0-2 url: https://github.com/ros2-gbp/rosbag2_broll-release.git version: 0.1.0 rosbag2_storage_default_plugins: - tag: release/rolling/rosbag2_storage_default_plugins/0.33.1-2 + tag: release/rolling/rosbag2_storage_default_plugins/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_storage_mcap: - tag: release/rolling/rosbag2_storage_mcap/0.33.1-2 + tag: release/rolling/rosbag2_storage_mcap/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_storage_sqlite3: - tag: release/rolling/rosbag2_storage_sqlite3/0.33.1-2 + tag: release/rolling/rosbag2_storage_sqlite3/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_test_common: - tag: release/rolling/rosbag2_test_common/0.33.1-2 + tag: release/rolling/rosbag2_test_common/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_test_msgdefs: - tag: release/rolling/rosbag2_test_msgdefs/0.33.1-2 + tag: release/rolling/rosbag2_test_msgdefs/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_tests: - tag: release/rolling/rosbag2_tests/0.33.1-2 + tag: release/rolling/rosbag2_tests/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2_to_video: tag: release/rolling/rosbag2_to_video/1.0.1-2 url: https://github.com/ros2-gbp/rosbag2_to_video-release.git version: 1.0.1 rosbag2_transport: - tag: release/rolling/rosbag2_transport/0.33.1-2 + tag: release/rolling/rosbag2_transport/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 rosbag2rawlog: tag: release/rolling/rosbag2rawlog/3.5.2-2 url: https://github.com/ros2-gbp/mrpt_ros_bridge-release.git @@ -4964,9 +4964,9 @@ rviz_default_plugins: url: https://github.com/ros2-gbp/rviz-release.git version: 15.2.2 rviz_imu_plugin: - tag: release/rolling/rviz_imu_plugin/2.2.2-2 + tag: release/rolling/rviz_imu_plugin/2.2.3-1 url: https://github.com/ros2-gbp/imu_tools-release.git - version: 2.2.2 + version: 2.2.3 rviz_marker_tools: tag: release/rolling/rviz_marker_tools/0.1.5-2 url: https://github.com/ros2-gbp/moveit_task_constructor-release.git @@ -5452,9 +5452,9 @@ topic_tools_interfaces: url: https://github.com/ros2-gbp/topic_tools-release.git version: 1.4.4 toppra: - tag: release/rolling/toppra/0.6.7-2 + tag: release/rolling/toppra/0.6.8-1 url: https://github.com/ros2-gbp/toppra-release.git - version: 0.6.7 + version: 0.6.8 trac_ik: tag: release/rolling/trac_ik/2.2.0-2 url: https://github.com/ros2-gbp/trac_ik-release.git @@ -5468,9 +5468,9 @@ trac_ik_lib: url: https://github.com/ros2-gbp/trac_ik-release.git version: 2.2.0 tracetools: - tag: release/rolling/tracetools/8.10.1-2 + tag: release/rolling/tracetools/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 tracetools_acceleration: tag: release/rolling/tracetools_acceleration/0.4.1-4 url: https://github.com/ros2-gbp/tracetools_acceleration-release.git @@ -5484,21 +5484,21 @@ tracetools_image_pipeline: url: https://github.com/ros2-gbp/image_pipeline-release.git version: 7.1.3 tracetools_launch: - tag: release/rolling/tracetools_launch/8.10.1-2 + tag: release/rolling/tracetools_launch/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 tracetools_read: - tag: release/rolling/tracetools_read/8.10.1-2 + tag: release/rolling/tracetools_read/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 tracetools_test: - tag: release/rolling/tracetools_test/8.10.1-2 + tag: release/rolling/tracetools_test/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 tracetools_trace: - tag: release/rolling/tracetools_trace/8.10.1-2 + tag: release/rolling/tracetools_trace/8.10.2-1 url: https://github.com/ros2-gbp/ros2_tracing-release.git - version: 8.10.1 + version: 8.10.2 trajectory_msgs: tag: release/rolling/trajectory_msgs/5.9.2-2 url: https://github.com/ros2-gbp/common_interfaces-release.git @@ -6004,9 +6004,9 @@ zmqpp_vendor: url: https://github.com/ros2-gbp/zmqpp_vendor-release.git version: 0.0.2 zstd_cmake_module: - tag: release/rolling/zstd_cmake_module/0.33.1-2 + tag: release/rolling/zstd_cmake_module/0.34.0-1 url: https://github.com/ros2-gbp/rosbag2-release.git - version: 0.33.1 + version: 0.34.0 zstd_image_transport: tag: release/rolling/zstd_image_transport/6.2.4-2 url: https://github.com/ros2-gbp/image_transport_plugins-release.git From a2d7ab07442722a6636c85979a55d022f2158587 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu Date: Tue, 5 May 2026 01:34:54 +0900 Subject: [PATCH 10/10] update patch --- patch/ros-rolling-foxglove-bridge.osx.patch | 231 +++++++++++++------- patch/ros-rolling-foxglove-bridge.patch | 107 ++++++--- patch/ros-rolling-rviz-imu-plugin.patch | 13 +- 3 files changed, 236 insertions(+), 115 deletions(-) diff --git a/patch/ros-rolling-foxglove-bridge.osx.patch b/patch/ros-rolling-foxglove-bridge.osx.patch index eab99238..003e6cba 100644 --- a/patch/ros-rolling-foxglove-bridge.osx.patch +++ b/patch/ros-rolling-foxglove-bridge.osx.patch @@ -1,103 +1,80 @@ diff --git a/src/ros2_foxglove_bridge.cpp b/src/ros2_foxglove_bridge.cpp -index 72c11f54..fb799a92 100644 +index 2229aad..9431dbd 100644 --- a/src/ros2_foxglove_bridge.cpp +++ b/src/ros2_foxglove_bridge.cpp -@@ -305,7 +305,7 @@ void FoxgloveBridge::updateAdvertisedTopics( - std::string topic(channel.topic()); - const TopicAndDatatype topicAndSchemaName = {topic, schemaName}; - if (latestTopics.find(topicAndSchemaName) == latestTopics.end()) { -- RCLCPP_INFO(this->get_logger(), "Removing channel %lu for topic \"%s\" (%s)", channel.id(), -+ RCLCPP_INFO(this->get_logger(), "Removing channel %llu for topic \"%s\" (%s)", channel.id(), - topic.c_str(), schemaName.c_str()); - channel.close(); - channelIt = _channels.erase(channelIt); -@@ -372,7 +372,7 @@ void FoxgloveBridge::updateAdvertisedTopics( +@@ -479,7 +479,7 @@ void FoxgloveBridge::updateAdvertisedTopics( + const TopicAndDatatype topicAndSchemaName = {topic, schemaName}; + if (latestTopics.find(topicAndSchemaName) == latestTopics.end()) { + const auto channelId = channel.id(); +- RCLCPP_INFO(this->get_logger(), "Removing channel %lu for topic \"%s\" (%s)", channelId, ++ RCLCPP_INFO(this->get_logger(), "Removing channel %llu for topic \"%s\" (%s)", channelId, + topic.c_str(), schemaName.c_str()); + // Remove any active subscriptions for this channel + _subscriptions.erase(channelId); +@@ -549,7 +549,7 @@ void FoxgloveBridge::updateAdvertisedTopics( + } + + const ChannelId channelId = channelResult.value().id(); +- RCLCPP_INFO(this->get_logger(), "Advertising new channel %lu for topic \"%s\"", channelId, ++ RCLCPP_INFO(this->get_logger(), "Advertising new channel %llu for topic \"%s\"", channelId, + topic.c_str()); + _channels.insert({channelId, std::move(channelResult.value())}); } +@@ -814,7 +814,7 @@ void FoxgloveBridge::subscribeConnectionGraph(bool subscribe) { + } - const ChannelId channelId = channelResult.value().id(); -- RCLCPP_INFO(this->get_logger(), "Advertising new channel %lu for topic \"%s\"", channelId, -+ RCLCPP_INFO(this->get_logger(), "Advertising new channel %llu for topic \"%s\"", channelId, - topic.c_str()); - _channels.insert({channelId, std::move(channelResult.value())}); - } -@@ -593,14 +593,14 @@ void FoxgloveBridge::subscribeConnectionGraph(bool subscribe) { void FoxgloveBridge::subscribe(ChannelId channelId, const foxglove::ClientMetadata& client) { - if (!client.sink_id.has_value()) { - RCLCPP_ERROR(this->get_logger(), -- "received subscribe request from client %u for channel %lu but client " -+ "received subscribe request from client %u for channel %llu but client " - "has no sink ID", - client.id, channelId); - return; - } - - RCLCPP_INFO(this->get_logger(), -- "received subscribe request for channel %lu from client %u (sink %lu)", channelId, -+ "received subscribe request for channel %llu from client %u (sink %llu)", channelId, - client.id, client.sink_id.value()); - std::lock_guard lock(_subscriptionsMutex); - -@@ -608,7 +608,7 @@ void FoxgloveBridge::subscribe(ChannelId channelId, const foxglove::ClientMetada - // calling this callback? - auto it = _channels.find(channelId); - if (it == _channels.end()) { +- RCLCPP_INFO(this->get_logger(), "received subscribe request for channel %lu from client %u", ++ RCLCPP_INFO(this->get_logger(), "received subscribe request for channel %llu from client %u", + channelId, client.id); + createOrIncrementSubscription(channelId, client.id, false, client.sink_id); + } +@@ -867,7 +867,7 @@ void FoxgloveBridge::createOrIncrementSubscriptionLocked(ChannelId channelId, Cl + std::optional sinkId) { + auto channelIt = _channels.find(channelId); + if (channelIt == _channels.end()) { - RCLCPP_ERROR(this->get_logger(), "received subscribe request for unknown channel: %lu", + RCLCPP_ERROR(this->get_logger(), "received subscribe request for unknown channel: %llu", channelId); return; } -@@ -638,7 +638,7 @@ void FoxgloveBridge::subscribe(ChannelId channelId, const foxglove::ClientMetada +@@ -898,7 +898,7 @@ void FoxgloveBridge::createOrIncrementSubscriptionLocked(ChannelId channelId, Cl + auto [it, inserted] = _subscriptions.emplace(channelId, std::move(channelSub)); + subIt = it; - if (!client.sink_id.has_value()) { - RCLCPP_ERROR(this->get_logger(), -- "received subscribe request for channel %lu but client " -+ "received subscribe request for channel %llu but client " - "has no sink ID", - channelId); - return; -@@ -646,19 +646,19 @@ void FoxgloveBridge::subscribe(ChannelId channelId, const foxglove::ClientMetada +- RCLCPP_INFO(this->get_logger(), "Created ROS subscription on %s (%s) for channel %lu", ++ RCLCPP_INFO(this->get_logger(), "Created ROS subscription on %s (%s) for channel %llu", + topic.c_str(), datatype.c_str(), channelId); + } - _subscriptions.insert({{channelId, client.id}, subscription}); - RCLCPP_INFO(this->get_logger(), -- "created ROS subscription on %s (%s) successfully for channel %lu (client " -- "%u, sink %lu)", -+ "created ROS subscription on %s (%s) successfully for channel %llu (client " -+ "%u, sink %llu)", - topic.c_str(), datatype.c_str(), channelId, client.id, client.sink_id.value()); +@@ -922,7 +922,7 @@ void FoxgloveBridge::createOrIncrementSubscriptionLocked(ChannelId channelId, Cl } void FoxgloveBridge::unsubscribe(ChannelId channelId, const foxglove::ClientMetadata& client) { - std::lock_guard lock(_subscriptionsMutex); - -- RCLCPP_INFO(this->get_logger(), "received unsubscribe request for channel %lu", channelId); -+ RCLCPP_INFO(this->get_logger(), "received unsubscribe request for channel %llu", channelId); - - auto it = _channels.find(channelId); - if (it == _channels.end()) { -- RCLCPP_ERROR(this->get_logger(), "received unsubscribe request for unknown channel %lu", -+ RCLCPP_ERROR(this->get_logger(), "received unsubscribe request for unknown channel %llu", - channelId); - return; - } -@@ -666,7 +666,7 @@ void FoxgloveBridge::unsubscribe(ChannelId channelId, const foxglove::ClientMeta - auto subscriptionIt = _subscriptions.find({channelId, client.id}); - if (subscriptionIt == _subscriptions.end()) { +- RCLCPP_INFO(this->get_logger(), "received unsubscribe request for channel %lu from client %u", ++ RCLCPP_INFO(this->get_logger(), "received unsubscribe request for channel %llu from client %u", + channelId, client.id); + removeOrDecrementSubscription(channelId, client.id, false); + } +@@ -938,7 +938,7 @@ void FoxgloveBridge::removeOrDecrementSubscriptionLocked(ChannelId channelId, Cl + auto subIt = _subscriptions.find(channelId); + if (subIt == _subscriptions.end()) { RCLCPP_ERROR(this->get_logger(), -- "Client %u tried unsubscribing from channel %lu but a corresponding ROS " -+ "Client %u tried unsubscribing from channel %llu but a corresponding ROS " - "subscription doesn't exist", - client.id, channelId); +- "Client %u tried unsubscribing from channel %lu but no subscription exists", ++ "Client %u tried unsubscribing from channel %llu but no subscription exists", + clientId, channelId); return; -@@ -674,7 +674,7 @@ void FoxgloveBridge::unsubscribe(ChannelId channelId, const foxglove::ClientMeta - - const std::string& topic = subscriptionIt->second->get_topic_name(); - RCLCPP_INFO(this->get_logger(), -- "Cleaned up subscription to topic %s for client %u on channel %lu", topic.c_str(), -+ "Cleaned up subscription to topic %s for client %u on channel %llu", topic.c_str(), - client.id, channelId); - _subscriptions.erase(subscriptionIt); + } +@@ -953,7 +953,7 @@ void FoxgloveBridge::removeOrDecrementSubscriptionLocked(ChannelId channelId, Cl + // If no more subscribers, destroy the ROS subscription + if (subIt->second.wsClientIds.empty() && subIt->second.gatewayClientIds.empty()) { + RCLCPP_INFO(this->get_logger(), +- "Cleaned up ROS subscription for channel %lu (no more subscribers)", channelId); ++ "Cleaned up ROS subscription for channel %llu (no more subscribers)", channelId); + _subscriptions.erase(subIt); + } } -@@ -778,7 +778,7 @@ void FoxgloveBridge::clientUnadvertise(ClientId clientId, ChannelId clientChanne +@@ -1092,7 +1092,7 @@ void FoxgloveBridge::clientUnadvertise(ClientId clientId, ChannelId clientChanne const auto& publisher = it->second.publisher; RCLCPP_INFO(this->get_logger(), @@ -106,3 +83,95 @@ index 72c11f54..fb799a92 100644 publisher->get_topic_name(), publisher->get_subscription_count(), clientChannelId); _clientAdvertisedTopics.erase(it); +@@ -1460,13 +1460,13 @@ void FoxgloveBridge::gatewaySubscribe(uint32_t clientId, + auto sinkId = _gateway->sinkId(); + if (!sinkId.has_value()) { + RCLCPP_WARN(this->get_logger(), +- "Gateway: subscribe request for channel %lu (\"%s\") from client %u " ++ "Gateway: subscribe request for channel %llu (\"%s\") from client %u " + "but gateway session has no sink ID (reconnecting?); " + "cached transient_local messages will not be replayed", + channel.id(), std::string(channel.topic()).c_str(), clientId); + } + RCLCPP_INFO(this->get_logger(), +- "Gateway: received subscribe request for channel %lu (\"%s\") from client %u", ++ "Gateway: received subscribe request for channel %llu (\"%s\") from client %u", + channel.id(), std::string(channel.topic()).c_str(), clientId); + createOrIncrementSubscription(channel.id(), clientId, true, sinkId); + } +@@ -1474,7 +1474,7 @@ void FoxgloveBridge::gatewaySubscribe(uint32_t clientId, + void FoxgloveBridge::gatewayUnsubscribe(uint32_t clientId, + const foxglove::ChannelDescriptor& channel) { + RCLCPP_INFO(this->get_logger(), +- "Gateway: received unsubscribe request for channel %lu (\"%s\") from client %u", ++ "Gateway: received unsubscribe request for channel %llu (\"%s\") from client %u", + channel.id(), std::string(channel.topic()).c_str(), clientId); + removeOrDecrementSubscription(channel.id(), clientId, true); + } +@@ -1489,7 +1489,7 @@ void FoxgloveBridge::gatewayClientAdvertise(uint32_t clientId, + + ChannelAndClientId key = {channelId, clientId}; + if (_gatewayClientAdvertisedTopics.find(key) != _gatewayClientAdvertisedTopics.end()) { +- RCLCPP_WARN(this->get_logger(), "Gateway: client %u already advertised channel %lu (\"%s\")", ++ RCLCPP_WARN(this->get_logger(), "Gateway: client %u already advertised channel %llu (\"%s\")", + clientId, channelId, topicName.c_str()); + return; + } +@@ -1506,7 +1506,7 @@ void FoxgloveBridge::gatewayClientAdvertise(uint32_t clientId, + + if (topicType.empty()) { + RCLCPP_ERROR(this->get_logger(), +- "Gateway: client %u advertised channel %lu (\"%s\") with empty schema name", ++ "Gateway: client %u advertised channel %llu (\"%s\") with empty schema name", + clientId, channelId, topicName.c_str()); + return; + } +@@ -1514,12 +1514,12 @@ void FoxgloveBridge::gatewayClientAdvertise(uint32_t clientId, + try { + auto ad = createClientPublisher(topicName, topicType, encoding, schemaData, schemaLen); + RCLCPP_INFO(this->get_logger(), +- "Gateway: client %u is advertising channel %lu \"%s\" (%s) with encoding \"%s\"", ++ "Gateway: client %u is advertising channel %llu \"%s\" (%s) with encoding \"%s\"", + clientId, channelId, topicName.c_str(), topicType.c_str(), encoding.c_str()); + _gatewayClientAdvertisedTopics.emplace(key, std::move(ad)); + } catch (const std::exception& ex) { + RCLCPP_ERROR(this->get_logger(), +- "Gateway: failed to create publisher for client %u channel %lu (\"%s\"): %s", ++ "Gateway: failed to create publisher for client %u channel %llu (\"%s\"): %s", + clientId, channelId, topicName.c_str(), ex.what()); + } + } +@@ -1533,13 +1533,13 @@ void FoxgloveBridge::gatewayClientUnadvertise(uint32_t clientId, + + auto it = _gatewayClientAdvertisedTopics.find(key); + if (it == _gatewayClientAdvertisedTopics.end()) { +- RCLCPP_WARN(this->get_logger(), "Gateway: client %u unadvertised unknown channel %lu (\"%s\")", ++ RCLCPP_WARN(this->get_logger(), "Gateway: client %u unadvertised unknown channel %llu (\"%s\")", + clientId, channelId, std::string(channel.topic()).c_str()); + return; + } + + RCLCPP_INFO(this->get_logger(), +- "Gateway: client %u is no longer advertising channel %lu (\"%s\")", clientId, ++ "Gateway: client %u is no longer advertising channel %llu (\"%s\")", clientId, + channelId, it->second.topicName.c_str()); + _gatewayClientAdvertisedTopics.erase(it); + +@@ -1563,7 +1563,7 @@ void FoxgloveBridge::gatewayClientMessage(uint32_t clientId, + auto it = _gatewayClientAdvertisedTopics.find(key); + if (it == _gatewayClientAdvertisedTopics.end()) { + RCLCPP_ERROR(this->get_logger(), +- "Gateway: dropping message from client %u for unknown channel %lu", clientId, ++ "Gateway: dropping message from client %u for unknown channel %llu", clientId, + channelId); + return; + } +@@ -1574,7 +1574,7 @@ void FoxgloveBridge::gatewayClientMessage(uint32_t clientId, + try { + publishClientData(ad, data, dataLen); + } catch (const std::exception& ex) { +- RCLCPP_ERROR(this->get_logger(), "Gateway: dropping message from client %u for channel %lu: %s", ++ RCLCPP_ERROR(this->get_logger(), "Gateway: dropping message from client %u for channel %llu: %s", + clientId, channelId, ex.what()); + } + } diff --git a/patch/ros-rolling-foxglove-bridge.patch b/patch/ros-rolling-foxglove-bridge.patch index be5c19bb..fd82736e 100644 --- a/patch/ros-rolling-foxglove-bridge.patch +++ b/patch/ros-rolling-foxglove-bridge.patch @@ -1,41 +1,90 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9285c891..d8b058ab 100644 +index 71deedd..fd29902 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,6 +75,18 @@ else() - elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu") - set(FOXGLOVE_SDK_SHA "f3d2f6a8ba97fedeae13b978f5e8a51dec4803eddfd23b198a292bf9ab6675ff") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") -+ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin") -+ set(FOXGLOVE_SDK_SHA "6cb695e997e47a61c317177f13dd911c90ec1a95477473e1c5fb86db8a2da8ed") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -+ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin") -+ set(FOXGLOVE_SDK_SHA "21cba2f3d032b3d0a921b7eda8ef103393f93f66ab891cbc4851f57c8080b94b") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") -+ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc") -+ set(FOXGLOVE_SDK_SHA "602676101883defac7494e70fdc6bc8dd2daa1783da07645906ef595e6654a05") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") -+ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc") -+ set(FOXGLOVE_SDK_SHA "6cdf69d23ae45a1643f6e430b9928c5546679ffa3b9fb54a79f244b93bdc8323") - else() - message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}") - endif() -@@ -185,6 +197,12 @@ target_link_libraries(foxglove_bridge_component - rosx_introspection::rosx_introspection - ) - +@@ -63,6 +63,18 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarc + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu") + set(FOXGLOVE_SDK_SHA "b949295e80eb1a9bb356e657b9c2579c886717fac290c4e48a5e9846063bf2e8") ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin") ++ set(FOXGLOVE_SDK_SHA "1c6a32fc25c3a29eb9f3c5156f9c82970a8714523ffc3893ea4e852b977ee1e5") ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ++ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin") ++ set(FOXGLOVE_SDK_SHA "12249d4b2f16c3ff661f21d19603fb33a82888f0391576269f31f9cc1a4cb7a8") ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") ++ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc") ++ set(FOXGLOVE_SDK_SHA "5d4999f3231fbf06c6c54eee00db9cab5c8a96d043dcf143a401c72bf2efec01") ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") ++ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc") ++ set(FOXGLOVE_SDK_SHA "58c3c5e945623bc02b596f748c82e1c8b82daef7871f11f600ff1a606ac9295d") + else() + message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}") + endif() +@@ -86,14 +98,32 @@ target_include_directories(foxglove_cpp_shared SYSTEM + target_sources(foxglove_cpp_shared PRIVATE ${FOXGLOVE_SDK_SOURCES}) + # Import the prebuilt C shared library from the fetched SDK + add_library(foxglove-shared SHARED IMPORTED) +-set_target_properties(foxglove-shared PROPERTIES +- IMPORTED_LOCATION ${foxglove_sdk_SOURCE_DIR}/lib/libfoxglove.so +-) ++if(WIN32) ++ set_target_properties(foxglove-shared PROPERTIES ++ IMPORTED_LOCATION ${foxglove_sdk_SOURCE_DIR}/lib/foxglove.dll ++ IMPORTED_IMPLIB ${foxglove_sdk_SOURCE_DIR}/lib/foxglove.dll.lib ++ ) ++elseif(APPLE) ++ set_target_properties(foxglove-shared PROPERTIES ++ IMPORTED_LOCATION ${foxglove_sdk_SOURCE_DIR}/lib/libfoxglove.dylib ++ ) ++else() ++ set_target_properties(foxglove-shared PROPERTIES ++ IMPORTED_LOCATION ${foxglove_sdk_SOURCE_DIR}/lib/libfoxglove.so ++ ) ++endif() + target_link_libraries(foxglove_cpp_shared PRIVATE foxglove-shared) +-set_target_properties(foxglove_cpp_shared PROPERTIES +- INSTALL_RPATH "$ORIGIN" +- BUILD_WITH_INSTALL_RPATH TRUE +-) +if(APPLE) -+ find_library(COREFOUNDATION_FRAMEWORK CoreFoundation REQUIRED) -+ find_library(SECURITY_FRAMEWORK Security REQUIRED) -+ target_link_libraries(foxglove_bridge_component ${COREFOUNDATION_FRAMEWORK} ${SECURITY_FRAMEWORK}) ++ set_target_properties(foxglove_cpp_shared PROPERTIES ++ INSTALL_RPATH "@loader_path" ++ BUILD_WITH_INSTALL_RPATH TRUE ++ ) ++elseif(NOT WIN32) ++ set_target_properties(foxglove_cpp_shared PROPERTIES ++ INSTALL_RPATH "$ORIGIN" ++ BUILD_WITH_INSTALL_RPATH TRUE ++ ) +endif() -+ + + find_program(GIT_SCM git DOC "Git version control") + if (GIT_SCM) +@@ -167,10 +197,17 @@ target_link_libraries(foxglove_bridge_component + rclcpp_components_register_nodes(foxglove_bridge_component "foxglove_bridge::FoxgloveBridge") enable_strict_compiler_warnings(foxglove_bridge_component) +-set_target_properties(foxglove_bridge_component PROPERTIES +- INSTALL_RPATH "$ORIGIN" +- BUILD_WITH_INSTALL_RPATH TRUE +-) ++if(APPLE) ++ set_target_properties(foxglove_bridge_component PROPERTIES ++ INSTALL_RPATH "@loader_path" ++ BUILD_WITH_INSTALL_RPATH TRUE ++ ) ++elseif(NOT WIN32) ++ set_target_properties(foxglove_bridge_component PROPERTIES ++ INSTALL_RPATH "$ORIGIN" ++ BUILD_WITH_INSTALL_RPATH TRUE ++ ) ++endif() + add_executable(foxglove_bridge + src/ros2_foxglove_bridge_node.cpp diff --git a/src/message_definition_cache.cpp b/src/message_definition_cache.cpp -index ef72c9c1..ed857459 100644 +index ef72c9c..ed85745 100644 --- a/src/message_definition_cache.cpp +++ b/src/message_definition_cache.cpp @@ -3,6 +3,7 @@ diff --git a/patch/ros-rolling-rviz-imu-plugin.patch b/patch/ros-rolling-rviz-imu-plugin.patch index 00e3cdb8..da6b42ab 100644 --- a/patch/ros-rolling-rviz-imu-plugin.patch +++ b/patch/ros-rolling-rviz-imu-plugin.patch @@ -1,14 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6498090..ee30fe6 100644 +index d4a2853..2de4fce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -12,8 +12,7 @@ endif() +@@ -12,10 +12,8 @@ endif() find_package(ament_cmake REQUIRED COMPONENTS rviz) find_package(message_filters REQUIRED) --find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Test) --find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Test) -+find_package(Qt6 REQUIRED COMPONENTS Widgets Test) +-find_package(Qt6 QUIET COMPONENTS Test Widgets) +-if(NOT Qt6_FOUND) +- find_package(Qt5 REQUIRED COMPONENTS Test Widgets) +-endif() ++find_package(Qt6 REQUIRED COMPONENTS Test Widgets) ++set(QT_VERSION_MAJOR 6) find_package(rviz_common REQUIRED) find_package(rviz_ogre_vendor REQUIRED) find_package(rviz_rendering REQUIRED)