diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh index d127602..bf0a5d4 100755 --- a/docker/scripts/install-dependencies-sdrplay.sh +++ b/docker/scripts/install-dependencies-sdrplay.sh @@ -28,13 +28,13 @@ ARCH=$(uname -m) case $ARCH in x86_64) - BINARY=SDRplay_RSP_API-Linux-2.13.1.run + BINARY=SDRplay_RSP_API-Linux-3.06.1.run ;; armv*) - BINARY=SDRplay_RSP_API-RPi-2.13.1.run + BINARY=SDRplay_RSP_API-ARM32-3.06.1.run ;; aarch64) - BINARY=SDRplay_RSP_API-ARM64-2.13.1.run + BINARY=SDRplay_RSP_API-ARM64-3.06.1.run ;; esac @@ -48,7 +48,7 @@ cd .. rm -rf sdrplay rm $BINARY -git clone https://github.com/pothosware/SoapySDRPlay.git -cmakebuild SoapySDRPlay 14ec39e4ff0dab7ae7fdf1afbbd2d28b49b0ffae +git clone https://github.com/fventuri/SoapySDRPlay.git +cmakebuild SoapySDRPlay 9746de21d5a3778c444cc5e70da2a61c27cb614a apk del .build-deps diff --git a/docker/scripts/install-lib.x86_64.patch b/docker/scripts/install-lib.x86_64.patch index 588f14e..0666bf4 100644 --- a/docker/scripts/install-lib.x86_64.patch +++ b/docker/scripts/install-lib.x86_64.patch @@ -1,9 +1,11 @@ ---- sdrplay/install_lib.sh 2018-06-21 01:57:02.000000000 +0200 -+++ sdrplay/install_lib_patched.sh 2019-01-22 17:21:06.445804136 +0100 -@@ -2,19 +2,7 @@ - - echo "Installing SDRplay RSP API library 2.13..." +--- sdrplay/install_lib.sh ++++ sdrplay/install_lib_patched.sh +@@ -4,19 +4,6 @@ + MAJVERS="3" + echo "Installing SDRplay RSP API library ${VERS}..." +-read -p "Press RETURN to view the license agreement" ret +- -more sdrplay_license.txt - -while true; do @@ -15,26 +17,6 @@ - * ) echo "Please answer y or n";; - esac -done -- --export ARCH=`arch` -+export ARCH=`uname -m` - export VERS="2.13" - - echo "Architecture: ${ARCH}" -@@ -60,16 +48,6 @@ - echo " " - exit 1 - fi -- --if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then -- echo "Libusb found, continuing..." --else -- echo " " -- echo "ERROR: Libusb cannot be found. Please install libusb and then run" -- echo "the installer again. Libusb can be installed from http://libusb.info" -- echo " " -- exit 1 --fi - - #echo "Installing SoapySDRPlay..." + ARCH=`uname -m` + OSDIST="Unknown"