Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2018-05-30 12:23:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uhd" Wed May 30 12:23:42 2018 rev:23 rq:612905 version:3.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2018-01-17 21:59:17.112474767 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new/uhd.changes 2018-05-30 12:41:42.731582036 +0200 @@ -1,0 +2,8 @@ +Tue May 29 11:03:42 UTC 2018 - adam.ma...@suse.de + +- fixed build with Boost 1.67 (bsc#1089820) + uhd-fix-for-boost-1_67.patch +- drop _constraints and use memory-constraints package instead. +- re-enabled package tests + +------------------------------------------------------------------- Old: ---- _constraints New: ---- uhd-fix-for-boost-1_67.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.7sJjyF/_old 2018-05-30 12:41:44.451521948 +0200 +++ /var/tmp/diff_new_pack.7sJjyF/_new 2018-05-30 12:41:44.455521809 +0200 @@ -23,7 +23,7 @@ %define src_ver 003.009.007 %define img_ver 003.009.007 Summary: The driver for USRP SDR boards -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Hardware/Other Url: http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki Source0: http://files.ettus.com/binaries/uhd_stable/uhd_%{src_ver}-release/uhd_%{version}-release.tar.gz @@ -32,6 +32,7 @@ Patch0: fix-for-armv6l-armv7l-build-failure.patch # PATCH-FIX-OPENSUSE uhd-fix-for-boost-1_66.patch Patch1: uhd-fix-for-boost-1_66.patch +Patch2: uhd-fix-for-boost-1_67.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel @@ -50,6 +51,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gpsd-devel +BuildRequires: memory-constraints BuildRequires: orc BuildRequires: pkg-config BuildRequires: python-Mako >= 0.4 @@ -138,21 +140,21 @@ %setup -q -n %{name}_%{version}-release %patch0 -p1 %patch1 -p1 +%patch2 -p1 # remove buildtime from documentation echo "HTML_TIMESTAMP = NO" >> docs/Doxyfile.in %build touch ../README.md +%limit_build %cmake \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DENABLE_GPSD=1 -make VERBOSE=1 %{?_smp_mflags} +%make_jobs %check -# Disable tests due to failure of convert_test on openSUSE 13.1 -#cd build -#make VERBOSE=1 test +%ctest %install %cmake_install ++++++ uhd-fix-for-boost-1_67.patch ++++++ Index: uhd_3.9.7-release/lib/usrp/x300/x300_impl.cpp =================================================================== --- uhd_3.9.7-release.orig/lib/usrp/x300/x300_impl.cpp +++ uhd_3.9.7-release/lib/usrp/x300/x300_impl.cpp @@ -1486,7 +1486,7 @@ void x300_impl::sync_times(mboard_member bool x300_impl::wait_for_clk_locked(mboard_members_t& mb, boost::uint32_t which, double timeout) { - boost::system_time timeout_time = boost::get_system_time() + boost::posix_time::milliseconds(timeout * 1000.0); + boost::system_time timeout_time = boost::get_system_time() + boost::posix_time::milliseconds(static_cast<long>(timeout * 1000)); do { if (mb.fw_regmap->clock_status_reg.read(which)==1) return true; Index: uhd_3.9.7-release/examples/benchmark_rate.cpp =================================================================== --- uhd_3.9.7-release.orig/examples/benchmark_rate.cpp +++ uhd_3.9.7-release/examples/benchmark_rate.cpp @@ -364,7 +364,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[] if(ref != "internal") { std::cout << "Now confirming lock on clock signals..." << std::endl; bool is_locked = false; - boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(CLOCK_TIMEOUT); + boost::system_time end_time = boost::get_system_time() + boost::posix_time::microseconds(static_cast<long>(1000*CLOCK_TIMEOUT)); for (int i = 0; i < num_mboards; i++) { if (ref == "mimo" and i == 0) continue; while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and @@ -471,7 +471,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[] const long usecs = long((duration - secs)*1e6); boost::this_thread::sleep(boost::posix_time::seconds(secs) + boost::posix_time::microseconds(usecs) - + boost::posix_time::milliseconds( (rx_channel_nums.size() <= 1 and tx_channel_nums.size() <= 1) ? 0 : (INIT_DELAY * 1000)) + + boost::posix_time::milliseconds( (rx_channel_nums.size() <= 1 and tx_channel_nums.size() <= 1) ? 0 : static_cast<long>((INIT_DELAY * 1000))) ); //interrupt and join the threads Index: uhd_3.9.7-release/examples/tx_samples_from_file.cpp =================================================================== --- uhd_3.9.7-release.orig/examples/tx_samples_from_file.cpp +++ uhd_3.9.7-release/examples/tx_samples_from_file.cpp @@ -199,7 +199,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[] else if (type == "short") send_from_file<std::complex<short> >(tx_stream, file, spb); else throw std::runtime_error("Unknown type " + type); - if(repeat and delay != 0.0) boost::this_thread::sleep(boost::posix_time::milliseconds(delay)); + if(repeat and delay != 0.0) boost::this_thread::sleep(boost::posix_time::microseconds(static_cast<long>(1000*delay))); } while(repeat and not stop_signal_called); //finished Index: uhd_3.9.7-release/examples/rx_samples_to_file.cpp =================================================================== --- uhd_3.9.7-release.orig/examples/rx_samples_to_file.cpp +++ uhd_3.9.7-release/examples/rx_samples_to_file.cpp @@ -182,7 +182,7 @@ bool check_locked_sensor(std::vector<std while (true) { if ((not first_lock_time.is_not_a_date_time()) and - (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(setup_time)))) + (boost::get_system_time() > (first_lock_time + boost::posix_time::milliseconds(static_cast<long>(1000*setup_time))))) { std::cout << " locked." << std::endl; break; @@ -196,7 +196,7 @@ bool check_locked_sensor(std::vector<std else { first_lock_time = boost::system_time(); //reset to 'not a date time' - if (boost::get_system_time() > (start + boost::posix_time::seconds(setup_time))){ + if (boost::get_system_time() > (start + boost::posix_time::milliseconds(static_cast<long>(setup_time)))){ std::cout << std::endl; throw std::runtime_error(str(boost::format("timed out waiting for consecutive locks on sensor \"%s\"") % sensor_name)); } @@ -317,7 +317,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[] //set the antenna if (vm.count("ant")) usrp->set_rx_antenna(ant); - boost::this_thread::sleep(boost::posix_time::seconds(setup_time)); //allow for some setup time + boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(1000*setup_time))); //allow for some setup time //check Ref and LO Lock detect if (not vm.count("skip-lo")){
