commit gnuradio for openSUSE:Factory

Hello community, here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2018-06-19 12:03:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuradio (Old) and /work/SRC/openSUSE:Factory/.gnuradio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuradio" Tue Jun 19 12:03:13 2018 rev:27 rq:617106 version:3.7.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2018-06-02 12:09:16.026330318 +0200 +++ /work/SRC/openSUSE:Factory/.gnuradio.new/gnuradio.changes 2018-06-19 12:03:16.362902539 +0200 @@ -1,0 +2,25 @@ +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 + +------------------------------------------------------------------- Old: ---- boost_161.patch gnuradio-3.7.12.0.tar.gz New: ---- gnuradio-3.7.13.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuradio.spec ++++++ --- /var/tmp/diff_new_pack.gXxNiW/_old 2018-06-19 12:03:17.186871945 +0200 +++ /var/tmp/diff_new_pack.gXxNiW/_new 2018-06-19 12:03:17.190871797 +0200 @@ -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 @@ # 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 @@ %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 ++++++ gnuradio-3.7.12.0.tar.gz -> gnuradio-3.7.13.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/CHANGELOG.md new/gnuradio-3.7.13.3/CHANGELOG.md --- old/gnuradio-3.7.12.0/CHANGELOG.md 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/CHANGELOG.md 2018-06-13 23:29:49.000000000 +0200 @@ -6,6 +6,36 @@ Older Logs can be found in `docs/RELEASE-NOTES-*`. +## [3.7.13.3] - 2018-06-13 + +### Fixed +#### Project Scope +- For non-C++11 compilers, the new cstdint include doesn't work out; conditionalized it. + +## [3.7.13.2] - 2018-05-31 + +### Fixed +#### Project Scope +- Actually bumped version in CMakeLists.txt to 3.7.13.2; the 3.7.13.1 tag was tagged off-branch; maintainer failure to simultaneously push a commit that raises the internal version number to 3.7.14.0: this had to be reverted ASAP. + +## [3.7.13.1] - 2018-05-31 + +### Fixed +#### Project Scope +- Actually bumped version in CMakeLists.txt + +## [3.7.13.0] - 2018-05-31 + +### Fixed +#### Project Scope +- `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 +- CMake: using regex to match compiler against "Clang" now enables correct build on OS X +#### 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 + ## [3.7.12.0] - 2018-04-01 ### Software Engineering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/CMakeLists.txt new/gnuradio-3.7.13.3/CMakeLists.txt --- old/gnuradio-3.7.12.0/CMakeLists.txt 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/CMakeLists.txt 2018-06-13 23:29:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Free Software Foundation, Inc. +# Copyright 2010-2018 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,8 +48,8 @@ # Set the version information here set(VERSION_INFO_MAJOR_VERSION 3) set(VERSION_INFO_API_COMPAT 7) -set(VERSION_INFO_MINOR_VERSION 12) -set(VERSION_INFO_MAINT_VERSION 0) +set(VERSION_INFO_MINOR_VERSION 13) +set(VERSION_INFO_MAINT_VERSION 3) include(GrVersion) #setup version info # Minimum dependency versions for central dependencies: @@ -100,7 +100,7 @@ ELSE() MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build GNU Radio (GCC : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using GCC version ${GCC_MIN_VERSION} or more recent.") ENDIF() -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -v RESULT_VARIABLE _res ERROR_VARIABLE _err @@ -137,7 +137,7 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") SET(CMAKE_CXX_STANDARD 98) -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET(CMAKE_CXX_STANDARD 98) ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") SET(CMAKE_CXX_STANDARD 98) @@ -147,7 +147,7 @@ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") -ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang") +ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/gr-blocks/lib/float_array_to_int.cc new/gnuradio-3.7.13.3/gr-blocks/lib/float_array_to_int.cc --- old/gnuradio-3.7.12.0/gr-blocks/lib/float_array_to_int.cc 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/gr-blocks/lib/float_array_to_int.cc 2018-06-13 23:29:49.000000000 +0200 @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2011-2012 Free Software Foundation, Inc. + * Copyright 2011-2018 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,10 +27,14 @@ #define _ISOC9X_SOURCE #include #include +#if __cplusplus >= 201103L +#include <cstdint> +#else #include +#endif -static const int64_t MAX_INT = 2147483647; // (2^31)-1 -static const int64_t MIN_INT = -2147483647; // -(2^31)-1 +static const int64_t MAX_INT = INT32_MAX; +static const int64_t MIN_INT = INT32_MIN; void float_array_to_int(const float *in, int *out, float scale, int nsamples) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/gr-blocks/lib/float_to_complex_impl.cc new/gnuradio-3.7.13.3/gr-blocks/lib/float_to_complex_impl.cc --- old/gnuradio-3.7.12.0/gr-blocks/lib/float_to_complex_impl.cc 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/gr-blocks/lib/float_to_complex_impl.cc 2018-06-13 23:29:49.000000000 +0200 @@ -54,8 +54,7 @@ gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - float *r = (float *)input_items[0]; - float *i = (float *)input_items[1]; + float *r = (float *) input_items[0]; gr_complex *out = (gr_complex *) output_items[0]; switch (input_items.size ()){ @@ -65,10 +64,13 @@ break; case 2: + { //for (size_t j = 0; j < noutput_items*d_vlen; j++) // out[j] = gr_complex (r[j], i[j]); + float *i = (float *) input_items[1]; volk_32f_x2_interleave_32fc(out, r, i, noutput_items*d_vlen); break; + } default: assert (0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_impl.cc new/gnuradio-3.7.13.3/gr-blocks/lib/message_strobe_impl.cc --- old/gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_impl.cc 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/gr-blocks/lib/message_strobe_impl.cc 2018-06-13 23:29:49.000000000 +0200 @@ -91,7 +91,7 @@ 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::milliseconds(static_cast<long>(d_period_ms))); if(d_finished) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_random_impl.cc new/gnuradio-3.7.13.3/gr-blocks/lib/message_strobe_random_impl.cc --- old/gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_random_impl.cc 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/gr-blocks/lib/message_strobe_random_impl.cc 2018-06-13 23:29:49.000000000 +0200 @@ -110,7 +110,7 @@ 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::milliseconds(static_cast<long>(std::max(0.0f,next_delay())))); if(d_finished) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc new/gnuradio-3.7.13.3/gr-uhd/lib/usrp_block_impl.cc --- old/gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/gr-uhd/lib/usrp_block_impl.cc 2018-06-13 23:29:49.000000000 +0200 @@ -196,7 +196,7 @@ 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::seconds(static_cast<long>(LOCK_TIMEOUT))))) { break; } @@ -207,7 +207,7 @@ 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::seconds(static_cast<long>(LOCK_TIMEOUT)))){ return false; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/grc/core/Param.py new/gnuradio-3.7.13.3/grc/core/Param.py --- old/gnuradio-3.7.12.0/grc/core/Param.py 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/grc/core/Param.py 2018-06-13 23:29:49.000000000 +0200 @@ -76,6 +76,17 @@ return str(num) +class CallableString(str): + """A string that perform old-style formatting when called + + Used as an adaptor for templates with gui_hint params + ToDo: remove this in the YAML/Mako format + """ + + def __call__(self, *args): + return self % args + + class Option(Element): def __init__(self, param, n): @@ -533,14 +544,15 @@ # GUI Position/Hint ######################### elif t == 'gui_hint': - if (self.get_parent().get_state() == Constants.BLOCK_DISABLED): + if self.get_parent().get_state() == Constants.BLOCK_DISABLED: return '' else: - return self.parse_gui_hint(v) + return CallableString(self.parse_gui_hint(v)) ######################### # Grid Position Type ######################### elif t == 'grid_pos': + self.hostage_cells.clear() if not v: # Allow for empty grid pos return '' @@ -560,15 +572,18 @@ except: my_parent = '' # Calculate hostage cells - for r in range(row_span): - for c in range(col_span): - self.hostage_cells.append((my_parent, (row + r, col + c))) - # Avoid collisions - params = filter(lambda p: p is not self, self.get_all_params('grid_pos')) - for param in params: - for parent, cell in param._hostage_cells: - if (parent, cell) in self.hostage_cells: - raise Exception('Another graphical element is using parent "{0}", cell "{1}".'.format(str(parent), str(cell))) + for r in range(row, row + row_span): + for c in range(col, col + col_span): + self.hostage_cells.add((my_parent, (r, c))) + + for other in self.get_all_params('grid_pos'): + if other is self: + continue + collision = next(iter(self.hostage_cells & other.hostage_cells), None) + if collision: + raise Exception('Block {block!r} is also using parent {parent!r}, cell {cell!r}.'.format( + block=other.get_parent().get_id(), parent=collision[0] or 'main', cell=collision[1] + )) return e ######################### # Notebook Page Type @@ -813,7 +828,7 @@ else: layout = 'top_grid_layout' - widget = '%s' # to be fill-out in the mail template + widget = '%s' # to be fill-out in the main template if pos: row, col, row_span, col_span = parse_pos() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnuradio-3.7.12.0/grc/gui/Param.py new/gnuradio-3.7.13.3/grc/gui/Param.py --- old/gnuradio-3.7.12.0/grc/gui/Param.py 2018-03-30 22:43:44.000000000 +0200 +++ new/gnuradio-3.7.13.3/grc/gui/Param.py 2018-06-13 23:29:49.000000000 +0200 @@ -368,9 +368,9 @@ TIP_MARKUP_TMPL="""\ ######################################## -#def truncate(string) +#def truncate(value) #set $max_len = 100 - #set $string = str($string) + #set $string = str(value) #if len($string) > $max_len $('%s...%s'%($string[:$max_len/2], $string[-$max_len/2:]))#slurp #else