diff --git a/0001-libbladeRF-unambiguous-flash_arch-macro-name.patch b/0001-libbladeRF-unambiguous-flash_arch-macro-name.patch deleted file mode 100644 index 6833a9a..0000000 --- a/0001-libbladeRF-unambiguous-flash_arch-macro-name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 163425d48a3b7d8c100d7295220d3648c050d0dd Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Mon, 25 May 2020 21:36:44 -0500 -Subject: [PATCH 1/2] libbladeRF: unambiguous flash_arch macro name - ---- - host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c | 2 +- - host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 2 +- - host/libraries/libbladeRF/src/board/board.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c -index cd4c18b9..3dcc74ba 100644 ---- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c -+++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c -@@ -838,7 +838,7 @@ static int bladerf1_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) - board_data->module_format[BLADERF_RX] = -1; - board_data->module_format[BLADERF_TX] = -1; - -- dev->flash_arch->status = STATE_UNINITIALIZED; -+ dev->flash_arch->status = STATUS_FLASH_UNINITIALIZED; - dev->flash_arch->manufacturer_id = 0x0; - dev->flash_arch->device_id = 0x0; - -diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c -index 5e1367c0..9d82aa17 100644 ---- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c -+++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c -@@ -280,7 +280,7 @@ static int bladerf2_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) - board_data->module_format[BLADERF_RX] = -1; - board_data->module_format[BLADERF_TX] = -1; - -- dev->flash_arch->status = STATE_UNINITIALIZED; -+ dev->flash_arch->status = STATUS_FLASH_UNINITIALIZED; - dev->flash_arch->manufacturer_id = 0x0; - dev->flash_arch->device_id = 0x0; - -diff --git a/host/libraries/libbladeRF/src/board/board.h b/host/libraries/libbladeRF/src/board/board.h -index db8128c3..66873069 100644 ---- a/host/libraries/libbladeRF/src/board/board.h -+++ b/host/libraries/libbladeRF/src/board/board.h -@@ -446,7 +446,7 @@ struct board_fns { - - /* Information about the (SPI) flash architecture */ - struct bladerf_flash_arch { -- enum { STATUS_UNINITIALIZED, STATUS_SUCCESS, STATUS_ASSUMED } status; -+ enum { STATUS_FLASH_UNINITIALIZED, STATUS_SUCCESS, STATUS_ASSUMED } status; - - uint8_t manufacturer_id; /**< Raw manufacturer ID */ - uint8_t device_id; /**< Raw device ID */ --- -2.26.2 - diff --git a/0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch b/0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch deleted file mode 100644 index 68742cb..0000000 --- a/0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Mon, 25 May 2020 21:36:50 -0500 -Subject: [PATCH 2/2] libbladeRF: define bladerf2_state_to_string as extern in - header - ---- - host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h -index 23187ba6..efbebc86 100644 ---- a/host/libraries/libbladeRF/src/board/bladerf2/common.h -+++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h -@@ -207,7 +207,7 @@ extern const float ina219_r_shunt; - /* Constants */ - /******************************************************************************/ - --char const *bladerf2_state_to_string[4]; -+extern char const *bladerf2_state_to_string[4]; - - - /******************************************************************************/ --- -2.26.2 - diff --git a/bladeRF-2019.07.tar.xz b/bladeRF-2019.07.tar.xz deleted file mode 100644 index 5e6aa3e..0000000 --- a/bladeRF-2019.07.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7fb499a444429b9ef3250676f60b7d0d867933a16688d1676234d9d4fca26c2 -size 2198924 diff --git a/bladeRF-2020.12.tar.xz b/bladeRF-2020.12.tar.xz new file mode 100644 index 0000000..79b1376 --- /dev/null +++ b/bladeRF-2020.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:747cdc9c8ad0ddafd62c18e6d6a7c1a687ea00373177239f12bf1a25409229c2 +size 2261832 diff --git a/bladeRF.changes b/bladeRF.changes index d9b0bf4..5c10d1c 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jan 15 16:24:05 UTC 2021 - Martin Hauke + +- Update to version 2020.12 + libbladeRF + * Added packet mode format BLADERF_FORMAT_PACKET_META. + libbladeRF is able to exchange variable length packets with + the HDL if packet mode is enabled + * Added RFIC parameters for burst waveforms + * Ability to query backend for handle and lock FX3 + * Variable length packet support for PACKET_META mode + bladeRF-cli: + * Indicate presence of packet cores in FPGA + Python + * Update for libbladeRF v2.4.0 +- Drop patches (integrated upstream): + * 0001-libbladeRF-unambiguous-flash_arch-macro-name.patch + * 0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch + ------------------------------------------------------------------- Sun Jun 7 20:25:19 UTC 2020 - Martin Hauke diff --git a/bladeRF.spec b/bladeRF.spec index 802e946..7f83bd2 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -1,7 +1,7 @@ # # spec file for package bladeRF # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2013-2015 Wojciech Kazubski, wk@ire.pw.edu.pl # # All modifications and additions to the file contributed by third parties @@ -20,11 +20,11 @@ %define sover 2 %define libname lib%{name}%{sover} %define libversion 2.2.1 -%define release_name 2019.07 +%define release_name 2020.12 %define bladerf_group bladerf %define use_syslog 0 Name: bladeRF -Version: 1.8.0 +Version: 2020.12 Release: 0 Summary: SDR radio receiver License: GPL-2.0-only AND AGPL-3.0-or-later @@ -33,8 +33,6 @@ URL: https://nuand.com/ #Git-Clone: https://github.com/Nuand/bladeRF.git Source0: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz Source1: ad9361.tar.xz -Patch0: 0001-libbladeRF-unambiguous-flash_arch-macro-name.patch -Patch1: 0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch BuildRequires: cmake >= 2.8.4 BuildRequires: doxygen BuildRequires: fdupes @@ -88,8 +86,6 @@ use of libbladerf. %prep %setup -q -n %{name}-%{release_name} -%patch0 -p1 -%patch1 -p1 ls pushd thirdparty/analogdevicesinc/no-OS tar -xJf %{SOURCE1} @@ -137,7 +133,7 @@ getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %{_udevrulesdir}/88-nuand-*.rules %files -n %{libname} -%{_libdir}/libbladeRF.so.* +%{_libdir}/libbladeRF.so.%{sover}* %files -n %{libname}-doc %{_docdir}/libbladeRF