Date: Saturday, June 2, 2018 @ 21:34:56 Author: foutrelis Revision: 338480
Prepare bump to 3.11.1.0 for boost 1.67 Added: libuhd/trunk/boost-1.67.patch Modified: libuhd/trunk/PKGBUILD ------------------+ PKGBUILD | 24 +++++++++++------------- boost-1.67.patch | 12 ++++++++++++ 2 files changed, 23 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-02 21:34:54 UTC (rev 338479) +++ PKGBUILD 2018-06-02 21:34:56 UTC (rev 338480) @@ -3,9 +3,8 @@ # Contributor: Dominik Heidler <[email protected]> pkgname=libuhd -pkgver=3.10.2.0 -_verstring='003_010_002_000' -pkgrel=3 +pkgver=3.11.1.0 +pkgrel=0 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver" arch=('x86_64') url="http://www.ettus.com/kb/category/software-documentation/uhd-manual"; @@ -14,19 +13,18 @@ optdepends=('python2: usrp utils') makedepends=('cmake' 'boost' 'python2-cheetah' 'python2-mako') -source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/release_${_verstring}.tar.gz";) -md5sums=('f1e1977cd6c146daf800df681cb22944') +source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz"; + 'boost-1.67.patch') +md5sums=('fb3c6972af55130f34ec9133caf6c9e4' + '45fcc6feb0ea9b4ae09e4ba7b010864f') prepare() { - cd "$srcdir/uhd-release_$_verstring/host" - # from commit d9d9d0a8a2e6, remove on 3.10.2.1 - sed -i 's|socket->native()|socket->native_handle()|' examples/network_relay.cpp - sed -i 's|socket->native()|socket->native_handle()|' lib/transport/{tcp_zero_copy,udp_simple,udp_zero_copy}.cpp - sed -i 's|recver->native()|recver->native_handle()|' lib/usrp/e300/e300_network.cpp + cd "$srcdir/uhd-$pkgver" + patch -Np1 -i ../boost-1.67.patch } build() { - cd "$srcdir/uhd-release_$_verstring/host" + cd "$srcdir/uhd-$pkgver/host" # fix for py2 find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" @@ -43,12 +41,12 @@ } check() { - cd "$srcdir/uhd-release_$_verstring/host/build" + cd "$srcdir/uhd-$pkgver/host/build" make test } package() { - cd "$srcdir/uhd-release_$_verstring/host/build" + cd "$srcdir/uhd-$pkgver/host/build" make DESTDIR="$pkgdir" install install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules" } Added: boost-1.67.patch =================================================================== --- boost-1.67.patch (rev 0) +++ boost-1.67.patch 2018-06-02 21:34:56 UTC (rev 338480) @@ -0,0 +1,12 @@ +diff -upr uhd-3.11.1.0.orig/host/lib/usrp/e300/e300_fifo_config.cpp uhd-3.11.1.0/host/lib/usrp/e300/e300_fifo_config.cpp +--- uhd-3.11.1.0.orig/host/lib/usrp/e300/e300_fifo_config.cpp 2018-05-16 22:25:48.000000000 +0300 ++++ uhd-3.11.1.0/host/lib/usrp/e300/e300_fifo_config.cpp 2018-06-03 00:16:53.119018076 +0300 +@@ -107,7 +107,7 @@ struct e300_fifo_poll_waiter + boost::mutex::scoped_lock l(_mutex); + if (_poll_claimed) + { +- _cond.timed_wait(l, boost::posix_time::microseconds(timeout*1000000)); ++ _cond.timed_wait(l, boost::posix_time::microseconds(long(timeout*1000000))); + } + else + {
