From c2221992320c8a9295a30d98a70d76d682b4e3bb Mon Sep 17 00:00:00 2001 From: Stefania Pedrazzi Date: Mon, 19 Jun 2023 16:11:24 +0100 Subject: [PATCH 1/5] Document missing SUMO libraries --- docs/automobile/sumo-exporter.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/automobile/sumo-exporter.md b/docs/automobile/sumo-exporter.md index 5a0dfb0dc6f..ad8646c435c 100644 --- a/docs/automobile/sumo-exporter.md +++ b/docs/automobile/sumo-exporter.md @@ -8,6 +8,16 @@ The SUMO exporter can create SUMO network files from a Webots simulation. The SUMO exporter is using the `shapely` Python module. Please refer to [these instructions](openstreetmap-importer.md#dependencies) to install it. +### Linux + +On Linux, you also need to install `libgdal` and `libfox` to run the SUMO `netconvert` and `duarouter` binaries. +On Ubuntu 22.04, please run this command: +```sh +sudo apt install libgdal30 libfox-1.6-0 +``` +On Ubuntu 20.04, `libdgal30` is not available and you have to install the previous version `libgdal26` instead. + + ## Expectations on the Webots Simulation If the Webots simulation has been created from the OpenStreetMap importer, then the export should be straight forward. From 295cacc385c743431ab1576c1b355d0495448aff Mon Sep 17 00:00:00 2001 From: Stefania Pedrazzi Date: Mon, 19 Jun 2023 17:13:12 +0200 Subject: [PATCH 2/5] Remove new line --- docs/automobile/sumo-exporter.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/automobile/sumo-exporter.md b/docs/automobile/sumo-exporter.md index ad8646c435c..e2b92c1ccd8 100644 --- a/docs/automobile/sumo-exporter.md +++ b/docs/automobile/sumo-exporter.md @@ -17,7 +17,6 @@ sudo apt install libgdal30 libfox-1.6-0 ``` On Ubuntu 20.04, `libdgal30` is not available and you have to install the previous version `libgdal26` instead. - ## Expectations on the Webots Simulation If the Webots simulation has been created from the OpenStreetMap importer, then the export should be straight forward. From d6d88557cf111e58787e60de94fd4459d8a799ca Mon Sep 17 00:00:00 2001 From: Stefania Pedrazzi Date: Mon, 19 Jun 2023 17:13:52 +0200 Subject: [PATCH 3/5] Update sumo-exporter.md --- docs/automobile/sumo-exporter.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/automobile/sumo-exporter.md b/docs/automobile/sumo-exporter.md index e2b92c1ccd8..a1af473a073 100644 --- a/docs/automobile/sumo-exporter.md +++ b/docs/automobile/sumo-exporter.md @@ -11,6 +11,7 @@ Please refer to [these instructions](openstreetmap-importer.md#dependencies) to ### Linux On Linux, you also need to install `libgdal` and `libfox` to run the SUMO `netconvert` and `duarouter` binaries. + On Ubuntu 22.04, please run this command: ```sh sudo apt install libgdal30 libfox-1.6-0 From d077e664085962c8c24eaa3f0eb0af1c765429b9 Mon Sep 17 00:00:00 2001 From: Stefania Pedrazzi Date: Wed, 21 Jun 2023 08:42:35 +0200 Subject: [PATCH 4/5] Improved documentation od SUMO dependencies --- docs/guide/installation-procedure.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/guide/installation-procedure.md b/docs/guide/installation-procedure.md index 07b6306c219..3e17ad71249 100644 --- a/docs/guide/installation-procedure.md +++ b/docs/guide/installation-procedure.md @@ -123,11 +123,16 @@ Execute the following command to install *ffmpeg* with *x264* support: ```bash conda install x264 ffmpeg -c conda-forge ``` -For SUMO, you will need to install libxerces-c-devel, libproj-devel, libgdal-devel, and fox16-devel. -Execute the following commands to enable SUMO on Debian / Ubuntu based distributions: +For SUMO, you will need to install `libxerces-c`, `libfox`, `libgdal`, `libproj`, and `libgl2ps`. +Execute the following commands to enable SUMO Ubuntu 22.04: ```bash -sudo apt-get install libxerces-c-dev libfox-1.6-dev libgdal-dev libproj-dev libgl2ps-dev +sudo apt-get install libxerces-c3.2 libfox-1.6-0 libgdal30 libproj22 libgl2ps1.4 ``` +And this command for Ubuntu 20.04: +```bash +sudo apt-get install libxerces-c3.2 libfox-1.6-0 libgdal26 libproj15 libgl2ps1.4 +``` + #### Installing the Snap Package From bd6457f84d2a1b5da767e57f565ec083a57f9bbb Mon Sep 17 00:00:00 2001 From: Stefania Pedrazzi Date: Wed, 21 Jun 2023 08:45:00 +0200 Subject: [PATCH 5/5] Do not depend on dev packages when not needed --- scripts/packaging/linux_distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packaging/linux_distro.py b/scripts/packaging/linux_distro.py index 5d03b2700ba..2f8d63aec02 100644 --- a/scripts/packaging/linux_distro.py +++ b/scripts/packaging/linux_distro.py @@ -193,7 +193,7 @@ def create_debian_bundle(self): "libglib2.0-0 (>= 2.10.0), libegl1, libglu1-mesa | libglu1, libgtk-3-0, " "libnss3, libstdc++6 (>= 4.0.2-4), libxaw7, libxrandr2, libxrender1, " "libssh-dev, libzip-dev, xserver-xorg-core, libxslt1.1, " - "libxerces-c-dev, libfox-1.6-dev, libgdal-dev, libproj-dev, libgl2ps-dev, " # SUMO dependencies + "libxerces-c3.2, libfox-1.6-0, libgdal-dev, libproj-dev, libgl2ps1.4, " # SUMO dependencies "libfreetype6, libxkbcommon-x11-0, libxcb-keysyms1, libxcb-image0, libxcb-icccm4, " "libxcb-randr0, libxcb-render-util0, libxcb-xinerama0\n" "Conflicts: webots-for-nao\n"