summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
Diffstat (limited to 'ham')
-rw-r--r--ham/uhd/Makefile5
-rw-r--r--ham/uhd/PLIST10
-rw-r--r--ham/uhd/distinfo11
-rw-r--r--ham/uhd/patches/patch-lib_include_uhdlib_experts_expert__nodes.hpp14
4 files changed, 15 insertions, 25 deletions
diff --git a/ham/uhd/Makefile b/ham/uhd/Makefile
index e816b08879b..ef6b6ba7da7 100644
--- a/ham/uhd/Makefile
+++ b/ham/uhd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2019/04/25 07:33:00 maya Exp $
+# $NetBSD: Makefile,v 1.47 2019/04/28 20:31:28 adam Exp $
-DISTNAME= uhd-3.13.1.0
-PKGREVISION= 1
+DISTNAME= uhd-3.14.0.0
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/ham/uhd/PLIST b/ham/uhd/PLIST
index b78dc1abf86..0020217825a 100644
--- a/ham/uhd/PLIST
+++ b/ham/uhd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/03/22 17:58:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/04/28 20:31:28 adam Exp $
bin/uhd_cal_rx_iq_balance
bin/uhd_cal_tx_dc_offset
bin/uhd_cal_tx_iq_balance
@@ -34,6 +34,7 @@ include/uhd/transport/usb_device_handle.hpp
include/uhd/transport/usb_zero_copy.hpp
include/uhd/transport/vrt_if_packet.hpp
include/uhd/transport/zero_copy.hpp
+include/uhd/transport/zero_copy_flow_ctrl.hpp
include/uhd/types/byte_vector.hpp
include/uhd/types/clock_config.hpp
include/uhd/types/device_addr.hpp
@@ -110,7 +111,7 @@ include/uhd/version.hpp
lib/cmake/uhd/UHDConfig.cmake
lib/cmake/uhd/UHDConfigVersion.cmake
lib/libuhd.so
-lib/libuhd.so.3.13.1
+lib/libuhd.so.3.14.0
lib/pkgconfig/uhd.pc
lib/uhd/examples/benchmark_rate
lib/uhd/examples/gpio
@@ -180,6 +181,7 @@ lib/uhd/tests/narrow_cast_test
lib/uhd/tests/nocscript_expr_test
lib/uhd/tests/nocscript_ftable_test
lib/uhd/tests/nocscript_parser_test
+lib/uhd/tests/packet_handler_benchmark
lib/uhd/tests/paths_test
lib/uhd/tests/property_test
lib/uhd/tests/ranges_c_test
@@ -248,7 +250,11 @@ share/uhd/rfnoc/blocks/radio_e3xx.xml
share/uhd/rfnoc/blocks/radio_eiscat.xml
share/uhd/rfnoc/blocks/radio_magnesium.xml
share/uhd/rfnoc/blocks/radio_neon.xml
+share/uhd/rfnoc/blocks/radio_rhodium.xml
share/uhd/rfnoc/blocks/radio_x300.xml
+share/uhd/rfnoc/blocks/replay.xml
+share/uhd/rfnoc/blocks/replay_x2.xml
+share/uhd/rfnoc/blocks/replay_x4.xml
share/uhd/rfnoc/blocks/schmidlcox.xml
share/uhd/rfnoc/blocks/serialdemod.xml
share/uhd/rfnoc/blocks/siggen.xml
diff --git a/ham/uhd/distinfo b/ham/uhd/distinfo
index 54ff2aea6d9..e2ea9f9955a 100644
--- a/ham/uhd/distinfo
+++ b/ham/uhd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2019/03/22 17:58:27 adam Exp $
+$NetBSD: distinfo,v 1.20 2019/04/28 20:31:28 adam Exp $
-SHA1 (uhd-3.13.1.0.tar.gz) = 8211ee4aa782054488606a3dc1a3f6695c45c6cf
-RMD160 (uhd-3.13.1.0.tar.gz) = 325316973eea77a8336ea80ca1cd8c1860b7f459
-SHA512 (uhd-3.13.1.0.tar.gz) = 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
-Size (uhd-3.13.1.0.tar.gz) = 11587157 bytes
-SHA1 (patch-lib_include_uhdlib_experts_expert__nodes.hpp) = b741980f6a1bbeef07903a23de13474abc982f9e
+SHA1 (uhd-3.14.0.0.tar.gz) = 8b6cc0d09786ea034fd2ecd5e1dd1f609e765db1
+RMD160 (uhd-3.14.0.0.tar.gz) = 9666b8ea882683764fa462bdab0ae5560b172faf
+SHA512 (uhd-3.14.0.0.tar.gz) = c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
+Size (uhd-3.14.0.0.tar.gz) = 12935658 bytes
diff --git a/ham/uhd/patches/patch-lib_include_uhdlib_experts_expert__nodes.hpp b/ham/uhd/patches/patch-lib_include_uhdlib_experts_expert__nodes.hpp
deleted file mode 100644
index 320527d5f61..00000000000
--- a/ham/uhd/patches/patch-lib_include_uhdlib_experts_expert__nodes.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_include_uhdlib_experts_expert__nodes.hpp,v 1.1 2019/01/09 01:28:45 gdt Exp $
-
-https://github.com/EttusResearch/uhd/issues/240
-
---- lib/include/uhdlib/experts/expert_nodes.hpp.orig 2018-08-01 03:30:31.000000000 +0000
-+++ 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>