Fix OpenCV CMake exports

RoboStack · Oct 25, 2023 · d7a8054 · d7a8054
1 parent b5eb3a0
commit d7a8054
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 123 deletions.
diff --git a/patch/ros-noetic-cv-bridge.patch b/patch/ros-noetic-cv-bridge.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ef804b9..6dac00e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,33 +3,13 @@ project(cv_bridge)
+@@ -3,27 +3,8 @@ project(cv_bridge)
 
  find_package(catkin REQUIRED COMPONENTS rosconsole sensor_msgs)
 
@@ -31,10 +31,4 @@ index ef804b9..6dac00e 100644
 -find_package(OpenCV ${_opencv_version} REQUIRED
 +find_package(OpenCV 4 REQUIRED
    COMPONENTS
-     opencv_core
-     opencv_imgproc
-     opencv_imgcodecs
--  CONFIG
- )
-
- catkin_package(
+     opencv_core
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -37,44 +37,44 @@ skip_existing:
   - https://conda.anaconda.org/robostack-staging/
 
 packages_select_by_deps:
-  - cras_cpp_common  # maintainer peci1
-  - cras_py_common  # maintainer peci1
-  - cras_docs_common  # maintainer peci1
-  - cras_topic_tools  # maintainer peci1
-  - image_transport_codecs  # maintainer peci1
-  - point_cloud_transport  # maintainer peci1
-  - point_cloud_transport_plugins  # maintainer peci1
-  - draco_point_cloud_transport  # maintainer peci1
-  - sensor_filters  # maintainer peci1
-  - cras_relative_positional_controller  # maintainer peci1
-  - cras_msgs  # maintainer peci1
-  - compass_msgs  # maintainer peci1
-  - magnetometer_compass  # maintainer peci1
-  - electronic_io_msgs  # maintainer peci1
-  - electronic_io  # maintainer peci1
-  - point_cloud_color  # maintainer peci1
-  - rosmsg_cpp  # maintainer peci1
-  - snmp_ros  # maintainer peci1
-  - robot_body_filter  # maintainer peci1
-  - static_transform_mux  # maintainer peci1
-  - tf_remapper_cpp  # maintainer peci1
-  - roslint  # maintainer peci1
-  - tf2_server  # maintainer peci1
-  - rosbash_params  # maintainer peci1
-  - dynamic_robot_state_publisher  # maintainer peci1
-  - tf2_client  # maintainer peci1
-  - tf_static_publisher  # maintainer peci1
-  - movie_publisher  # maintainer peci1
-  - geometric_shapes
-  - teleop-twist-keyboard
-  - rosserial-client
-  - rosserial-arduino
-  - rosserial
-  - global-planner
-  - navigation
-  - ecl-core
-  - ecl-threads
-  - jsk-visualization
+  # - cras_cpp_common  # maintainer peci1
+  # - cras_py_common  # maintainer peci1
+  # - cras_docs_common  # maintainer peci1
+  # - cras_topic_tools  # maintainer peci1
+  # - image_transport_codecs  # maintainer peci1
+  # - point_cloud_transport  # maintainer peci1
+  # - point_cloud_transport_plugins  # maintainer peci1
+  # - draco_point_cloud_transport  # maintainer peci1
+  # - sensor_filters  # maintainer peci1
+  # - cras_relative_positional_controller  # maintainer peci1
+  # - cras_msgs  # maintainer peci1
+  # - compass_msgs  # maintainer peci1
+  # - magnetometer_compass  # maintainer peci1
+  # - electronic_io_msgs  # maintainer peci1
+  # - electronic_io  # maintainer peci1
+  # - point_cloud_color  # maintainer peci1
+  # - rosmsg_cpp  # maintainer peci1
+  # - snmp_ros  # maintainer peci1
+  # - robot_body_filter  # maintainer peci1
+  # - static_transform_mux  # maintainer peci1
+  # - tf_remapper_cpp  # maintainer peci1
+  # - roslint  # maintainer peci1
+  # - tf2_server  # maintainer peci1
+  # - rosbash_params  # maintainer peci1
+  # - dynamic_robot_state_publisher  # maintainer peci1
+  # - tf2_client  # maintainer peci1
+  # - tf_static_publisher  # maintainer peci1
+  # - movie_publisher  # maintainer peci1
+  # - geometric_shapes
+  # - teleop-twist-keyboard
+  # - rosserial-client
+  # - rosserial-arduino
+  # - rosserial
+  # - global-planner
+  # - navigation
+  # - ecl-core
+  # - ecl-threads
+  # - jsk-visualization
   # - actionlib
   # - foxglove_bridge
   # - ros-babel-fish
@@ -173,16 +173,16 @@ packages_select_by_deps:
   # - moveit
   # - robot_localization
   # - gazebo-dev
-  - gazebo-ros
-  - hector-gazebo-plugins
+  # - gazebo-ros
+  # - hector-gazebo-plugins
   # - gazebo-ros-control
   # - gazebo-plugins
   # - lms1xx
   # - controller-manager
   # - interactive_marker_twist_server
   # - diff-drive-controller
   # - joint-state-controller
-  - joy
+  # - joy
   # - robot-localization
   # - teleop-twist-joy
   # - twist-mux
@@ -380,7 +380,7 @@ packages_select_by_deps:
   # - zbar-ros
   # - avt-vimba-camera
   # - apriltag_ros
-  # - cv_bridge
+  - cv_bridge
   # - cv_camera
   # - grid-map-filters
   # - image-geometry
@@ -623,7 +623,7 @@ packages_select_by_deps:
   # - pr2-power-drivers
   # - pr2-run-stop-auto-restart
   # - pr2-self-test-msgs
-  - pr2-teleop
+  # - pr2-teleop
   # - pr2-tilt-laser-interface
   # - pr2-tuckarm
   # - pr2-tuck-arms-action
@@ -984,7 +984,7 @@ packages_select_by_deps:
   # - ros-type-introspection
   # - rqt
   # - rqt-controller-manager
-  - rqt-ez-publisher
+  # - rqt-ez-publisher
   # - rqt-joint-trajectory-controller
   # - rx-service-tools
   # - safety-limiter-msgs
@@ -996,7 +996,7 @@ packages_select_by_deps:
   # - service-tools
   # - sick-safetyscanners
   # - sick-scan
-  - slam-gmapping
+  # - slam-gmapping
   # - slam-toolbox-rviz
   # - slic
   # - slime-wrapper

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -28,51 +28,52 @@ skip_existing:
   - https://conda.anaconda.org/robostack-staging/
 
 packages_select_by_deps:
-  - cras_cpp_common  # maintainer peci1
-  - cras_py_common  # maintainer peci1
-  - cras_docs_common  # maintainer peci1
-  - cras_topic_tools  # maintainer peci1
-  - image_transport_codecs  # maintainer peci1
-  - point_cloud_transport  # maintainer peci1
-  - point_cloud_transport_plugins  # maintainer peci1
-  - draco_point_cloud_transport  # maintainer peci1
-  - sensor_filters  # maintainer peci1
-  - cras_relative_positional_controller  # maintainer peci1
-  - cras_msgs  # maintainer peci1
-  - compass_msgs  # maintainer peci1
+  - cv_bridge
+  # - cras_cpp_common  # maintainer peci1
+  # - cras_py_common  # maintainer peci1
+  # - cras_docs_common  # maintainer peci1
+  # - cras_topic_tools  # maintainer peci1
+  # - image_transport_codecs  # maintainer peci1
+  # - point_cloud_transport  # maintainer peci1
+  # - point_cloud_transport_plugins  # maintainer peci1
+  # - draco_point_cloud_transport  # maintainer peci1
+  # - sensor_filters  # maintainer peci1
+  # - cras_relative_positional_controller  # maintainer peci1
+  # - cras_msgs  # maintainer peci1
+  # - compass_msgs  # maintainer peci1
   # does not work on aarch64 (yet) # - magnetometer_compass  # maintainer peci1
-  - electronic_io_msgs  # maintainer peci1
-  - electronic_io  # maintainer peci1
-  - point_cloud_color  # maintainer peci1
-  - rosmsg_cpp  # maintainer peci1
-  - snmp_ros  # maintainer peci1
-  - robot_body_filter  # maintainer peci1
-  - static_transform_mux  # maintainer peci1
-  - tf_remapper_cpp  # maintainer peci1
-  - roslint  # maintainer peci1
-  - tf2_server  # maintainer peci1
-  - rosbash_params  # maintainer peci1
-  - dynamic_robot_state_publisher  # maintainer peci1
-  - tf2_client  # maintainer peci1
-  - tf_static_publisher  # maintainer peci1
-  - movie_publisher  # maintainer peci1
-  - geometric_shapes
-  - actionlib
-  - foxglove_bridge
-  - ros-babel-fish
-  - ros-babel-fish-test-msgs
-  - moveit_visual_tools
-  - rviz_visual_tools
-  - rgbd-launch
-  - microstrain-inertial-driver
-  - microstrain-inertial-msgs
-  - usb-cam
-  - octomap-ros
-  - octomap-mapping
-  - octomap-server
-  - ackermann-msgs
-  - fake-localization
-  - realsense2-description
+  # - electronic_io_msgs  # maintainer peci1
+  # - electronic_io  # maintainer peci1
+  # - point_cloud_color  # maintainer peci1
+  # - rosmsg_cpp  # maintainer peci1
+  # - snmp_ros  # maintainer peci1
+  # - robot_body_filter  # maintainer peci1
+  # - static_transform_mux  # maintainer peci1
+  # - tf_remapper_cpp  # maintainer peci1
+  # - roslint  # maintainer peci1
+  # - tf2_server  # maintainer peci1
+  # - rosbash_params  # maintainer peci1
+  # - dynamic_robot_state_publisher  # maintainer peci1
+  # - tf2_client  # maintainer peci1
+  # - tf_static_publisher  # maintainer peci1
+  # - movie_publisher  # maintainer peci1
+  # - geometric_shapes
+  # - actionlib
+  # - foxglove_bridge
+  # - ros-babel-fish
+  # - ros-babel-fish-test-msgs
+  # - moveit_visual_tools
+  # - rviz_visual_tools
+  # - rgbd-launch
+  # - microstrain-inertial-driver
+  # - microstrain-inertial-msgs
+  # - usb-cam
+  # - octomap-ros
+  # - octomap-mapping
+  # - octomap-server
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - rqt-gui
   # - catkin

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -29,13 +29,14 @@ skip_existing:
   - https://conda.anaconda.org/robostack-staging/
 
 packages_select_by_deps:
-  - rospack
-  - microstrain-inertial-driver
-  - microstrain-inertial-msgs
-  - octomap-ros
-  - ackermann-msgs
-  - fake-localization
-  - realsense2-description
+  - cv_bridge
+  # - rospack
+  # - microstrain-inertial-driver
+  # - microstrain-inertial-msgs
+  # - octomap-ros
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - rviz
   # - python-qt-binding

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -31,16 +31,17 @@ skip_existing:
   # - /Users/fischert/mambaforge/conda-bld
 
 packages_select_by_deps:
+  - cv_bridge
   ##
   #  TODO OSX-ARM64
   ##
-  - rospack
-  - microstrain-inertial-driver
-  - microstrain-inertial-msgs
-  - octomap-ros
-  - ackermann-msgs
-  - fake-localization
-  - realsense2-description
+  # - rospack
+  # - microstrain-inertial-driver
+  # - microstrain-inertial-msgs
+  # - octomap-ros
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - rviz
   # - python-qt-binding

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -31,17 +31,18 @@ skip_existing:
   - https://conda.anaconda.org/robostack-staging/
 
 packages_select_by_deps:
-  - actionlib
-  - foxglove_bridge
-  - ros-babel-fish
-  - ros-babel-fish-test-msgs
-  - moveit_visual_tools
-  - rviz_visual_tools
-  - rgbd-launch
-  - octomap-ros
-  - ackermann-msgs
-  - fake-localization
-  - realsense2-description
+  - cv_bridge
+  # - actionlib
+  # - foxglove_bridge
+  # - ros-babel-fish
+  # - ros-babel-fish-test-msgs
+  # - moveit_visual_tools
+  # - rviz_visual_tools
+  # - rgbd-launch
+  # - octomap-ros
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - desktop
   # - rqt-gui
@@ -462,7 +463,7 @@ packages_select_by_deps:
   # # DONE Win
   # ##
 
-  - rosserial-arduino
+  # - rosserial-arduino
   # - rosbash
   # - tf2_web_republisher
   # - grid_map