diff options
| -rw-r--r-- | ham/uhd/Makefile | 7 | ||||
| -rw-r--r-- | ham/uhd/PLIST | 58 | ||||
| -rw-r--r-- | ham/uhd/distinfo | 14 | ||||
| -rw-r--r-- | ham/uhd/patches/patch-CMakeLists.txt | 22 | ||||
| -rw-r--r-- | ham/uhd/patches/patch-docs_CMakeLists.txt | 55 |
5 files changed, 101 insertions, 55 deletions
diff --git a/ham/uhd/Makefile b/ham/uhd/Makefile index 4ed6c9ba3e4..af1e2d72c19 100644 --- a/ham/uhd/Makefile +++ b/ham/uhd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2020/01/12 20:20:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.53 2020/04/07 15:51:50 mef Exp $ -DISTNAME= uhd-3.14.1.1 -PKGREVISION= 1 +DISTNAME= uhd-3.15.0.0 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -42,6 +41,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/host # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process. REPLACE_PYTHON+= utils/converter_benchmark.py +REPLACE_PYTHON+= utils/converter_benchmark.py REPLACE_PYTHON+= utils/latency/graph.py REPLACE_PYTHON+= utils/latency/run_tests.py REPLACE_PYTHON+= utils/uhd_images_downloader.py.in @@ -55,6 +55,7 @@ REPLACE_PYTHON+= tests/devtest/rx_samples_to_file_test.py REPLACE_PYTHON+= tests/devtest/test_messages_test.py REPLACE_PYTHON+= tests/devtest/test_pps_test.py REPLACE_PYTHON+= tests/devtest/tx_bursts_test.py +REPLACE_PYTHON+= tests/devtest/tx_waveforms_test.py REPLACE_PYTHON+= tests/devtest/uhd_test_base.py REPLACE_PYTHON+= tests/devtest/usrp_probe.py REPLACE_PYTHON+= tests/devtest/usrp_probe_test.py diff --git a/ham/uhd/PLIST b/ham/uhd/PLIST index 9d5615fdfa9..eb3480543d3 100644 --- a/ham/uhd/PLIST +++ b/ham/uhd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2019/07/02 16:44:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.16 2020/04/07 15:51:50 mef Exp $ bin/uhd_cal_rx_iq_balance bin/uhd_cal_tx_dc_offset bin/uhd_cal_tx_iq_balance @@ -8,17 +8,42 @@ bin/uhd_image_loader bin/uhd_usrp_probe include/uhd.h include/uhd/build_info.hpp -include/uhd/cal/container.hpp -include/uhd/cal/power_container.hpp include/uhd/config.h include/uhd/config.hpp include/uhd/convert.hpp include/uhd/deprecated.hpp include/uhd/device.hpp +include/uhd/device3.hpp include/uhd/error.h include/uhd/exception.hpp include/uhd/property_tree.hpp include/uhd/property_tree.ipp +include/uhd/rfnoc/block_ctrl.hpp +include/uhd/rfnoc/block_ctrl_base.hpp +include/uhd/rfnoc/block_id.hpp +include/uhd/rfnoc/blockdef.hpp +include/uhd/rfnoc/constants.hpp +include/uhd/rfnoc/ddc_block_ctrl.hpp +include/uhd/rfnoc/dma_fifo_block_ctrl.hpp +include/uhd/rfnoc/duc_block_ctrl.hpp +include/uhd/rfnoc/fir_block_ctrl.hpp +include/uhd/rfnoc/graph.hpp +include/uhd/rfnoc/node_ctrl_base.hpp +include/uhd/rfnoc/node_ctrl_base.ipp +include/uhd/rfnoc/null_block_ctrl.hpp +include/uhd/rfnoc/radio_ctrl.hpp +include/uhd/rfnoc/rate_node_ctrl.hpp +include/uhd/rfnoc/replay_block_ctrl.hpp +include/uhd/rfnoc/scalar_node_ctrl.hpp +include/uhd/rfnoc/siggen_block_ctrl.hpp +include/uhd/rfnoc/sink_block_ctrl_base.hpp +include/uhd/rfnoc/sink_node_ctrl.hpp +include/uhd/rfnoc/source_block_ctrl_base.hpp +include/uhd/rfnoc/source_node_ctrl.hpp +include/uhd/rfnoc/stream_sig.hpp +include/uhd/rfnoc/terminator_node_ctrl.hpp +include/uhd/rfnoc/tick_node_ctrl.hpp +include/uhd/rfnoc/window_block_ctrl.hpp include/uhd/stream.hpp include/uhd/transport/bounded_buffer.hpp include/uhd/transport/bounded_buffer.ipp @@ -97,26 +122,35 @@ include/uhd/utils/log.hpp include/uhd/utils/log_add.hpp include/uhd/utils/math.hpp include/uhd/utils/msg_task.hpp +include/uhd/utils/noncopyable.hpp include/uhd/utils/paths.hpp include/uhd/utils/pimpl.hpp include/uhd/utils/platform.hpp include/uhd/utils/safe_call.hpp include/uhd/utils/safe_main.hpp +include/uhd/utils/scope_exit.hpp include/uhd/utils/static.hpp include/uhd/utils/tasks.hpp include/uhd/utils/thread.hpp include/uhd/utils/thread_priority.h include/uhd/utils/thread_priority.hpp +include/uhd/version.h include/uhd/version.hpp +lib/cmake/uhd/UHDBoost.cmake lib/cmake/uhd/UHDConfig.cmake lib/cmake/uhd/UHDConfigVersion.cmake lib/libuhd.so -lib/libuhd.so.3.14.1 +lib/libuhd.so.3.15.0 lib/pkgconfig/uhd.pc lib/uhd/examples/benchmark_rate +lib/uhd/examples/benchmark_streamer lib/uhd/examples/gpio lib/uhd/examples/latency_test lib/uhd/examples/network_relay +lib/uhd/examples/replay_samples_from_file +lib/uhd/examples/rfnoc_nullsource_ce_rx +lib/uhd/examples/rfnoc_radio_loopback +lib/uhd/examples/rfnoc_rx_to_file lib/uhd/examples/rx_ascii_art_dft lib/uhd/examples/rx_multi_samples lib/uhd/examples/rx_samples_c @@ -138,14 +172,16 @@ lib/uhd/examples/tx_waveforms lib/uhd/examples/txrx_loopback_to_file lib/uhd/examples/usrp_list_sensors lib/uhd/tests/addr_test +lib/uhd/tests/block_id_test +lib/uhd/tests/blockdef_test lib/uhd/tests/buffer_test lib/uhd/tests/byteswap_test -lib/uhd/tests/cal_container_test lib/uhd/tests/cast_test lib/uhd/tests/chdr_test lib/uhd/tests/config_parser_test lib/uhd/tests/constrained_device_args_test lib/uhd/tests/convert_test +lib/uhd/tests/device3_test lib/uhd/tests/devtest/benchmark_rate_test.py lib/uhd/tests/devtest/bitbang_test.py lib/uhd/tests/devtest/devtest_b2xx.py @@ -162,6 +198,7 @@ lib/uhd/tests/devtest/rx_samples_to_file_test.py lib/uhd/tests/devtest/test_messages_test.py lib/uhd/tests/devtest/test_pps_test.py lib/uhd/tests/devtest/tx_bursts_test.py +lib/uhd/tests/devtest/tx_waveforms_test.py lib/uhd/tests/devtest/uhd_test_base.py lib/uhd/tests/devtest/usrp_probe.py lib/uhd/tests/devtest/usrp_probe_test.py @@ -175,27 +212,34 @@ lib/uhd/tests/fe_conn_test lib/uhd/tests/fp_compare_delta_test lib/uhd/tests/fp_compare_epsilon_test lib/uhd/tests/gain_group_test +lib/uhd/tests/graph_search_test +lib/uhd/tests/isatty_test lib/uhd/tests/log_test lib/uhd/tests/math_test 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/node_connect_test lib/uhd/tests/packet_handler_benchmark lib/uhd/tests/paths_test lib/uhd/tests/property_test lib/uhd/tests/ranges_c_test lib/uhd/tests/ranges_test +lib/uhd/tests/rate_node_test +lib/uhd/tests/scope_exit_test lib/uhd/tests/sensors_c_test lib/uhd/tests/sensors_test lib/uhd/tests/sid_t_test lib/uhd/tests/soft_reg_test lib/uhd/tests/sph_recv_test lib/uhd/tests/sph_send_test +lib/uhd/tests/stream_sig_test lib/uhd/tests/string_vector_c_test lib/uhd/tests/subdev_spec_c_test lib/uhd/tests/subdev_spec_test lib/uhd/tests/tasks_test +lib/uhd/tests/tick_node_test lib/uhd/tests/time_spec_test lib/uhd/tests/vrt_test lib/uhd/utils/b2xx_fx3_utils @@ -246,10 +290,10 @@ share/uhd/rfnoc/blocks/moving_avg.xml share/uhd/rfnoc/blocks/nullblock.xml share/uhd/rfnoc/blocks/ofdmeq.xml share/uhd/rfnoc/blocks/packetresizer.xml -share/uhd/rfnoc/blocks/radio_e3xx.xml +share/uhd/rfnoc/blocks/radio_e31x.xml +share/uhd/rfnoc/blocks/radio_e320.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 diff --git a/ham/uhd/distinfo b/ham/uhd/distinfo index 37b3c508f6c..d6867d4d11b 100644 --- a/ham/uhd/distinfo +++ b/ham/uhd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2019/10/04 10:41:44 adam Exp $ +$NetBSD: distinfo,v 1.23 2020/04/07 15:51:50 mef Exp $ -SHA1 (uhd-3.14.1.1.tar.gz) = 6ca67393422bb8c1cc56ba201844d9a0212ce03d -RMD160 (uhd-3.14.1.1.tar.gz) = e6eb3a304a324eb16479fda760d1e93b7e72e8b9 -SHA512 (uhd-3.14.1.1.tar.gz) = 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4 -Size (uhd-3.14.1.1.tar.gz) = 12960651 bytes -SHA1 (patch-CMakeLists.txt) = fa86f08bccb4afbb9108d3b1eb02d3101e933cdc -SHA1 (patch-docs_CMakeLists.txt) = 23b70637499deafaf378f7c68764afd674673ad2 +SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f +RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae +SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 +Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes +SHA1 (patch-CMakeLists.txt) = 2ba015aad8e08963a2bba8e1fc421aae53207cc5 +SHA1 (patch-docs_CMakeLists.txt) = 27b04f5b3ef7b0604b43d50d95dd948535d4b434 SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7 diff --git a/ham/uhd/patches/patch-CMakeLists.txt b/ham/uhd/patches/patch-CMakeLists.txt index 228e06f0c41..3c6527f91dd 100644 --- a/ham/uhd/patches/patch-CMakeLists.txt +++ b/ham/uhd/patches/patch-CMakeLists.txt @@ -1,22 +1,18 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/04 10:41:44 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $ Allow overrides on PKG_DOC_DIR and PKG_MAN_DIR. https://github.com/EttusResearch/uhd/issues/301 ---- CMakeLists.txt.orig 2019-10-03 18:21:01.000000000 +0000 -+++ CMakeLists.txt -@@ -128,8 +128,12 @@ set(PKG_DATA_DIR share/uhd) - if(NOT DEFINED PKG_LIB_DIR) - set(PKG_LIB_DIR ${LIBRARY_DIR}/uhd) +--- host/CMakeLists.txt.orig 2020-01-01 13:21:49.000000000 +0900 ++++ CMakeLists.txt 2020-04-08 00:03:10.169349083 +0900 +@@ -124,8 +124,9 @@ + if(NOT DEFINED PKG_DOC_DIR) + set(PKG_DOC_DIR share/doc/uhd) endif() --set(PKG_DOC_DIR share/doc/uhd) --set(PKG_MAN_DIR share/man/man1) -+if(NOT DEFINED PKG_DOC_DIR) -+ set(PKG_DOC_DIR share/doc/uhd) -+endif() +if(NOT DEFINED PKG_MAN_DIR) -+ set(PKG_MAN_DIR share/man/man1) + set(PKG_MAN_DIR share/man/man1) +- +endif() - ######################################################################## # UHD config files + ######################################################################## diff --git a/ham/uhd/patches/patch-docs_CMakeLists.txt b/ham/uhd/patches/patch-docs_CMakeLists.txt index 7e16f217d4d..70bcd1adf3a 100644 --- a/ham/uhd/patches/patch-docs_CMakeLists.txt +++ b/ham/uhd/patches/patch-docs_CMakeLists.txt @@ -1,31 +1,36 @@ -$NetBSD: patch-docs_CMakeLists.txt,v 1.1 2019/10/04 10:41:44 adam Exp $ +$NetBSD: patch-docs_CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $ Do not compress man pages. ---- docs/CMakeLists.txt.orig 2019-10-03 17:48:04.000000000 +0000 -+++ docs/CMakeLists.txt -@@ -150,23 +150,5 @@ LIBUHD_REGISTER_COMPONENT("Man Pages" EN +--- host/docs/CMakeLists.txt.orig 2020-01-01 13:21:49.000000000 +0900 ++++ docs/CMakeLists.txt 2020-04-08 00:01:23.449612527 +0900 +@@ -178,28 +178,5 @@ + LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF) if(ENABLE_MAN_PAGES) - #Generate man pages -- foreach(manfile ${man_page_sources}) -- #make the gzip file depend on the text file -- string(REPLACE ".1" "" PROGRAM_NAME "${manfile}") -- set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz") -- set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}") -- add_custom_command( -- OUTPUT ${gzfile} -- DEPENDS ${manfile} -- COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile} -- COMMENT "Generating ${PROGRAM_NAME} man page" -- ) -- -- #make the man page target depend on the gz file -- list(APPEND man_page_gz_files ${gzfile}) -- UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) -- endforeach(manfile ${man_page_sources}) -- -- #make the man pages a build-time dependency -- add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files}) -+ UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) +- #Generate man pages; either compressed or not +- if(ENABLE_MAN_PAGE_COMPRESSION) +- # compress man pages +- foreach(manfile ${man_page_sources}) +- #make the gzip file depend on the text file +- string(REPLACE ".1" "" PROGRAM_NAME "${manfile}") +- set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz") +- set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}") +- add_custom_command( +- OUTPUT ${gzfile} +- DEPENDS ${manfile} +- COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile} +- COMMENT "Generating ${PROGRAM_NAME} man page" +- ) +- #make the man page target depend on the gz file +- list(APPEND man_page_gz_files ${gzfile}) +- endforeach(manfile ${man_page_sources}) +- #make the man pages a build-time dependency +- UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) +- add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files}) +- else(ENABLE_MAN_PAGE_COMPRESSION) +- # uncompressed man pages; just install them +- UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) +- endif(ENABLE_MAN_PAGE_COMPRESSION) ++ UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) endif(ENABLE_MAN_PAGES) |