diff options
| author | Guy Sheffer <guysoft@gmail.com> | 2021-07-26 12:59:04 +0300 |
|---|---|---|
| committer | Guy Sheffer <guysoft@gmail.com> | 2021-07-26 12:59:04 +0300 |
| commit | 9bec6e6ad9dc61fe188c0e3d842d3d30ad656584 (patch) | |
| tree | 71d41b664fd4195f7b55d7bbb3320e0fffa9f993 | |
| parent | 55228f05d288e6f307cf5abda323dd918e2b148a (diff) | |
Fix build for Ubuntu 20.04 64bit, use libjpeg8-dev
| -rwxr-xr-x | src/modules/octopi/start_chroot_script | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script index 647eac6..65eb08e 100755 --- a/src/modules/octopi/start_chroot_script +++ b/src/modules/octopi/start_chroot_script @@ -61,10 +61,14 @@ pushd /home/"${BASE_USER}" then install_dir=/opt/mjpg-streamer echo "--- Installing mjpg-streamer to $install_dir" - if [ $( is_in_apt libjpeg62-turbo-dev ) -eq 1 ]; then - apt-get -y --force-yes install libjpeg62-turbo-dev - elif [ $( is_in_apt libjpeg8-dev ) -eq 1 ]; then - apt-get -y --force-yes install libjpeg8-dev + if [ "${BASE_DISTRO}" == "ubuntu" ]; then + apt-get -y --allow-downgrades --allow-remove-essential --allow-change-held-packages install libjpeg8-dev + else + if [ $( is_in_apt libjpeg62-turbo-dev ) -eq 1 ]; then + apt-get -y --force-yes install libjpeg62-turbo-dev + elif [ $( is_in_apt libjpeg8-dev ) -eq 1 ]; then + apt-get -y --force-yes install libjpeg8-dev + fi fi apt-get -y --force-yes --no-install-recommends install imagemagick ffmpeg libv4l-dev |