Date: Monday, April 29, 2019 @ 03:23:25 Author: kkeen Revision: 455222
upgpkg: libuhd 3.14.0.0-1 Modified: libuhd/trunk/PKGBUILD Deleted: libuhd/trunk/boost-1.67.patch libuhd/trunk/boost-1.69.patch ------------------+ PKGBUILD | 19 +++++++------------ boost-1.67.patch | 12 ------------ boost-1.69.patch | 24 ------------------------ 3 files changed, 7 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-29 00:29:46 UTC (rev 455221) +++ PKGBUILD 2019-04-29 03:23:25 UTC (rev 455222) @@ -2,8 +2,8 @@ # Contributor: Dominik Heidler <dheid...@gmail.com> pkgname=libuhd -pkgver=3.13.0.1 -pkgrel=3 +pkgver=3.14.0.0 +pkgrel=1 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver" arch=('x86_64') url="http://www.ettus.com/kb/category/software-documentation/uhd-manual" @@ -11,24 +11,19 @@ depends=('boost-libs' 'orc' 'libusb') optdepends=('python2: usrp utils') makedepends=('cmake' 'boost' 'python2-mako') +# gpsd? dpdk? -source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz" - 'boost-1.67.patch' - 'boost-1.69.patch') -md5sums=('e7c38546d9dadac41657ee5e53c3f342' - '45fcc6feb0ea9b4ae09e4ba7b010864f' - 'ae53a647b13a9187a3c8b965bfbde2c1') +source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz") +md5sums=('bc195e12bbdf95eaf88ce20be453020d') prepare() { cd "$srcdir/uhd-$pkgver" - patch -Np1 -i ../boost-1.67.patch - patch -Np1 -i ../boost-1.69.patch + # fix for py2 + find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" } build() { 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|" mkdir -p build cd build Deleted: boost-1.67.patch =================================================================== --- boost-1.67.patch 2019-04-29 00:29:46 UTC (rev 455221) +++ boost-1.67.patch 2019-04-29 03:23:25 UTC (rev 455222) @@ -1,12 +0,0 @@ -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 - { Deleted: boost-1.69.patch =================================================================== --- boost-1.69.patch 2019-04-29 00:29:46 UTC (rev 455221) +++ boost-1.69.patch 2019-04-29 03:23:25 UTC (rev 455222) @@ -1,24 +0,0 @@ -From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 -From: Martin Braun <martin.br...@ettus.com> -Date: Wed, 9 Jan 2019 09:17:07 -0800 -Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred - include - -This adds an include for boost/core/noncopyable.hpp. Without it, builds -would potentially fail on Boost 1.69++. ---- - host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp -index 697ca19c3..8fa183835 100644 ---- a/host/lib/include/uhdlib/experts/expert_nodes.hpp -+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp -@@ -12,6 +12,7 @@ - #include <uhd/exception.hpp> - #include <uhd/utils/dirty_tracked.hpp> - #include <uhd/types/time_spec.hpp> -+#include <boost/core/noncopyable.hpp> - #include <boost/function.hpp> - #include <boost/thread/recursive_mutex.hpp> - #include <boost/thread.hpp>