Skip to content

Commit

Permalink
restore support for ubuntu 20.04 in dependency installation scripts (#…
Browse files Browse the repository at this point in the history
…6736)

This reverts parts of commit d4dcff3. "Fix main branch builds (#6719)"
  • Loading branch information
CoolSpy3 authored Dec 20, 2024
1 parent 16d6e5d commit 8fd32fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion scripts/install/linux_compilation_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion scripts/install/linux_runtime_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 8fd32fb

Please sign in to comment.