Skip to content

Commit 977920b

Browse files
Merge pull request #75 from traversaro/fix74
Add explicit run dependency on libopencv qt6 variant for packages that need it
2 parents 07ef755 + 55a1db4 commit 977920b

File tree

7 files changed

+24
-5
lines changed

7 files changed

+24
-5
lines changed

patch/dependencies.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ libcurl_vendor:
3232
add_run: ["libcurl"]
3333
intra_process_demo:
3434
add_host: ["REQUIRE_OPENGL"]
35+
# Depends on opencv with gui support, see https://github.com/ros2/demos/blob/8f361a1ece2daae54016959f3ea9ab2e7692ddbb/intra_process_demo/include/image_pipeline/image_view_node.hpp#L58
36+
add_run: ["libopencv * *qt6*"]
3537
rviz_ogre_vendor:
3638
add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}"]
3739
add_build: ["vcstool"]
@@ -57,6 +59,8 @@ ign_rviz_plugins:
5759
add_host: ["REQUIRE_OPENGL"]
5860
image_view:
5961
add_host: ["REQUIRE_OPENGL"]
62+
# Depends on opencv with gui support, see https://github.com/ros-perception/image_pipeline/blob/746268fcfd21b389bc39ae60bb6345a53c838558/image_view/src/stereo_view_node.cpp#L253
63+
add_run: ["libopencv * *qt6*"]
6064
nao_lola:
6165
add_host: ["libboost-devel"]
6266
ros_ign_gazebo:
@@ -243,3 +247,10 @@ autoware_utils_pcl:
243247
add_host: ["REQUIRE_OPENGL"]
244248
autoware_utils_debug:
245249
add_host: ["fmt"]
250+
image_tools:
251+
# Depends on opencv with gui support, see https://github.com/ros2/demos/blob/8f361a1ece2daae54016959f3ea9ab2e7692ddbb/image_tools/src/showimage.cpp#L190
252+
add_run: ["libopencv * *qt6*"]
253+
camera_calibration:
254+
# Depends on opencv with gui support, see https://github.com/ros-perception/image_pipeline/blob/746268fcfd21b389bc39ae60bb6345a53c838558/camera_calibration/src/camera_calibration/camera_calibrator.py#L286
255+
add_run: ["libopencv * *qt6*"]
256+

pkg_additional_info.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
image_tools:
2+
build_number: 8
3+
camera_calibration:
4+
build_number: 8
5+
intra_process_demo:
6+
build_number: 8
7+
image_view:
8+
build_number: 8

vinca_linux_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conda_index:
55
- robostack.yaml
66
- packages-ignore.yaml
77

8-
# Reminder for next full rebuild, the next build number should be 8
8+
# Reminder for next full rebuild, the next build number should be 9
99
build_number: 7
1010

1111
mutex_package: ros2-distro-mutex 0.9.* jazzy_*

vinca_linux_aarch64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conda_index:
55
- robostack.yaml
66
- packages-ignore.yaml
77

8-
# Reminder for next full rebuild, the next build number should be 8
8+
# Reminder for next full rebuild, the next build number should be 9
99
build_number: 7
1010

1111
mutex_package: ros2-distro-mutex 0.9.* jazzy_*

vinca_osx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conda_index:
55
- robostack.yaml
66
- packages-ignore.yaml
77

8-
# Reminder for next full rebuild, the next build number should be 8
8+
# Reminder for next full rebuild, the next build number should be 9
99
build_number: 7
1010

1111
mutex_package: ros2-distro-mutex 0.9.* jazzy_*

vinca_osx_arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conda_index:
55
- robostack.yaml
66
- packages-ignore.yaml
77

8-
# Reminder for next full rebuild, the next build number should be 8
8+
# Reminder for next full rebuild, the next build number should be 9
99
build_number: 7
1010

1111
mutex_package: ros2-distro-mutex 0.9.* jazzy_*

vinca_win.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conda_index:
55
- robostack.yaml
66
- packages-ignore.yaml
77

8-
# Reminder for next full rebuild, the next build number should be 8
8+
# Reminder for next full rebuild, the next build number should be 9
99
build_number: 7
1010

1111
mutex_package: ros2-distro-mutex 0.9.* jazzy_*

0 commit comments

Comments
 (0)