Hello community, here is the log from the commit of package soapy-osmo for openSUSE:Factory checked in at 2019-11-10 22:41:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/soapy-osmo (Old) and /work/SRC/openSUSE:Factory/.soapy-osmo.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "soapy-osmo" Sun Nov 10 22:41:27 2019 rev:6 rq:744777 version:0.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/soapy-osmo/soapy-osmo.changes 2018-11-12 09:45:06.796856144 +0100 +++ /work/SRC/openSUSE:Factory/.soapy-osmo.new.2990/soapy-osmo.changes 2019-11-10 22:41:28.497404916 +0100 @@ -1,0 +2,9 @@ +Fri Nov 1 14:13:04 UTC 2019 - Stefan Brüns <[email protected]> + +- Disable RfSpace module (default with next upstream release), + deprecated in favor of the separate soapy-netsdr module. + Circumvents build/linking failures. + * Add soapy_osmosdr_rfspace_disable.patch +- Drop no longer required soap-osmo-fix-pthread-linking-issue.patch + +------------------------------------------------------------------- Old: ---- soap-osmo-fix-pthread-linking-issue.patch New: ---- soapy_osmosdr_rfspace_disable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soapy-osmo.spec ++++++ --- /var/tmp/diff_new_pack.7pTsqs/_old 2019-11-10 22:41:28.937405487 +0100 +++ /var/tmp/diff_new_pack.7pTsqs/_new 2019-11-10 22:41:28.941405492 +0100 @@ -1,7 +1,7 @@ # # spec file for package soapy-osmo # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -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/ # @@ -28,23 +28,20 @@ URL: https://github.com/pothosware/SoapyOsmo/wiki #Git-Clone: https://github.com/pothosware/SoapyOsmo.git Source: https://github.com/pothosware/SoapyOsmo/archive/%{name}-%{version}.tar.gz -Patch0: soap-osmo-fix-pthread-linking-issue.patch +# PATCH-FIX-UPSTREAM +Patch0: soapy_osmosdr_rfspace_disable.patch BuildRequires: cmake BuildRequires: freesrp-devel BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(SoapySDR) -BuildRequires: pkgconfig(libmirisdr) -BuildRequires: pkgconfig(libosmosdr) -%if 0%{?suse_version} > 1325 BuildRequires: libboost_atomic-devel BuildRequires: libboost_chrono-devel BuildRequires: libboost_date_time-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(SoapySDR) +BuildRequires: pkgconfig(libmirisdr) +BuildRequires: pkgconfig(libosmosdr) %description Soapy Osmo - Osmo SDR module @@ -83,14 +80,6 @@ Soapy OsmoSDR - OsmoSDR device support for Soapy SDR. A Soapy module that supports OsmoSDR devices within the Soapy API. -%package -n soapysdr%{soapy_modver}-module-rfspace -Summary: RFSpace osmosdr module -Group: System/Libraries - -%description -n soapysdr%{soapy_modver}-module-rfspace -Soapy RFSpace - RFSpace device support for Soapy SDR. -A Soapy module that supports RFSpace devices within the Soapy API. - %package -n soapysdr%{soapy_modver}-module-freesrp Summary: FreeSRP osmosdr module Group: System/Libraries @@ -131,11 +120,6 @@ %dir %{_libdir}/SoapySDR/modules%{soapy_modver} %{_libdir}/SoapySDR/modules%{soapy_modver}/libosmosdrSupport.so -%files -n soapysdr%{soapy_modver}-module-rfspace -%dir %{_libdir}/SoapySDR -%dir %{_libdir}/SoapySDR/modules%{soapy_modver} -%{_libdir}/SoapySDR/modules%{soapy_modver}/librfspaceSupport.so - %files -n soapysdr%{soapy_modver}-module-freesrp %dir %{_libdir}/SoapySDR %dir %{_libdir}/SoapySDR/modules%{soapy_modver} ++++++ soapy_osmosdr_rfspace_disable.patch ++++++ >From 7f55458cea166f7be1bc374ea881b654d071248f Mon Sep 17 00:00:00 2001 From: Josh Blum <[email protected]> Date: Sat, 1 Jun 2019 13:03:31 -0500 Subject: [PATCH] Disable SoapyOsmo rfspace by default in favor of SoapyNetSDR --- CMakeLists.txt | 6 +++++- Changelog.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0750edb..c114261 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,7 +379,11 @@ endif(ENABLE_BLADERF) ######################################################################## # Setup RFSPACE component ######################################################################## -GR_REGISTER_COMPONENT("RFSPACE Receivers" ENABLE_RFSPACE) + +#https://github.com/pothosware/SoapyNetSDR/wiki +option(USE_OSMO_RFSPACE "Use netsdr through SoapyNetSDR" OFF) + +GR_REGISTER_COMPONENT("RFSPACE Receivers" ENABLE_RFSPACE;USE_OSMO_RFSPACE) if(ENABLE_RFSPACE) GR_INCLUDE_SUBDIRECTORY(rfspace) endif(ENABLE_RFSPACE)
