Skip to content

Commit 3ba4584

Browse files
authored
Feat: Add usb-cam to linux builds (#73)
* Add usb-cam to linux builds * Add usb-cam patch from ros-drivers/usb_cam#343 * also disable warnings as errors * add trailing EOL to patch * migrate patch to tagged version of code (ros2-gbp/usb_cam-release at release/jazzy/usb_cam/0.8.1-1)
1 parent d418ad8 commit 3ba4584

File tree

3 files changed

+33
-0
lines changed

3 files changed

+33
-0
lines changed

patch/ros-jazzy-usb-cam.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 2387c32..0413704 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -8,7 +8,7 @@ endif()
6+
7+
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
8+
if($ENV{ROS_VERSION} EQUAL 2)
9+
- add_compile_options(-Wall -Wextra -Wpedantic -Werror)
10+
+ add_compile_options(-Wall -Wextra -Wpedantic)
11+
endif()
12+
endif()
13+
14+
diff --git a/include/usb_cam/formats/av_pixel_format_helper.hpp b/include/usb_cam/formats/av_pixel_format_helper.hpp
15+
index ad1792e..1ea720d 100644
16+
--- a/include/usb_cam/formats/av_pixel_format_helper.hpp
17+
+++ b/include/usb_cam/formats/av_pixel_format_helper.hpp
18+
@@ -744,11 +744,6 @@ const std::unordered_map<std::string, AVPixelFormat> STR_2_AVPIXFMT = {
19+
///< big-endian
20+
21+
22+
- {stringify(AV_PIX_FMT_XVMC), AV_PIX_FMT_XVMC}, ///< XVideo Motion
23+
- ///< Acceleration via common
24+
- ///< packet passing
25+
-
26+
-
27+
{stringify(AV_PIX_FMT_YUV440P10LE), AV_PIX_FMT_YUV440P10LE}, ///< planar YUV 4:4:0,20bpp,
28+
///< (1 Cr & Cb sample per
29+
///< 1x2 Y samples),

vinca_linux_64.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,7 @@ packages_select_by_deps:
149149

150150
- ouster_ros
151151

152+
- usb-cam
153+
152154
patch_dir: patch
153155
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_linux_aarch64.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,7 @@ packages_select_by_deps:
147147

148148
- ouster_ros
149149

150+
- usb-cam
151+
150152
patch_dir: patch
151153
rosdistro_snapshot: rosdistro_snapshot.yaml

0 commit comments

Comments
 (0)