From a2c5046da105da83e5d7a489ca9df68664f6b7a4 Mon Sep 17 00:00:00 2001
From: Pedro Roque <padr@kth.se>
Date: Sun, 14 Jan 2024 08:35:04 +0100
Subject: [PATCH] update: submodule refs, readme and try at fixing opencv deb

---
 discower                                       | 2 +-
 scripts/setup/debians/build_install_debians.sh | 2 +-
 scripts/setup/debians/build_opencv.sh          | 4 ++--
 scripts/setup/packages_desktop_jammy.lst       | 7 ++++++-
 submodules/CATKIN_IGNORE                       | 0
 submodules/COLCON_IGNORE                       | 0
 submodules/px4                                 | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 submodules/CATKIN_IGNORE
 delete mode 100644 submodules/COLCON_IGNORE

diff --git a/discower b/discower
index 27e5f134bf..a2499dd0ca 160000
--- a/discower
+++ b/discower
@@ -1 +1 @@
-Subproject commit 27e5f134bf87672cb4942762077dd812696e9bae
+Subproject commit a2499dd0cabfad94aec43cbf7a363697e6e3ae70
diff --git a/scripts/setup/debians/build_install_debians.sh b/scripts/setup/debians/build_install_debians.sh
index 2c77b5c3f1..1b295d06d9 100755
--- 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
index b4c52a7e27..bf1352410b 100755
--- 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
index 45c379adf4..405eb1ae0c 100644
--- 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
\ No newline at end of file
+ros-humble-perception-pcl
+libdc1394-dev
+libgtk-3-dev 
+libv4l-dev 
+libvtk7-dev 
+dh-python
\ No newline at end of file
diff --git a/submodules/CATKIN_IGNORE b/submodules/CATKIN_IGNORE
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/submodules/COLCON_IGNORE b/submodules/COLCON_IGNORE
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/submodules/px4 b/submodules/px4
index cbd7a9cd39..4ac6e6a61a 160000
--- a/submodules/px4
+++ b/submodules/px4
@@ -1 +1 @@
-Subproject commit cbd7a9cd39b970cc3537e788c1c8c68284c9d646
+Subproject commit 4ac6e6a61aca0cc30680ea5875c1361fff24075c