diff -Nru hacktv-0+git20201203/debian/changelog hacktv-0+git20201203/debian/changelog --- hacktv-0+git20201203/debian/changelog 2020-12-03 08:25:21.000000000 +0000 +++ hacktv-0+git20201203/debian/changelog 2021-09-14 13:16:27.000000000 +0000 @@ -1,3 +1,10 @@ +hacktv (0+git20201203-1+rpi1) bookworm-staging; urgency=medium + + * Apply upstream patch to fix build with soapysdr 0.8 + (Closes: 993698) + + -- Peter Michael Green Tue, 14 Sep 2021 13:16:27 +0000 + hacktv (0+git20201203-1) unstable; urgency=medium * New upstream version. diff -Nru hacktv-0+git20201203/debian/patches/series hacktv-0+git20201203/debian/patches/series --- hacktv-0+git20201203/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ hacktv-0+git20201203/debian/patches/series 2021-09-14 13:15:07.000000000 +0000 @@ -0,0 +1 @@ +soapysdr-0.8.patch diff -Nru hacktv-0+git20201203/debian/patches/soapysdr-0.8.patch hacktv-0+git20201203/debian/patches/soapysdr-0.8.patch --- hacktv-0+git20201203/debian/patches/soapysdr-0.8.patch 1970-01-01 00:00:00.000000000 +0000 +++ hacktv-0+git20201203/debian/patches/soapysdr-0.8.patch 2021-09-14 13:14:43.000000000 +0000 @@ -0,0 +1,31 @@ +commit b104d5361604c557543eb54d6e89a08b4735d609 +Author: Philip Heron +Date: Mon Sep 13 20:09:42 2021 +0100 + + Fix error building with soapysdr-0.8+ + +diff --git a/soapysdr.c b/soapysdr.c +index 2f759dc..956aa3e 100644 +--- a/soapysdr.c ++++ b/soapysdr.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include "hacktv.h" + + typedef struct { +@@ -132,7 +133,12 @@ int rf_soapysdr_open(hacktv_t *s, const char *device, unsigned int frequency_hz, + return(HACKTV_ERROR); + } + ++#if defined(SOAPY_SDR_API_VERSION) && (SOAPY_SDR_API_VERSION >= 0x00080000) ++ rf->s = SoapySDRDevice_setupStream(rf->d, SOAPY_SDR_TX, "CS16", NULL, 0, NULL); ++ if(rf->s == NULL) ++#else + if(SoapySDRDevice_setupStream(rf->d, &rf->s, SOAPY_SDR_TX, SOAPY_SDR_CS16, NULL, 0, NULL) != 0) ++#endif + { + fprintf(stderr, "SoapySDRDevice_setupStream() failed: %s\n", SoapySDRDevice_lastError()); + free(rf);