From 5c0174fa90d4bb9124d6cb596a3aaad423625fa8 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Mon, 24 Jun 2019 10:33:28 +0200 Subject: [PATCH] uhd: update to 3.14.1.0. [ci skip] --- common/shlibs | 2 +- srcpkgs/uhd/patches/boost-169.patch | 25 ------------------------- srcpkgs/uhd/template | 4 ++-- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/uhd/patches/boost-169.patch diff --git a/common/shlibs b/common/shlibs index bd32f93f7e2..8778f7b818e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3379,7 +3379,7 @@ libcaf_core.so.0.16.2 bro-2.6.1_1 libcaf_openssl.so.0.16.2 bro-2.6.1_1 libllhttp.so.1 llhttp-1.0.1_1 libpinyin.so.13 libpinyin-2.2.1_1 -libuhd.so.3 uhd-3.13.0.2_1 +libuhd.so.3.14.1 uhd-3.14.1.0_1 libeditline.so.1 editline-1.16.0_1 libgnuradio-rds-3.7.0git.so.0.0.0 gnuradio-rds-1.1.0_1 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1 diff --git a/srcpkgs/uhd/patches/boost-169.patch b/srcpkgs/uhd/patches/boost-169.patch deleted file mode 100644 index 7c6eba60e4b..00000000000 --- a/srcpkgs/uhd/patches/boost-169.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 -From: Martin Braun -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 ---- host/lib/include/uhdlib/experts/expert_nodes.hpp -+++ host/lib/include/uhdlib/experts/expert_nodes.hpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include - diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index f2ce9159e1d..ffc3a2eb1f2 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,6 +1,6 @@ # Template file for 'uhd' pkgname=uhd -version=3.13.0.2 +version=3.14.1.0 revision=1 wrksrc="${pkgname}-${version}" build_wrksrc=host @@ -12,7 +12,7 @@ maintainer="Remi Pommarel " license="GPL-3.0-or-later" homepage="https://files.ettus.com/" distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz" -checksum=e18d0524cbf571be4847fd7f971dc30c37efd9e7a333761b74e1266a07cbd35b +checksum=8fc1ad70d80f7f69a30c957fee218ef8767cfd5a0ee4f0830e506f2b22e5b923 post_install() { rm -rf ${DESTDIR}/usr/lib/uhd/tests