From 159a835806226afb281ceb01c102450b0f10b53b Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 20 Feb 2024 02:23:17 +0100 Subject: [PATCH] update sdrplay to 3.14 --- docker/files/sdrplay/install-lib.x86_64.patch | 37 ++++++++++--------- .../scripts/install-dependencies-sdrplay.sh | 7 +--- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/docker/files/sdrplay/install-lib.x86_64.patch b/docker/files/sdrplay/install-lib.x86_64.patch index 7b53fc6b..62402f80 100644 --- a/docker/files/sdrplay/install-lib.x86_64.patch +++ b/docker/files/sdrplay/install-lib.x86_64.patch @@ -1,5 +1,6 @@ ---- sdrplay-orig/install_lib.sh 2024-01-01 15:03:53.377291864 +0100 -+++ sdrplay/install_lib.sh 2024-01-01 16:09:25.948363042 +0100 +diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh +--- sdrplay-orig/install_lib.sh 2024-02-20 00:57:57.438264040 +0100 ++++ sdrplay/install_lib.sh 2024-02-20 01:01:14.293463093 +0100 @@ -17,26 +17,7 @@ echo "the system files." echo " " @@ -41,19 +42,19 @@ echo "This installer only supports 64 bit architectures." echo "One of the above indicates that something is not set for" echo "64 bit operation. Please either fix the relevant OS issue or" -@@ -193,11 +173,6 @@ - sudo chmod 644 /etc/udev/hwdb.d/20-sdrplay.hwdb - sudo systemd-hwdb update - sudo udevadm trigger -- if [ "${SRVTYPE}" != "initd" ]; then -- sudo systemctl restart udev -- else -- sudo service udev restart -- fi - echo "Done" - fi +@@ -194,11 +174,6 @@ + sudo chmod 644 /etc/udev/hwdb.d/20-sdrplay.hwdb + sudo systemd-hwdb update + sudo udevadm trigger +- if [ "${SRVTYPE}" != "initd" ]; then +- sudo systemctl restart udev +- else +- sudo service udev restart +- fi + echo "Done" fi -@@ -227,7 +202,7 @@ + else +@@ -234,7 +209,7 @@ fi echo " " @@ -62,7 +63,7 @@ locheader="/usr/local/include" loclib="/usr/local/lib" locscripts="/etc/systemd/system" -@@ -247,45 +222,6 @@ +@@ -254,45 +229,6 @@ echo "Daemon start system : ${DAEMON_SYS}" echo " " @@ -108,7 +109,7 @@ sudo mkdir -p -m 755 ${locservice} >> /dev/null 2>&1 sudo mkdir -p -m 755 ${locheader} >> /dev/null 2>&1 sudo mkdir -p -m 755 ${loclib} >> /dev/null 2>&1 -@@ -317,10 +253,6 @@ +@@ -324,10 +260,6 @@ echo -n "Installing Service scripts and starting daemon..." if [ -d "/etc/systemd/system" ]; then SRVTYPE="systemd" @@ -119,7 +120,7 @@ sudo bash -c 'cat > /etc/systemd/system/sdrplay.service' << EOF [Unit] Description=SDRplay API Service -@@ -339,8 +271,6 @@ +@@ -346,8 +278,6 @@ EOF sudo chmod 644 /etc/systemd/system/sdrplay.service @@ -128,7 +129,7 @@ else SRVTYPE="initd" if [ -f "/etc/init.d/sdrplayService" ]; then -@@ -443,16 +373,6 @@ +@@ -450,16 +380,6 @@ echo "finished, please reboot this device." echo " " diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh index ce3645b4..d09cb911 100755 --- a/docker/scripts/install-dependencies-sdrplay.sh +++ b/docker/scripts/install-dependencies-sdrplay.sh @@ -27,15 +27,12 @@ apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES ARCH=$(uname -m) case $ARCH in - x86_64) - BINARY=SDRplay_RSP_API-Linux-3.12.1.run + x86_64|aarch64) + BINARY=SDRplay_RSP_API-Linux-3.14.0.run ;; armv*) BINARY=SDRplay_RSP_API-ARM32-3.07.2.run ;; - aarch64) - BINARY=SDRplay_RSP_API-Linux-3.12.1.run - ;; esac wget --no-http-keep-alive https://www.sdrplay.com/software/$BINARY