From 39697d47e2595d73d600675fa7e85ac30c736f9b Mon Sep 17 00:00:00 2001 From: tb14 Date: Sun, 16 Oct 2022 19:49:14 -0500 Subject: [PATCH] 64bit pi testing --- AmRRON-Setup-Script.sh | 19 +++++++++++++++---- changelogs/CHANGELOG-Setup-Script.md | 7 ++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 45d7473..a1d9d62 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.7.1 ######################## +######################## AmRRON Setup Script v0.7.2 ######################## ######################## Created by TB-14 ######################## ######################## 15 OCT 22 ######################## ################################################################################ @@ -639,9 +639,16 @@ fi echo "FLDIGI is already at the most current version" else - echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" + + if [[ ${PLAT} = "Raspbian" ]] && [[ `getconf LONG_BIT` = '64' ]]; then + LIBJPG=libjpeg62-turbo-dev + else + LIBJPG=libjpeg9-dev + fi + + echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" # sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libudev-dev libltdl-dev libusb-1.0-0 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 libfltk1.3-dev libjpeg9-dev libxft-dev libxinerama-dev libxcursor-dev libsndfile1-dev libsamplerate0-dev portaudio19-dev libpulse-dev libusb-1.0-0-dev texinfo libudev-dev || { ERRCODE="Failed to get dependencies for FLDIGI."; errors; return; } + sudo apt-get install -y libfltk1.3-dev $LIBJPG libxft-dev libxinerama-dev libxcursor-dev libsndfile1-dev libsamplerate0-dev portaudio19-dev libpulse-dev libusb-1.0-0-dev texinfo libudev-dev || { ERRCODE="Failed to get dependencies for FLDIGI."; errors; return; } cd $USERDIR && wget -N https://sourceforge.net/projects/fldigi\ /files/fldigi/fldigi-${NEWFLDIGI}.tar.gz || @@ -786,6 +793,10 @@ fi echo "FLWRAP is already at the most current version" else + if [[ $OSCN == "vanessa" ]]; then + sudo apt install -y flwrap || + { ERRCODE="Unable to install FLWRAP from repositories."; errors; return; } + else echo "Installing / Updating FLWRAP to version ${NEWFLWRAP}" sleep 2 cd $USERDIR && wget -N https://sourceforge.net/projects/fldigi\ @@ -808,7 +819,7 @@ install || if hash flwrap 2>/dev/null; then sudo rm -r $USERDIR/flwrap-${NEWFLWRAP} fi - +fi fi } diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 978d86c..bc04646 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,7 @@ +# Version 0.7.2 + - FLDIGI raspbian 64bit check + + # Version 0.7.1 - Mint 21 tweaks - ARDOPC file instead of from source @@ -15,7 +19,8 @@ - WSJTX from source - removed deps for voacap testing - WSJTX version check - + - Vanessa FLWRAP from repo due to compile error from source + # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit - Changed gfortran3 dep to gfortran5 wsjtx