diff --git a/distros/jazzy/patch/ros2-apriltag-ros.patch b/distros/jazzy/patch/ros2-apriltag-ros.patch deleted file mode 100644 index 60b9af822..000000000 --- a/distros/jazzy/patch/ros2-apriltag-ros.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 75d5822..8eb328e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,15 @@ find_package(image_transport REQUIRED) - find_package(cv_bridge REQUIRED) - find_package(Eigen3 REQUIRED NO_MODULE) - find_package(Threads REQUIRED) --find_package(OpenCV REQUIRED COMPONENTS core calib3d) -+find_package(OpenCV REQUIRED COMPONENTS core) -+if(OpenCV_VERSION_MAJOR GREATER 4) -+ # calib3d was split into "calib" + "geometry" in OpenCV 5. -+ find_package(OpenCV REQUIRED COMPONENTS calib geometry) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib opencv_geometry) -+else() -+ find_package(OpenCV REQUIRED COMPONENTS calib3d) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib3d) -+endif() - find_package(apriltag 3.2 REQUIRED) - - if(cv_bridge_VERSION VERSION_GREATER_EQUAL 3.3.0) -@@ -98,7 +106,7 @@ target_link_libraries(pose_estimation - PUBLIC - apriltag::apriltag - Eigen3::Eigen -- opencv_calib3d -+ ${APRILTAG_ROS_OPENCV_CALIB_LIBS} - conversion - ${geometry_msgs_TARGETS} - tf2::tf2 diff --git a/distros/lyrical/patch/ros2-apriltag-ros.patch b/distros/lyrical/patch/ros2-apriltag-ros.patch deleted file mode 100644 index 45c4480c9..000000000 --- a/distros/lyrical/patch/ros2-apriltag-ros.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 75d5822..cbb5971 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,8 +5,10 @@ project(apriltag_ros) - set(CMAKE_CXX_STANDARD 14) - - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- add_compile_options(-Werror -Wall -Wextra -Wpedantic) -- add_link_options("-Wl,-z,relro,-z,now,-z,defs") -+ if(NOT APPLE) -+ add_compile_options(-Werror -Wall -Wextra -Wpedantic) -+ add_link_options("-Wl,-z,relro,-z,now,-z,defs") -+ endif() - endif() - - option(ASAN "use AddressSanitizer to detect memory issues" OFF) -@@ -41,7 +43,15 @@ find_package(image_transport REQUIRED) - find_package(cv_bridge REQUIRED) - find_package(Eigen3 REQUIRED NO_MODULE) - find_package(Threads REQUIRED) --find_package(OpenCV REQUIRED COMPONENTS core calib3d) -+find_package(OpenCV REQUIRED COMPONENTS core) -+if(OpenCV_VERSION_MAJOR GREATER 4) -+ # calib3d was split into "calib" + "geometry" in OpenCV 5. -+ find_package(OpenCV REQUIRED COMPONENTS calib geometry) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib opencv_geometry) -+else() -+ find_package(OpenCV REQUIRED COMPONENTS calib3d) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib3d) -+endif() - find_package(apriltag 3.2 REQUIRED) - - if(cv_bridge_VERSION VERSION_GREATER_EQUAL 3.3.0) -@@ -98,7 +108,7 @@ target_link_libraries(pose_estimation - PUBLIC - apriltag::apriltag - Eigen3::Eigen -- opencv_calib3d -+ ${APRILTAG_ROS_OPENCV_CALIB_LIBS} - conversion - ${geometry_msgs_TARGETS} - tf2::tf2 diff --git a/distros/rolling/patch/ros2-apriltag-ros.osx.patch b/distros/rolling/patch/ros2-apriltag-ros.osx.patch deleted file mode 100644 index fbf5a199c..000000000 --- a/distros/rolling/patch/ros2-apriltag-ros.osx.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20bdedf..4e9d53d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,8 +5,10 @@ project(apriltag_ros) - set(CMAKE_CXX_STANDARD 14) - - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- add_compile_options(-Werror -Wall -Wextra -Wpedantic) -- add_link_options("-Wl,-z,relro,-z,now,-z,defs") -+ if(NOT APPLE) -+ add_compile_options(-Werror -Wall -Wextra -Wpedantic) -+ add_link_options("-Wl,-z,relro,-z,now,-z,defs") -+ endif() - endif() - - option(ASAN "use AddressSanitizer to detect memory issues" OFF) diff --git a/distros/rolling/patch/ros2-apriltag-ros.patch b/distros/rolling/patch/ros2-apriltag-ros.patch deleted file mode 100644 index 60b9af822..000000000 --- a/distros/rolling/patch/ros2-apriltag-ros.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 75d5822..8eb328e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,15 @@ find_package(image_transport REQUIRED) - find_package(cv_bridge REQUIRED) - find_package(Eigen3 REQUIRED NO_MODULE) - find_package(Threads REQUIRED) --find_package(OpenCV REQUIRED COMPONENTS core calib3d) -+find_package(OpenCV REQUIRED COMPONENTS core) -+if(OpenCV_VERSION_MAJOR GREATER 4) -+ # calib3d was split into "calib" + "geometry" in OpenCV 5. -+ find_package(OpenCV REQUIRED COMPONENTS calib geometry) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib opencv_geometry) -+else() -+ find_package(OpenCV REQUIRED COMPONENTS calib3d) -+ set(APRILTAG_ROS_OPENCV_CALIB_LIBS opencv_calib3d) -+endif() - find_package(apriltag 3.2 REQUIRED) - - if(cv_bridge_VERSION VERSION_GREATER_EQUAL 3.3.0) -@@ -98,7 +106,7 @@ target_link_libraries(pose_estimation - PUBLIC - apriltag::apriltag - Eigen3::Eigen -- opencv_calib3d -+ ${APRILTAG_ROS_OPENCV_CALIB_LIBS} - conversion - ${geometry_msgs_TARGETS} - tf2::tf2 diff --git a/distros/humble/patch/ros2-apriltag-ros.patch b/shared/patch/ros2-apriltag-ros.patch similarity index 100% rename from distros/humble/patch/ros2-apriltag-ros.patch rename to shared/patch/ros2-apriltag-ros.patch diff --git a/shared/vinca.yaml b/shared/vinca.yaml index 2587f04db..ab5b5bab7 100644 --- a/shared/vinca.yaml +++ b/shared/vinca.yaml @@ -399,7 +399,6 @@ packages_select_by_deps: then: - aerostack2 - apex_containers - - apriltag_ros # earlier macOS and Windows builds failed - avt_vimba_camera # ships some Linux .so in the repo, so it only supports linux - camera_ros # Depends on libcamera, only available on linux - can_dbc_parser @@ -542,6 +541,7 @@ packages_select_by_deps: - if: not win then: + - apriltag_ros # Windows builds failed - as2_cli - as2_msgs - automatika_embodied_agents @@ -642,6 +642,7 @@ packages_exclude: - if: not linux then: + - camera_ros # libcamera is Linux-only; also removed from the dependencies of the packages that use it - pendulum_control - rttest - tlsf