From 8fd32fb7500e48c8bf8efd0c7325c58226b72ad4 Mon Sep 17 00:00:00 2001 From: CoolSpy3 <55305038+CoolSpy3@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:31:15 -0800 Subject: [PATCH] restore support for ubuntu 20.04 in dependency installation scripts (#6736) This reverts parts of commit d4dcff399e6a87d3010e5ec029020f2030bef354. "Fix main branch builds (#6719)" --- scripts/install/linux_compilation_dependencies.sh | 4 +++- scripts/install/linux_runtime_dependencies.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/install/linux_compilation_dependencies.sh b/scripts/install/linux_compilation_dependencies.sh index 213b51ad584..a83b655eaf5 100755 --- a/scripts/install/linux_compilation_dependencies.sh +++ b/scripts/install/linux_compilation_dependencies.sh @@ -15,7 +15,9 @@ apt update apt install --yes git lsb-release cmake swig libglu1-mesa-dev libglib2.0-dev libfreeimage3 libfreetype6-dev libxml2-dev libboost-dev libssh-gcrypt-dev libzip-dev libreadline-dev pbzip2 wget zip unzip python3 python3-pip libopenal-dev UBUNTU_VERSION=$(lsb_release -rs) -if [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then +if [[ $UBUNTU_VERSION == "20.04" ]]; then + apt install --yes libzip5 perl libtext-template-perl +elif [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then apt install --yes libzip4 openssl else echo "Unsupported Linux version: dependencies may not be completely installed. Only the two latest Ubuntu LTS are supported." diff --git a/scripts/install/linux_runtime_dependencies.sh b/scripts/install/linux_runtime_dependencies.sh index 4593476be2c..0c09ae7c048 100755 --- a/scripts/install/linux_runtime_dependencies.sh +++ b/scripts/install/linux_runtime_dependencies.sh @@ -18,7 +18,7 @@ if [[ -z "$DISPLAY" ]]; then fi UBUNTU_VERSION=$(lsb_release -rs) -if [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then +if [[ $UBUNTU_VERSION == "20.04" || $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then apt install --yes ffmpeg else echo "Unsupported Linux version: dependencies may not be completely installed. Only the two latest Ubuntu LTS are supported."