Hello community, here is the log from the commit of package bladeRF for openSUSE:Factory checked in at 2020-06-09 00:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bladeRF (Old) and /work/SRC/openSUSE:Factory/.bladeRF.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bladeRF" Tue Jun 9 00:04:33 2020 rev:9 rq:812421 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/bladeRF/bladeRF.changes 2020-01-18 12:19:09.075171733 +0100 +++ /work/SRC/openSUSE:Factory/.bladeRF.new.3606/bladeRF.changes 2020-06-09 00:06:01.621580759 +0200 @@ -1,0 +2,7 @@ +Sun Jun 7 20:25:19 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Add patches to fix gcc10 compile errors: + * 0001-libbladeRF-unambiguous-flash_arch-macro-name.patch + * 0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch + +------------------------------------------------------------------- New: ---- 0001-libbladeRF-unambiguous-flash_arch-macro-name.patch 0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bladeRF.spec ++++++ --- /var/tmp/diff_new_pack.ecprJV/_old 2020-06-09 00:06:02.377583441 +0200 +++ /var/tmp/diff_new_pack.ecprJV/_new 2020-06-09 00:06:02.381583455 +0200 @@ -1,7 +1,7 @@ # # spec file for package bladeRF # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013-2015 Wojciech Kazubski, w...@ire.pw.edu.pl # # All modifications and additions to the file contributed by third parties @@ -33,6 +33,8 @@ #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 @@ -86,6 +88,8 @@ %prep %setup -q -n %{name}-%{release_name} +%patch0 -p1 +%patch1 -p1 ls pushd thirdparty/analogdevicesinc/no-OS tar -xJf %{SOURCE1} ++++++ 0001-libbladeRF-unambiguous-flash_arch-macro-name.patch ++++++ >From 163425d48a3b7d8c100d7295220d3648c050d0dd Mon Sep 17 00:00:00 2001 From: Robert Ghilduta <robert.ghild...@nuand.com> 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 ++++++ 0002-libbladeRF-define-bladerf2_state_to_string-as-extern.patch ++++++ >From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001 From: Robert Ghilduta <robert.ghild...@nuand.com> 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
