Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2018-01-09 14:51:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uhd" Tue Jan 9 14:51:55 2018 rev:21 rq:561418 version:3.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2017-07-25 11:40:01.979419644 +0200 +++ /work/SRC/openSUSE:Factory/.uhd.new/uhd.changes 2018-01-09 14:52:04.838931658 +0100 @@ -1,0 +2,11 @@ +Wed Jan 3 13:16:23 UTC 2018 - mar...@gmx.de + +- Adjust _constraints to set required memory to 6Gb + +------------------------------------------------------------------- +Thu Dec 28 21:15:46 UTC 2017 - w...@ire.pw.edu.pl + +- fixed build with boost-1.66 + patch uhd-fix-for-boost-1_66.patch backported from git + +------------------------------------------------------------------- @@ -4,2 +15,2 @@ -- Update7sources to version 3.9.7 -- enabler GPSD support +- Updated sources to version 3.9.7 +- enabled GPSD support New: ---- uhd-fix-for-boost-1_66.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.Lv2xn5/_old 2018-01-09 14:52:06.574850275 +0100 +++ /var/tmp/diff_new_pack.Lv2xn5/_new 2018-01-09 14:52:06.578850087 +0100 @@ -1,7 +1,7 @@ # # spec file for package uhd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,9 @@ Source0: http://files.ettus.com/binaries/uhd_stable/uhd_%{src_ver}-release/uhd_%{version}-release.tar.gz Source1: http://files.ettus.com/binaries/images/uhd-images_%{img_ver}-release.tar.xz # PATCH-FIX-OPENSUSE fix-for-armv6l-armv7l-build-failure.patch -Patch: fix-for-armv6l-armv7l-build-failure.patch +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 %if 0%{?suse_version} > 1325 BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel @@ -47,6 +49,7 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gpsd-devel BuildRequires: orc BuildRequires: pkg-config BuildRequires: python-Mako >= 0.4 @@ -55,7 +58,6 @@ BuildRequires: udev BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: gpsd-devel Requires: udev BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -134,7 +136,8 @@ %prep %setup -q -n %{name}_%{version}-release -%patch -p1 +%patch0 -p1 +%patch1 -p1 # remove buildtime from documentation echo "HTML_TIMESTAMP = NO" >> docs/Doxyfile.in ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.Lv2xn5/_old 2018-01-09 14:52:06.614848400 +0100 +++ /var/tmp/diff_new_pack.Lv2xn5/_new 2018-01-09 14:52:06.618848212 +0100 @@ -1,7 +1,7 @@ <constraints> <hardware> <memory> - <size unit="G">4</size> + <size unit="G">6</size> </memory> </hardware> </constraints> ++++++ uhd-fix-for-boost-1_66.patch ++++++ diff -up uhd_3.9.7-release/examples/network_relay.cpp.boost166 uhd_3.9.7-release/examples/network_relay.cpp --- uhd_3.9.7-release/examples/network_relay.cpp.boost166 2017-12-28 18:48:58.000000000 +0100 +++ uhd_3.9.7-release/examples/network_relay.cpp 2017-12-28 18:49:55.000000000 +0100 @@ -127,7 +127,7 @@ private: wait_for_thread.notify_one(); // notify constructor that this thread has started std::vector<char> buff(insane_mtu); while (not boost::this_thread::interruption_requested()){ - if (wait_for_recv_ready(_server_socket->native())){ + if (wait_for_recv_ready(_server_socket->native_handle())){ boost::mutex::scoped_lock lock(_endpoint_mutex); const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint); lock.unlock(); @@ -153,7 +153,7 @@ private: wait_for_thread.notify_one(); // notify constructor that this thread has started std::vector<char> buff(insane_mtu); while (not boost::this_thread::interruption_requested()){ - if (wait_for_recv_ready(_client_socket->native())){ + if (wait_for_recv_ready(_client_socket->native_handle())){ const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size())); boost::mutex::scoped_lock lock(_endpoint_mutex); _server_socket->send_to(asio::buffer(&buff.front(), len), _endpoint); diff -up uhd_3.9.7-release/lib/transport/tcp_zero_copy.cpp.boost166 uhd_3.9.7-release/lib/transport/tcp_zero_copy.cpp --- uhd_3.9.7-release/lib/transport/tcp_zero_copy.cpp.boost166 2017-12-28 18:54:11.000000000 +0100 +++ uhd_3.9.7-release/lib/transport/tcp_zero_copy.cpp 2017-12-28 18:54:30.000000000 +0100 @@ -154,7 +154,7 @@ public: //create, open, and connect the socket _socket.reset(new asio::ip::tcp::socket(_io_service)); _socket->connect(receiver_endpoint); - _sock_fd = _socket->native(); + _sock_fd = _socket->native_handle(); //packets go out ASAP asio::ip::tcp::no_delay option(true); diff -up uhd_3.9.7-release/lib/transport/udp_simple.cpp.boost166 uhd_3.9.7-release/lib/transport/udp_simple.cpp --- uhd_3.9.7-release/lib/transport/udp_simple.cpp.boost166 2017-12-28 19:24:30.000000000 +0100 +++ uhd_3.9.7-release/lib/transport/udp_simple.cpp 2017-12-28 19:24:42.000000000 +0100 @@ -56,7 +56,7 @@ public: } size_t recv(const asio::mutable_buffer &buff, double timeout){ - if (not wait_for_recv_ready(_socket->native(), timeout)) return 0; + if (not wait_for_recv_ready(_socket->native_handle(), timeout)) return 0; return _socket->receive_from(asio::buffer(buff), _recv_endpoint); } diff -up uhd_3.9.7-release/lib/transport/udp_zero_copy.cpp.boost166 uhd_3.9.7-release/lib/transport/udp_zero_copy.cpp --- uhd_3.9.7-release/lib/transport/udp_zero_copy.cpp.boost166 2017-12-28 18:50:43.000000000 +0100 +++ uhd_3.9.7-release/lib/transport/udp_zero_copy.cpp 2017-12-28 18:51:09.000000000 +0100 @@ -190,7 +190,7 @@ public: _socket = socket_sptr(new asio::ip::udp::socket(_io_service)); _socket->open(asio::ip::udp::v4()); _socket->connect(receiver_endpoint); - _sock_fd = _socket->native(); + _sock_fd = _socket->native_handle(); //allocate re-usable managed receive buffers for (size_t i = 0; i < get_num_recv_frames(); i++){
