pool/gnuradio
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 617106 from hardware:sdr

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/617106
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuradio?expand=0&rev=27
This commit is contained in:
Yuchen Lin 2018-06-19 10:03:13 +00:00 committed by Git OBS Bridge
commit ec14742936
5 changed files with 29 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
boost_161.patch
View File

@ -1,48 +0,0 @@
Index: gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_impl.cc
===================================================================
--- gnuradio-3.7.12.0.orig/gr-blocks/lib/message_strobe_impl.cc
+++ gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_impl.cc
@@ -91,7 +91,7 @@ namespace gr {
void message_strobe_impl::run()
{
while(!d_finished) {
- boost::this_thread::sleep(boost::posix_time::milliseconds(d_period_ms));
+ boost::this_thread::sleep(boost::posix_time::microseconds(static_cast<long>(d_period_ms * 1000)));
if(d_finished) {
return;
}
Index: gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc
===================================================================
--- gnuradio-3.7.12.0.orig/gr-uhd/lib/usrp_block_impl.cc
+++ gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc
@@ -196,7 +196,7 @@ bool usrp_block_impl::_wait_for_locked_s
while (true) {
if ((not first_lock_time.is_not_a_date_time()) and
- (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(LOCK_TIMEOUT)))) {
+ (boost::get_system_time() > (first_lock_time + boost::posix_time::milliseconds(static_cast<long>(1000*LOCK_TIMEOUT))))) {
break;
}
@@ -207,7 +207,7 @@ bool usrp_block_impl::_wait_for_locked_s
else {
first_lock_time = boost::system_time(); //reset to 'not a date time'
- if (boost::get_system_time() > (start + boost::posix_time::seconds(LOCK_TIMEOUT))){
+ if (boost::get_system_time() > (start + boost::posix_time::milliseconds(static_cast<long>(1000*LOCK_TIMEOUT)))){
return false;
}
}
Index: gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_random_impl.cc
===================================================================
--- gnuradio-3.7.12.0.orig/gr-blocks/lib/message_strobe_random_impl.cc
+++ gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_random_impl.cc
@@ -110,7 +110,7 @@ namespace gr {
void message_strobe_random_impl::run()
{
while(!d_finished) {
- boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay())));
+ boost::this_thread::sleep(boost::posix_time::microseconds(std::max(0L,static_cast<long>(next_delay()))));
if(d_finished) {
return;
}

3
gnuradio-3.7.12.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20bb08263fb934c3474b20bd55e58b9324782b5a18cdb3f7bb5150276fcb5ceb
size 4428450

3
gnuradio-3.7.13.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03fc4d63960e1ab1edb881f792f896a47b16e51a04b81abf00db0bd4e5bdb5c1
size 4430594

25
gnuradio.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Jun 15 08:50:15 UTC 2018 - mardnh@gmx.de
- Update to version 3.7.13.3
* For non-C++11 compilers, the new cstdint include doesn't work
out; conditionalized it.
- Remove patch:
* boost_161.patch (not longer needed)
-------------------------------------------------------------------
Fri Jun 1 22:10:16 UTC 2018 - mardnh@gmx.de
- Update to version 3.7.13.2
Fixed:
* boost::posix_time::[milli]second takes integer numbers, and we
now at least cast the floats to integers, as Boost 1.67 forced
us to realize we're (incorrectly) using floating point her
GRC:
* Fixed GRC bug which broke WX and Qt (by altering the template
code), in multiple (less than awesome) steps
gr-blocks:
* float_array_to_int: int32 limits were wrongly hardcoded.
* Fixed the undefined behaviour happening in float_to_complex when
accessing the second input_items element in the single-input case
-------------------------------------------------------------------
Tue May 29 09:56:10 UTC 2018 - adam.majer@suse.de

4
gnuradio.spec
View File

@ -20,7 +20,7 @@
%define sover_volk 1_4
%define volk_version 1.4
Name: gnuradio
Version: 3.7.12.0
Version: 3.7.13.3
Release: 0
Summary: GNU software radio
License: GPL-3.0-or-later
@ -31,7 +31,6 @@ Source1: https://github.com/gnuradio/volk/archive/v%{volk_version}.tar.gz
# http://www.nathanwest.us/grc_to_37.sh
Source2: grc_to_37.sh
Source99: %{name}-rpmlintrc
Patch1: boost_161.patch
Patch2: missing_library.patch
BuildRequires: alsa-devel
BuildRequires: boost-devel
@ -193,7 +192,6 @@ This package contains the examples of using GNU Radio depending on wxWidgets.
%prep
%setup -q
tar xzf %{SOURCE1} -C volk/ --strip-components=1
%patch1 -p1
%patch2 -p1
# remove buildtime from documentation
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in