|
|
|
@ -76,7 +76,7 @@ elif [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ];
@@ -76,7 +76,7 @@ elif [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ];
|
|
|
|
|
SITLCFML_VERSION="2.5" |
|
|
|
|
PYTHON_V="python3" |
|
|
|
|
PIP=pip3 |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ]; then |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'bullseye' ]; then |
|
|
|
|
SITLFML_VERSION="2.5" |
|
|
|
|
SITLCFML_VERSION="2.5" |
|
|
|
|
PYTHON_V="python3" |
|
|
|
@ -190,7 +190,7 @@ echo "Done!"
@@ -190,7 +190,7 @@ echo "Done!"
|
|
|
|
|
if [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ]; then |
|
|
|
|
BASE_PKGS+=" python-is-python3" |
|
|
|
|
SITL_PKGS+=" libpython3-stdlib" # for argparse |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ]; then |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'bullseye' ]; then |
|
|
|
|
BASE_PKGS+=" python-is-python3" |
|
|
|
|
SITL_PKGS+=" libpython3-stdlib" # for argparse |
|
|
|
|
else |
|
|
|
@ -199,12 +199,10 @@ fi
@@ -199,12 +199,10 @@ fi
|
|
|
|
|
|
|
|
|
|
# Check for graphical package for MAVProxy |
|
|
|
|
if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then |
|
|
|
|
if [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ]; then |
|
|
|
|
SITL_PKGS+=" python3-wxgtk4.0" |
|
|
|
|
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libjpeg8-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ]; then |
|
|
|
|
SITL_PKGS+=" python3-wxgtk4.0" |
|
|
|
|
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libjpeg8-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame |
|
|
|
|
if [ ${RELEASE_CODENAME} == 'bullseye' ]; then |
|
|
|
|
SITL_PKGS+=" libjpeg62-turbo-dev" |
|
|
|
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ]; then |
|
|
|
|
SITL_PKGS+=" libjpeg8-dev" |
|
|
|
|
elif apt-cache search python-wxgtk3.0 | grep wx; then |
|
|
|
|
SITL_PKGS+=" python-wxgtk3.0" |
|
|
|
|
else |
|
|
|
@ -212,6 +210,10 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
@@ -212,6 +210,10 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
|
|
|
|
|
SITL_PKGS+=" python-wxgtk2.8" |
|
|
|
|
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libjpeg8-dev libpng12-0 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame |
|
|
|
|
fi |
|
|
|
|
if [ ${RELEASE_CODENAME} == 'bullseye' ] || [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ]; then |
|
|
|
|
SITL_PKGS+=" python3-wxgtk4.0" |
|
|
|
|
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
# Check if we need to manually install realpath |
|
|
|
|