From 0a82f7f761a89a67c50b986442552cbc3c6441db0e3d4c48fb431878e20f7144 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 7 Sep 2018 08:34:17 +0000 Subject: [PATCH 1/2] Accepting request 633523 from home:mnhauke:sdr-devel - Update to version 2018.08 libbladeRF * Added support for Automatic Gain Control * Added bladeRF.conf config option file * Refactor to support for multiple product lines * Add support for the bladeRF Micro product * API: replace bladerf_module with bladerf_channel, a reverse-compatible * change to handle products with multiple independent RF paths in the same * direction * API: BREAKING CHANGE - on bladerf_set_frequency, et al, the frequency * parameter is now uint64_t instead of unsigned int * Add typedefs for common param types, e.g. bladerf_frequency -> uint64_t bladeRF-cli * Added support for Automatic Gain Control * No longer initializes the bladeRF before loading a new FPGA image, to * avoid potential catch-22 problems * bladeRF 2.0 Micro support * Support for MIMO RX and TX using "channel=" parameter on rx/tx config * Various code quality fixups - Remove patches: (fixed upstream) * bladeRF-add-cflag-Wno-format-truncation.patch * bladeRF-cmake_syntax.patch OBS-URL: https://build.opensuse.org/request/show/633523 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=20 --- bladeRF-2016.06.tar.xz | 3 -- bladeRF-2018.08.tar.xz | 3 ++ bladeRF-add-cflag-Wno-format-truncation.patch | 12 -------- bladeRF-cmake_syntax.patch | 19 ------------- bladeRF.changes | 28 +++++++++++++++++++ bladeRF.spec | 22 +++++++-------- 6 files changed, 41 insertions(+), 46 deletions(-) delete mode 100644 bladeRF-2016.06.tar.xz create mode 100644 bladeRF-2018.08.tar.xz delete mode 100644 bladeRF-add-cflag-Wno-format-truncation.patch delete mode 100644 bladeRF-cmake_syntax.patch diff --git a/bladeRF-2016.06.tar.xz b/bladeRF-2016.06.tar.xz deleted file mode 100644 index 1e127e0..0000000 --- a/bladeRF-2016.06.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e6333fd0f17e85f968a6180942f889705c4f2ac16507b2f86c80630c55032e8 -size 1654784 diff --git a/bladeRF-2018.08.tar.xz b/bladeRF-2018.08.tar.xz new file mode 100644 index 0000000..d24cc84 --- /dev/null +++ b/bladeRF-2018.08.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6288c230dad26e32236a4b60f0b14c129e6fa0ad91bcf1c40abe8789b352e51f +size 2177625 diff --git a/bladeRF-add-cflag-Wno-format-truncation.patch b/bladeRF-add-cflag-Wno-format-truncation.patch deleted file mode 100644 index d168e6c..0000000 --- a/bladeRF-add-cflag-Wno-format-truncation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt -index 848b62d..70a5ca3 100644 ---- a/host/CMakeLists.txt -+++ b/host/CMakeLists.txt -@@ -91,6 +91,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - add_definitions(-Wall) - add_definitions(-Wextra) - add_definitions(-Wno-unused-parameter) -+ add_definitions(-Wno-format-truncation) - - if(TREAT_WARNINGS_AS_ERRORS) - add_definitions(-Werror) diff --git a/bladeRF-cmake_syntax.patch b/bladeRF-cmake_syntax.patch deleted file mode 100644 index ec3cd3a..0000000 --- a/bladeRF-cmake_syntax.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 037e2886f2bfee42af99d77581d3cf9a23c64227 Mon Sep 17 00:00:00 2001 -From: Rey Tucker -Date: Tue, 1 Aug 2017 15:29:56 -0400 -Subject: [PATCH] udev: fix CMakeLists syntax error (#509) - ---- - host/misc/udev/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/host/misc/udev/CMakeLists.txt b/host/misc/udev/CMakeLists.txt -index 317fec4b9..2e25e289a 100644 ---- a/host/misc/udev/CMakeLists.txt -+++ b/host/misc/udev/CMakeLists.txt -@@ -41,5 +41,4 @@ else() - if(INSTALL_UDEV_RULES) - message(STATUS "udev rules not supported on this platform. Hide this message via -DINSTALL_UDEV_RULES=Off") - endif(INSTALL_UDEV_RULES) --else() - endif() diff --git a/bladeRF.changes b/bladeRF.changes index 4a824c4..08a804b 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Sep 5 19:10:47 UTC 2018 - mardnh@gmx.de + +- Update to version 2018.08 + libbladeRF + * Added support for Automatic Gain Control + * Added bladeRF.conf config option file + * Refactor to support for multiple product lines + * Add support for the bladeRF Micro product + * API: replace bladerf_module with bladerf_channel, a reverse-compatible + * change to handle products with multiple independent RF paths in the same + * direction + * API: BREAKING CHANGE - on bladerf_set_frequency, et al, the frequency + * parameter is now uint64_t instead of unsigned int + * Add typedefs for common param types, e.g. bladerf_frequency -> uint64_t + bladeRF-cli + + * Added support for Automatic Gain Control + * No longer initializes the bladeRF before loading a new FPGA image, to + * avoid potential catch-22 problems + * bladeRF 2.0 Micro support + * Support for MIMO RX and TX using "channel=" parameter on rx/tx config + * Various code quality fixups + +- Remove patches: (fixed upstream) + * bladeRF-add-cflag-Wno-format-truncation.patch + * bladeRF-cmake_syntax.patch + ------------------------------------------------------------------- Tue Sep 5 08:36:54 UTC 2017 - mpluskal@suse.com diff --git a/bladeRF.spec b/bladeRF.spec index 2fa2e9d..d0f758c 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -1,7 +1,7 @@ # # spec file for package bladeRF # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013-2015 Wojciech Kazubski, wk@ire.pw.edu.pl # # All modifications and additions to the file contributed by third parties @@ -17,24 +17,21 @@ # -%define sover 1 +%define sover 2 %define libname lib%{name}%{sover} -%define release_name 2016.06 +%define libversion 2.0.2 +%define release_name 2018.08 %define bladerf_group bladerf %define use_syslog 0 Name: bladeRF Version: 1.4.0 Release: 0 Summary: SDR radio receiver -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Hamradio/Other Url: http://nuand.com/ #Git-Clone: https://github.com/Nuand/bladeRF.git Source: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz -# PATCH-FIX-OPENSUSE bladeRF-add-cflag-Wno-format-truncation.patch boo#1041192 -Patch0: bladeRF-add-cflag-Wno-format-truncation.patch -# PATCH-FIX-UPSTREAM bladeRF-cmake_syntax.patch upstream commit 037e288 -Patch1: bladeRF-cmake_syntax.patch BuildRequires: cmake >= 2.8.4 BuildRequires: doxygen BuildRequires: fdupes @@ -50,7 +47,7 @@ BuildRequires: pkgconfig(udev) The software for bladeRF USB 3.0 Superspeed Software Defined Radio. %package -n %{libname} -Version: 1.7.2 +Version: %{libversion} Release: 0 Summary: Library for bladeRF Group: System/Libraries @@ -70,7 +67,7 @@ Udev rules for bladeRF %package devel Summary: Development files for libbladeRF Group: Development/Libraries/Other -Requires: %{libname} = %{version} +Requires: %{libname} = %{libversion} %description devel Libraries and header files for developing applications that want to make @@ -78,8 +75,6 @@ use of libbladerf. %prep %setup -q -n %{name}-%{release_name} -%patch0 -p1 -%patch1 -p1 %build cd host @@ -113,6 +108,7 @@ getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %files %doc README.md COPYING CONTRIBUTORS %{_bindir}/bladeRF-cli +%{_bindir}/bladeRF-fsk %{_mandir}/man1/bladeRF-cli.1%{ext_man} %files udev @@ -123,6 +119,8 @@ getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %files devel %{_libdir}/libbladeRF.so +%{_includedir}/bladeRF1.h +%{_includedir}/bladeRF2.h %{_includedir}/libbladeRF.h %{_libdir}/pkgconfig/libbladeRF.pc From bafd2eb0bea7a3321b44c16a3a5ace139abc9cd2f1224ba028a4cb2faa2412ca Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 7 Sep 2018 12:05:41 +0000 Subject: [PATCH 2/2] - Clarify license status OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=21 --- bladeRF.changes | 5 +++++ bladeRF.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index 08a804b..9d18151 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 7 12:05:23 UTC 2018 - Martin Pluskal + +- Clarify license status + ------------------------------------------------------------------- Wed Sep 5 19:10:47 UTC 2018 - mardnh@gmx.de diff --git a/bladeRF.spec b/bladeRF.spec index d0f758c..13ceca2 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,9 +27,9 @@ Name: bladeRF Version: 1.4.0 Release: 0 Summary: SDR radio receiver -License: GPL-2.0-only +License: GPL-2.0-only AND AGPL-3.0-or-later Group: Productivity/Hamradio/Other -Url: http://nuand.com/ +URL: http://nuand.com/ #Git-Clone: https://github.com/Nuand/bladeRF.git Source: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz BuildRequires: cmake >= 2.8.4 @@ -106,10 +106,11 @@ getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %udev_rules_update %files -%doc README.md COPYING CONTRIBUTORS +%license COPYING +%doc README.md CONTRIBUTORS %{_bindir}/bladeRF-cli %{_bindir}/bladeRF-fsk -%{_mandir}/man1/bladeRF-cli.1%{ext_man} +%{_mandir}/man1/bladeRF-cli.1%{?ext_man} %files udev %{_udevrulesdir}/88-nuand.rules