update: submodule refs, readme and try at fixing opencv deb

DISCOWER · Jan 14, 2024 · a2c5046 · a2c5046
1 parent 054bd43
commit a2c5046
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/discower b/discower
diff --git a/scripts/setup/debians/build_install_debians.sh b/scripts/setup/debians/build_install_debians.sh
@@ -39,7 +39,7 @@ case $dist in
   jammy)
     build_list+=( opencv )
     sudo apt-get install -y libvtk7.1p
-    echo "Ubuntu 21 detected"
+    echo "Ubuntu 22 detected"
     ;;
   bionic)
     echo "Ubuntu 18 detected"

diff --git a/scripts/setup/debians/build_opencv.sh b/scripts/setup/debians/build_opencv.sh
@@ -25,8 +25,8 @@ DIST=$(grep -oP "(?<=VERSION_CODENAME=).*" /etc/os-release)
 if [ -d $PACKAGE_NAME ]; then
   rm -rf $PACKAGE_NAME
 fi
-git clone --quiet https://github.com/opencv/opencv.git --branch 4.2.0 $PACKAGE_NAME/opencv 2>&1 || exit 1
-git clone --quiet https://github.com/opencv/opencv_contrib.git --branch 4.2.0 $PACKAGE_NAME/contrib 2>&1 || exit 1
+git clone https://github.com/opencv/opencv.git --branch 4.2.0 $PACKAGE_NAME/opencv 2>&1 || exit 1
+git clone https://github.com/opencv/opencv_contrib.git --branch 4.2.0 $PACKAGE_NAME/contrib 2>&1 || exit 1
 cd $PACKAGE_NAME/opencv
 git archive --prefix=$PACKAGE_NAME/ --output=../$ORIG_TAR --format tar.gz HEAD || exit 1
 cp -r ../../$DEB_DIR debian

diff --git a/scripts/setup/packages_desktop_jammy.lst b/scripts/setup/packages_desktop_jammy.lst
@@ -1,3 +1,8 @@
 ros-humble-ros-testing
 ros-humble-xacro
-ros-humble-perception-pcl
+ros-humble-perception-pcl
+libdc1394-dev
+libgtk-3-dev 
+libv4l-dev 
+libvtk7-dev 
+dh-python
diff --git a/submodules/CATKIN_IGNORE b/submodules/CATKIN_IGNORE
diff --git a/submodules/COLCON_IGNORE b/submodules/COLCON_IGNORE
diff --git a/submodules/px4 b/submodules/px4
+15 −7		README.md
+1 −2		discower_description/urdf/model.urdf.xacro
+1 −1		discower_description/urdf/model_drag.urdf.xacro
+3 −2		discower_description/urdf/model_sitl.urdf.xacro
+25 −0		discower_gazebo/launch/px4.launch.py
+51 −33		discower_gazebo/launch/start_simulation.launch.py