From 53188412d16d8960afb0b27cff5be6c3bd90b722 Mon Sep 17 00:00:00 2001 From: tb14 Date: Wed, 12 Oct 2022 16:15:10 -0500 Subject: [PATCH] First mods for bullseye --- AmRRON-Setup-Script.sh | 12 +++++++----- changelogs/CHANGELOG-Setup-Script.md | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index cdb5870..b7ecaed 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -581,7 +581,8 @@ if [[ -d $USERDIR/hamlib-$NEWHAMLIB ]]; then else # tcl8.5-dev libsigc++-1.2-dev, Trying libsigc++-2.0-dev tcl8.6-dev -sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev || +#sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev || +sudo apt-get install -y libusb-1.0-0.dev libusb-1.0-0 || { ERRCODE="Failed to build dependencies for Hamlib"; errors; return; } cd $USERDIR && wget -N https://sourceforge.net/projects/hamlib/files/hamlib/${NEWHAMLIB}/hamlib-${NEWHAMLIB}.tar.gz || @@ -769,9 +770,10 @@ function ardop_install() { { ERRCODE="Failed to create backup of current ardop file"; errors; return; } fi - echo "Downloading current $ARDOP version." - wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ -wiseman/Downloads/Beta/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + echo "Copying archived working $ARDOP version from "$DIR"/Files/piardopc." + #wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ +#wiseman/Downloads/Beta/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || { ERRCODE="Failed to download ardop"; errors; return; } @@ -1240,7 +1242,7 @@ fi echo "Getting dependencies" sudo apt-get -y install libqt5multimedia5-plugins libqt5serialport5 libqt5printsupport5 \ - libqt5sql5-sqlite libfftw3-single3 libgfortran3 || + libqt5sql5-sqlite libfftw3-single3 libgfortran5 || { ERRCODE="Failed to get dependencies for WSJTX"; errors; return; } diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 0854660..560b858 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,5 +1,8 @@ # Version 0.7.0 - Working updates for current release 2022-09-22 Raspios Bullseye 32bit + - Changed gfortran3 dep to gfortran5 wsjtx + - Changed piardopc to pull from archived working version + - Changed hamlib deps to only libusb # Version 0.6.9 - Corrected wsjt-x address from http to https