diff -Nru srslte-18.06.1/debian/changelog srslte-18.06.1/debian/changelog --- srslte-18.06.1/debian/changelog 2018-12-03 18:21:47.000000000 +0000 +++ srslte-18.06.1/debian/changelog 2019-09-11 22:14:12.000000000 +0000 @@ -1,3 +1,12 @@ +srslte (18.06.1-8+rpi1) bullseye-staging; urgency=medium + + * Add patches to fix build with libbladerf2 and uhd 3.14 + * Bump build-dependencies on libbladerf-dev and libuhd-dev + because aforementioned patches will break build with + older versions. + + -- Peter Michael Green Wed, 11 Sep 2019 22:14:12 +0000 + srslte (18.06.1-8) unstable; urgency=medium * debian/rules: diff -Nru srslte-18.06.1/debian/control srslte-18.06.1/debian/control --- srslte-18.06.1/debian/control 2018-12-03 18:21:47.000000000 +0000 +++ srslte-18.06.1/debian/control 2019-09-11 22:14:12.000000000 +0000 @@ -10,11 +10,11 @@ libboost-program-options-dev, libconfig++-dev, libsctp-dev, - libuhd-dev, + libuhd-dev (>= 3.14), uhd-host, txt2man, libpcsclite-dev, - libbladerf-dev, + libbladerf-dev (>= 0.2019.07), libsoapysdr-dev Standards-Version: 4.2.1 Homepage: http://www.softwareradiosystems.com diff -Nru srslte-18.06.1/debian/patches/0008-Bladerf2.patch srslte-18.06.1/debian/patches/0008-Bladerf2.patch --- srslte-18.06.1/debian/patches/0008-Bladerf2.patch 1970-01-01 00:00:00.000000000 +0000 +++ srslte-18.06.1/debian/patches/0008-Bladerf2.patch 2019-09-11 22:14:01.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Fix build with bladerf 2 +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2019-09-11 + +--- srslte-18.06.1.orig/lib/src/phy/rf/rf_blade_imp.c ++++ srslte-18.06.1/lib/src/phy/rf/rf_blade_imp.c +@@ -360,7 +360,7 @@ srslte_rf_info_t *rf_blade_get_info(void + double rf_blade_set_rx_freq(void *h, double freq) + { + rf_blade_handler_t *handler = (rf_blade_handler_t*) h; +- uint32_t f_int = (uint32_t) round(freq); ++ bladerf_frequency f_int = (uint32_t) round(freq); + int status = bladerf_set_frequency(handler->dev, BLADERF_MODULE_RX, f_int); + if (status != 0) { + fprintf(stderr, "Failed to set samplerate = %u: %s\n", +@@ -377,7 +377,7 @@ double rf_blade_set_rx_freq(void *h, dou + double rf_blade_set_tx_freq(void *h, double freq) + { + rf_blade_handler_t *handler = (rf_blade_handler_t*) h; +- uint32_t f_int = (uint32_t) round(freq); ++ bladerf_frequency f_int = (uint32_t) round(freq); + int status = bladerf_set_frequency(handler->dev, BLADERF_MODULE_TX, f_int); + if (status != 0) { + fprintf(stderr, "Failed to set samplerate = %u: %s\n", diff -Nru srslte-18.06.1/debian/patches/0009-uhd-3.14.patch srslte-18.06.1/debian/patches/0009-uhd-3.14.patch --- srslte-18.06.1/debian/patches/0009-uhd-3.14.patch 1970-01-01 00:00:00.000000000 +0000 +++ srslte-18.06.1/debian/patches/0009-uhd-3.14.patch 2019-09-11 22:14:12.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Fix build with uhd 3.14 +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2019-09-12 + +--- srslte-18.06.1.orig/lib/src/phy/rf/rf_uhd_imp.c ++++ srslte-18.06.1/lib/src/phy/rf/rf_uhd_imp.c +@@ -647,7 +647,7 @@ double rf_uhd_set_rx_srate(void *h, doub + { + rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h; + if (handler->nof_rx_channels > 1) { +- time_t full; ++ int64_t full; + double frac; + uhd_usrp_get_time_now(handler->usrp, 0, &full, &frac); + frac += 0.100; +@@ -666,7 +666,7 @@ double rf_uhd_set_tx_srate(void *h, doub + { + rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h; + if (handler->nof_tx_channels > 1) { +- time_t full; ++ int64_t full; + double frac; + uhd_usrp_get_time_now(handler->usrp, 0, &full, &frac); + frac += 0.100; +@@ -759,7 +759,9 @@ double rf_uhd_set_tx_freq(void *h, doubl + + void rf_uhd_get_time(void *h, time_t *secs, double *frac_secs) { + rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h; +- uhd_usrp_get_time_now(handler->usrp, 0, secs, frac_secs); ++ uint64_t secs64; ++ uhd_usrp_get_time_now(handler->usrp, 0, &secs64, frac_secs); ++ *secs = secs64; + } + + int rf_uhd_recv_with_time(void *h, +@@ -831,7 +833,9 @@ int rf_uhd_recv_with_time_multi(void *h, + } + } + if (secs && frac_secs) { +- uhd_rx_metadata_time_spec(handler->rx_md_first, secs, frac_secs); ++ uint64_t secs64; ++ uhd_rx_metadata_time_spec(handler->rx_md_first, &secs64, frac_secs); ++ *secs = secs64; + } + return nsamples; + } diff -Nru srslte-18.06.1/debian/patches/series srslte-18.06.1/debian/patches/series --- srslte-18.06.1/debian/patches/series 2018-12-03 18:21:47.000000000 +0000 +++ srslte-18.06.1/debian/patches/series 2019-09-11 22:14:12.000000000 +0000 @@ -5,3 +5,5 @@ 0005-Check-whether-code-compiles-instead-of-whether-it-ru.patch 0006-No-native-in-build.patch 0007-Option-for-disabling-NEON-on-arm.patch +0008-Bladerf2.patch +0009-uhd-3.14.patch