diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/changelog libxtrx-0.0.1+git20191219.98458ce/debian/changelog
--- libxtrx-0.0.1+git20191219.98458ce/debian/changelog	2020-03-17 12:02:53.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/changelog	2021-09-14 13:30:00.000000000 +0000
@@ -1,3 +1,13 @@
+libxtrx (0.0.1+git20191219.98458ce-1+rpi1) bookworm-staging; urgency=medium
+
+  * Apply upstream patch for soapysdr 0.8 (Closes: 993699 )
+  * Bump soapysdr build-dependency to 0.8
+  * Change all references to soapysdr in debian packaging from 0.7 to 0.8
+    note: this changes the name of a binary package, so would need to go
+    through new if uploaded to Debian.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 14 Sep 2021 13:30:00 +0000
+
 libxtrx (0.0.1+git20191219.98458ce-1) unstable; urgency=medium
 
   * Initial release (Closes: #945155)
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/control libxtrx-0.0.1+git20191219.98458ce/debian/control
--- libxtrx-0.0.1+git20191219.98458ce/debian/control	2020-03-17 12:02:53.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/control	2021-09-14 13:30:00.000000000 +0000
@@ -6,7 +6,7 @@
     cmake,
     qtbase5-dev,
     libqcustomplot-dev,
-    libsoapysdr-dev,
+    libsoapysdr-dev (>= 0.8),
     liblms7compact-dev,
     libxtrxdsp-dev,
     libxtrxll-dev
@@ -43,7 +43,7 @@
  .
  This package contains the shared library and utilities for testing it.
 
-Package: soapysdr0.7-module-xtrx
+Package: soapysdr0.8-module-xtrx
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -57,7 +57,7 @@
 Package: soapysdr-module-xtrx
 Architecture: any
 Multi-Arch: same
-Depends: soapysdr0.7-module-xtrx, ${misc:Depends}
+Depends: soapysdr0.8-module-xtrx, ${misc:Depends}
 Description: XTRX device support for SoapySDR (default version)
  XTRX is the smallest easily embeddable software-defined radio (SDR). It is
  both affordable and high-performance. XTRX is designed to enable the next
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/patches/series libxtrx-0.0.1+git20191219.98458ce/debian/patches/series
--- libxtrx-0.0.1+git20191219.98458ce/debian/patches/series	2020-03-17 12:02:53.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/patches/series	2021-09-14 13:27:50.000000000 +0000
@@ -1 +1,2 @@
 0001-cmake-find-threads.patch
+soapysdr-0.8.patch
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/patches/soapysdr-0.8.patch libxtrx-0.0.1+git20191219.98458ce/debian/patches/soapysdr-0.8.patch
--- libxtrx-0.0.1+git20191219.98458ce/debian/patches/soapysdr-0.8.patch	1970-01-01 00:00:00.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/patches/soapysdr-0.8.patch	2021-09-14 13:26:25.000000000 +0000
@@ -0,0 +1,25 @@
+commit bdb2e7ec22d9030c741f7da5b794fde3b778a956
+Author: ghostop14 <ghostop14@gmail.com>
+Date:   Sun Mar 29 18:56:53 2020 -0400
+
+    Fix test_xtrx_soapy build issue
+    
+    The Soapy setupstream function now passes back rxStream as the
+    return value rather than taking it as a parameter.  This PR
+    corrects the code to build correctly and addresses issue #23.
+
+diff --git a/soapy/test_xtrx_soapy.c b/soapy/test_xtrx_soapy.c
+index de1c52c..7221410 100644
+--- a/soapy/test_xtrx_soapy.c
++++ b/soapy/test_xtrx_soapy.c
+@@ -67,8 +67,8 @@ int main(void)
+ 
+     //setup a stream (complex floats)
+     SoapySDRStream *rxStream;
+-    if (SoapySDRDevice_setupStream(sdr, &rxStream, SOAPY_SDR_RX, SOAPY_SDR_CF32, NULL, 0, NULL) != 0)
+-    {
++    rxStream = SoapySDRDevice_setupStream(sdr, SOAPY_SDR_RX, SOAPY_SDR_CF32, NULL, 0, NULL);
++    if ( rxStream == 0)    {
+         printf("setupStream fail: %s\n", SoapySDRDevice_lastError());
+     }
+     SoapySDRDevice_activateStream(sdr, rxStream, 0, 0, 0); //start streaming
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/rules libxtrx-0.0.1+git20191219.98458ce/debian/rules
--- libxtrx-0.0.1+git20191219.98458ce/debian/rules	2020-03-17 12:02:53.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/rules	2021-09-14 13:30:00.000000000 +0000
@@ -10,5 +10,5 @@
 
 override_dh_installdocs:
 	dh_installdocs -p soapysdr-module-xtrx \
-		--link-doc=soapysdr0.7-module-xtrx
+		--link-doc=soapysdr0.8-module-xtrx
 	dh_installdocs --remaining-packages
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.7-module-xtrx.install libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.7-module-xtrx.install
--- libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.7-module-xtrx.install	2020-03-17 12:02:53.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.7-module-xtrx.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/lib/*/SoapySDR/modules0.7/*
diff -Nru libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.8-module-xtrx.install libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.8-module-xtrx.install
--- libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.8-module-xtrx.install	1970-01-01 00:00:00.000000000 +0000
+++ libxtrx-0.0.1+git20191219.98458ce/debian/soapysdr0.8-module-xtrx.install	2021-09-14 13:30:00.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/*/SoapySDR/modules0.8/*