Merge pull request #1807 from jsk-ros-pkg/ros-o

[audio_video_recorder][jsk_rosbag_tools] support ros-o
jsk-ros-pkg · Dec 12, 2024 · 3f480f6 · 3f480f6
2 parents 0f775b0 + 88f6c1f
commit 3f480f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -176,7 +176,6 @@ jobs:
           set -x
           # hack!
           apt install -y -q -qq python-is-python3
-          sed -i s/noetic/Debian/ $GITHUB_WORKSPACE/jsk_rosbag_tools/CMakeLists.txt
           # setup workspace
           mkdir -p ~/ws_current/src
           cd ~/ws_current/src

diff --git a/audio_video_recorder/package.xml b/audio_video_recorder/package.xml
@@ -24,6 +24,7 @@
   <exec_depend>gstreamer1.0-plugins-base</exec_depend>
   <exec_depend>gstreamer1.0-plugins-good</exec_depend>
   <exec_depend>gstreamer1.0-plugins-ugly</exec_depend>
+  <exec_depend>libgstreamer1.0-dev</exec_depend>
   <exec_depend>message_filters</exec_depend>
   <exec_depend>sensor_msgs</exec_depend>
 </package>
diff --git a/jsk_rosbag_tools/CMakeLists.txt b/jsk_rosbag_tools/CMakeLists.txt
@@ -18,15 +18,15 @@ catkin_package(
   CATKIN_DEPENDS
 )
 
-if(("$ENV{ROS_DISTRO}" STREQUAL "noetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "Debian") OR ("$ENV{ROS_DISTRO}" STREQUAL "debian"))
+if($ENV{ROS_DISTRO} STREQUAL "indigo" OR $ENV{ROS_DISTRO} STREQUAL "kinetic" OR $ENV{ROS_DISTRO} STREQUAL "melodic")
   catkin_generate_virtualenv(
-    INPUT_REQUIREMENTS requirements.in
-    PYTHON_INTERPRETER python3
+    INPUT_REQUIREMENTS requirements.in.python2
+    PYTHON_INTERPRETER python2
   )
 else()
   catkin_generate_virtualenv(
-    INPUT_REQUIREMENTS requirements.in.python2
-    PYTHON_INTERPRETER python2
+    INPUT_REQUIREMENTS requirements.in
+    PYTHON_INTERPRETER python3
   )
 endif()