head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.4 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.2 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.7.0.6 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.4 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.2 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.5.0.18 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.16 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.14 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.12 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.10 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.8 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.6 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.4 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.2 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.4.0.8 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.6 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.4 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.2 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.3.0.12 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.10 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.8 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.6 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.4 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.2 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.1.0.2 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.4 pkgsrc-2019Q4-base:1.1; locks; strict; comment @# @; 1.9 date 2025.10.21.12.06.29; author gdt; state Exp; branches; next 1.8; commitid TkH6CmlZPlBWRqfG; 1.8 date 2025.10.04.13.18.29; author tnn; state Exp; branches; next 1.7; commitid oP7ngODe7EntOfdG; 1.7 date 2025.02.26.22.05.41; author adam; state Exp; branches; next 1.6; commitid CejMOQ2df7CsN1LF; 1.6 date 2025.01.08.15.30.27; author tnn; state Exp; branches; next 1.5; commitid 2zEKZ933ZhMobHEF; 1.5 date 2022.09.30.18.12.44; author adam; state Exp; branches; next 1.4; commitid pqxTgI86EizzNUVD; 1.4 date 2021.12.11.17.39.56; author tnn; state Exp; branches; next 1.3; commitid iD31a3BLKpri2gkD; 1.3 date 2020.04.08.08.07.17; author adam; state Exp; branches; next 1.2; commitid euxYrGZQzr13xy3C; 1.2 date 2020.04.07.15.51.50; author mef; state Exp; branches; next 1.1; commitid ew0BImHDOC0H8t3C; 1.1 date 2019.10.04.10.41.44; author adam; state Exp; branches; next ; commitid 1wATPUIrCITVoxFB; desc @@ 1.9 log @ham/uhd: Update to 4.9.0.1 Packaging changes: - Drop boost::system linking exorcism, as fixed by upstream which made this micro because I asked for it! - Drop patches cherry-picked from upstream commits Upstream NEWS: * 4.9.0.1 Fix build with boost 1.89.0 * 4.9.0.0 Highlights / Main Changes Support for USRP B206mini-i Support for OBX daughterboard New Features OBX daughterboard and B206mini support added. X3x0: Add support for the gps_iface feature. This allows sending arbitrary commands to the GPS module. rfnoc_modtool: Add a new subcommand, make-yaml, that generates a block YAML file from some user inputs. When calling rfnoc_modtool add without a valid block YAML file, the tool will now automatically call make-yaml to generate a new YAML file. Added support for processing multiple samples per cycle in FFT block. LabVIEW/USRP: New repository containing example applications which demonstrate how to use NI LabVIEW with USRP devices via the UHD APIs. (https://github.com/ni/labview-usrp-examples) Improved RFNoC OOT Block support: New repository containing official RFNoC OOT Blocks (https://github.com/EttusResearch/rfnoc-oot-blocks) Added new RFNoC Aurora Block for TX and RX remote streaming applications to and from Aurora capable compute nodes like FPGA Coprocessors. Enhanced the UHD Windows installer to automatically install Windows driver packages into the OS, eliminating this manual post-installation step for B-Series USB devices. API Changes uhd::math::gcd and uhd::math::lcm are removed from the public headers. Use std::gcd and std::lcm instead if C++17 is available, or boost::math::gcd and boost::math::lcm if not. When calling recv() on an RX streamer connected to an RFNoC device, we no longer artificially inflate the timeout value. The old behaviour was in some cases abused to detect overruns, but this is not a reliable method and is now explicitly declared unsupported. @ text @$NetBSD: patch-CMakeLists.txt,v 1.8 2025/10/04 13:18:29 tnn Exp $ Allow overrides on PKG_MAN_DIR. https://github.com/EttusResearch/uhd/issues/301 --- CMakeLists.txt.orig 2025-09-01 13:24:04.000000000 +0000 +++ CMakeLists.txt @@@@ -159,8 +159,10 @@@@ if(NOT DEFINED PKG_DOC_DIR) # that's what the project name is, but we want to keep it lowercase. string(TOLOWER "${CMAKE_INSTALL_DOCDIR}" PKG_DOC_DIR) endif() -set(PKG_MAN_DIR ${CMAKE_INSTALL_MANDIR}/man1) +if(NOT DEFINED PKG_MAN_DIR) +set(PKG_MAN_DIR ${CMAKE_INSTALL_MANDIR}/man1) +endif() ######################################################################## # UHD config files ======= ######################################################################## @ 1.8 log @uhd: remove boost_system references @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.7 2025/02/26 22:05:41 adam Exp $ a4 1 Don't link with removed boost_system. d6 1 a6 1 --- CMakeLists.txt.orig 2025-01-27 14:59:07.000000000 +0000 d8 3 a10 3 @@@@ -147,8 +147,9 @@@@ endif() if(NOT DEFINED PKG_DOC_DIR) set(PKG_DOC_DIR share/doc/uhd) d12 2 d15 1 a15 2 set(PKG_MAN_DIR share/man/man1) - d17 1 d20 1 a21 8 @@@@ -300,7 +301,6 @@@@ set(UHD_BOOST_REQUIRED_COMPONENTS date_time filesystem program_options - system serialization thread unit_test_framework @ 1.7 log @uhd: updated to 4.8.0.0 UHD 4.8.0.0 Highlights / Main Changes Addition of rfnoc_modtool and further improvements to RFNoC Image Builder toolsets. This further improves the ability to design RFNoC blocks and create custom FPGA bitfiles. Replaced RFNoC FFT block with a new version Improved Windows installation capabilities including distribution of binary Python bindings for Windows though PyPI New Features Image Builder Add GRC support. This allows designing RFNoC bitfiles from GNU Radio Companion (GRC). Improve clock connection checks and checks for duplicate connections. Improve IO port compat check (e.g., check if wire widths match). Allow default clocks in domain checks. Simplify image core YAMLs by better usage of RADIO_NIPC parameter. Improve parameter resolution. Improve error messages for missing YAML files. Add --SYNTH and --CHECK options. Add support for building an FPGA image using multiple parallel jobs and unique seeds with repeat_fpga_build.py and the --fpga-jobs option. Add 'q' (or 'quote') filter to YAML files to allow quoting strings. rfnoc-gain (OOT RFNoC example) Overhaul directory structure, and rename to rfnoc-gain from rfnoc-example. Simplify dynamic loading of OOT DLLs by using the new modules.d feature. Add CE clock support to gain block. This enables the example on X4x0. Add a GNU Radio subdirectory with examples of how to run the gain block in GNU Radio. Add rfnoc_modtool. This is a command line utility to help design OOT RFNoC blocks and replaces the previously available blocktool. RFNoC Add tune requests. This allows tuning a complete graph as known from multi_usrp instead of single blocks individually. Replace FFT block with a new version supporting larger FFT sizes and cyclic prefix insertion and removal. multi_usrp Add Python bindings for get_user_settings_iface() General UHD Add modules.d support Add uhd::find_uhd_command() API call Remove old-style Boost.Asio usage for compatibility with future versions of Boost. Embedded Filesystem Support for USB Audio devices on E31X, E320, N3XX and X4XX Windows binary installer Simplified the Windows installer experience by reducing the number of individual downloads from 4 (for USB devices) to 2, by including libusb.dll and USB driver installer files into NSIS-built installer binaries. Add new cmake feature option called ENABLE_EXTEND_WIN_PACKAGING, which defaults to off. Enabling this feature will cause a number of convenience components to be included into the Windows deployment package (aka. installer). Enabling this feature has no effect on other platforms. Added binary Python bindings for Windows installable through PyPI (pip install uhd) Documentation Add documentation about relationship of MTU, samples per packet and atomic item size Dependencies changes Increase minimum required versions CMake to 3.12 Boost to 1.66 Bug Fixes General UHD Fix compatibility with DPDK >= 22.11 Fix compiler warnings for better compatibility with C++17 and 20. Add logic for loading uhd.dll from the correct path for Windows with Python3.8+. Add logic to warn about potential incompatibilities when importing Python bindings. Remove duplicate results from find Release GIL when calling find from Python which improves response time for large setups. Python support On Windows now also enable building python support if minimum supported python version is detected. Changed version number format for build Windows binaries to common major.api.abi.patch format. MPM Allow images without RF frontend (will only be initialized if FPGA reports availability) Fix usrp_update_fs to work for all embedded devices (and not just X4xx) E320: Ensure consistent sequencing when powering on/off GPSDO N310/N300: Fix LO query API for lowband LO RFNoC RFNoC DDC/DUC block (used in all Gen-3 USRPs and X410): Fix fractional frequency offset. Fix AIS/spp calculation (e.g., for connecting FFT blocks). Fix USE_IMPL rendering for the addsub block. Image Builder Fix colors Fix error message for missing control SEP Improve error reporting for invalid connections Accept ~ and ~user on command line Fix deprecated usage of yaml.load() Ensure correct device tree files generation when choosing a custom build directory rfnoc_modtool Fix generation of noc_shells @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.6 2025/01/08 15:30:27 tnn Exp $ d5 1 d7 1 a7 1 --- CMakeLists.txt.orig 2024-12-11 13:37:26.000000000 +0000 d9 1 a9 1 @@@@ -131,8 +131,9 @@@@ endif() d20 8 @ 1.6 log @uhd: update to snapshot to deal with boost 1.87 fallout See upstream commit adfe953d965e58b5931c1b1968899492c8087cf6 @ text @d1 1 a1 1 $NetBSD$ a5 2 Do not use Numpy. a18 15 @@@@ -341,14 +342,6 @@@@ UHD_PYTHON_CHECK_MODULE_VERSION( ) UHD_PYTHON_CHECK_MODULE_VERSION( - "numpy module" - "numpy" - "numpy.__version__" - ${UHD_NUMPY_MIN_VERSION} - HAVE_PYTHON_MODULE_NUMPY -) - -UHD_PYTHON_CHECK_MODULE_VERSION( "ruamel.yaml module" "ruamel.yaml" "ruamel.yaml.__version__" @ 1.5 log @uhd: updated o 4.3.0.0 he UHD 4.3.0.0 release adds: Extension framework support FPGA builds using Xilinx Vivado 2021.1 (B2xx, E3xx, N3xx, X3xx, and X4xx devices) Bug fixes and improvements for USRP devices. See the changelog. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.4 2021/12/11 17:39:56 tnn Exp $ d8 1 a8 1 --- CMakeLists.txt.orig 2022-09-14 14:19:33.000000000 +0000 d10 1 a10 1 @@@@ -127,8 +127,9 @@@@ endif() d21 1 a21 1 @@@@ -337,14 +338,6 @@@@ PYTHON_CHECK_MODULE_VERSION( d24 1 a24 1 PYTHON_CHECK_MODULE_VERSION( d28 1 a28 1 - ${NUMPY_MIN_VERSION} d32 1 a32 1 -PYTHON_CHECK_MODULE_VERSION( @ 1.4 log @uhd: update to 4.1.0.4 With UHD 4.0, RFNoC has undergone a major overhaul for improved usability, performance, and compatibility with tools like GNU Radio. Improved Radio Performance Increase channel bandwidth to 250 MSPS and beyond. Flexible bus width to increase throughput. Static routing for lower latency and higher throughput Updates to the NOC shell layer for improved latency and throughput. FPGA Design Flow Enhancements Ability to scale to a larger number of user-defined blocks. Reduced FPGA resource utilization in many instances. More Flexibility Architectural flexibility enables users to make more design tradeoffs. Allows the user to balance flexibility, resource utilization, and performance. Improved User Experience Improved documentation with a full RFNoC Specification Power calibration utility API (requires external calibration reference) Python API enhancements with full Python 3 support. Stability improvements from new automated testing infrastructure. Use embedded series radios without programming the ARM processing with "Network Mode" over the RJ45 @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.3 2020/04/08 08:07:17 adam Exp $ d8 1 a8 1 --- CMakeLists.txt.orig 2021-09-29 14:25:58.000000000 +0000 d10 1 a10 1 @@@@ -124,8 +124,9 @@@@ endif() d21 1 a21 2 @@@@ -327,11 +328,6 @@@@ PYTHON_CHECK_MODULE( HAVE_PYTHON_MODULE_REQUESTS d24 5 a28 3 -PYTHON_CHECK_MODULE( - "numpy ${NUMPY_MIN_VERSION} or greater" - "numpy" "LooseVersion(numpy.__version__) >= LooseVersion('${NUMPY_MIN_VERSION}')" d31 5 a35 3 PYTHON_CHECK_MODULE( "ruamel.yaml ${RUAMEL.YAML_MIN_VERSION} or greater" @ 1.3 log @uhd: fix building when py-numpy is also installed; docs/CMakeLists.txt is not necessary any more @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $ d8 1 a8 1 --- CMakeLists.txt.orig 2020-01-01 04:21:49.000000000 +0000 d21 1 a21 1 @@@@ -329,11 +330,6 @@@@ PYTHON_CHECK_MODULE( d31 2 a32 2 ######################################################################## # Create Uninstall Target @ 1.2 log @(ham/uhd) Updated to 3.15.0.0 ## 003.015.000.000 * N320: Fix MCR initialization, fix checks for LO distribution board, reset RX IQ balance on init, replace DRAM FIFO with replay block, improve constraints, fix I/Q imbalance compensation, add FPGPIO control * N310: increase default dc offset averaging window, make tunes asynchronous, add capability to control RF filter bypass and freq.band limits, fix setting user DB EEPROM, correctly report N321 vs N320, improve DDR3 BIST, update max revision to 7, fix DMA arbitration to use contiguous packets, replace DRAM FIFO with replay block, fix SFP link up status, add workaround for clocking interference with external reference clocks, disable gpsdo clock/time source options when enable_gps=0 * X300: Fix max bitfile size, fix GPIO ATR property access type, heavily refactor, introduce conn_mgr, add DPDK support, add capability to flash NI-2974 FPGA, fix clocking code, enable 11.52 MHz and 23.04 MHz system ref rates, improve usage of constrained device args, enable ADC gain through RFNoC API, add mode to set master clock rate to arbitrary values between 184.32 and 200 MHz, throttle muxed_zero_copy_if * E320: Fix time source clobbering ref source, add support for RevE, fix reporting of FPGA version hash, fix SFP link up status, fix missing ce_clk driver * E310: Convert to MPM architecture, fix uhd_image_loader usage, fix DMA arbitration to use contiguous packets, reduced DMA chans to 4 (using data stream muxing), fix DRAM_TEST target build * E3xx: Correct frontend name in devtest * B200: Add command to query bootloader status, fix sc12 streaming, fix FIFO sizes on GPIFII interface * UBX: add temperature compensation mode * SBX: Only update ATRs when lock state changes * TwinRX: add LO charge pump properties, increase default charge pump value on LO1, add low spur tuning mode, fix duplicate write to N value in DDC * RFNoC/device3: Read command FIFO size from device instead of hardcoding values, fix multidevice graph connections, ENABLE_RFNOC now defaults to ON, search all nodes for tick rate, add update_graph() call which lets blocks do a graph-wide update of properties, fix missing port arg in SR_WRITE Noc-Script call, constrain send/recv_frame_size baed on MTU, fix flushing on init/deinit, disable FC ACKs for lossless links * RFNOC/FPGA: Fix rb_stb in split stream block, fix off-by-one error in the window block, fix phase reset and -accumulator for DDC and DUC blocks, fix flushing on split-stream block, fix DC offset issue with DDS by using proper rounding, fix DUC/DDC sample rate switching by latching N on M in axi_rate_change, various fixes to uhd_image_builder, fix MTU settings in blocks, align byte count to 8-byte word * RFNOC: Allow UHD_RFNOC_DIR to contain multiple paths * Python API: Replace Boost.Python with PyBind11, fix benchmark_rate statistics, fix phase alignment test script * Python API: Added include of complex.h to allow pybind to convert complex data types * Python API: Make multi_usrp::get_*_usrp_info() return a Python dict * Python API: Fix array processing in send_waveforms() * UHD: Allow ignoring fallthrough warnings, reduce Boost footprint, remove gpsd dependency, improve streaming, reduced the number of compiler warnings, introduce pop() to the prop tree, add typecast operator from uhd::dict<> to std::map<>, properly cache config file data * MPM/mpmd: Introduce compatible rev numbers to support future hardware, fix some resource leaks in mpmd, fix spurious reclaims causing unnecessary warnings, fix resource leaks in liberio xport, allow to mux data streams over liberio transports (e.g. to require fewer DMA channels on E310), wait for DPDK links to come up before proceeding, relax failure handling when updating components (fixes spurious errors when updating FPGA images over SFP), fix issue where RPC initialization would hang on failure * MPM: Re-enable RPC server timeouts after components have been updated * MPMD: Remove arbitraty frame size defaults for UDP transports * MPMD: Fix incorrect link rate warnings * FPGA: Use new device-tree overlay syntax, upgraded to Vivado 2018.3, broke various paths with critical timing, allow SystemVerilog source files, improve viv_modify_bd and viv_modify_tcl_bd, fix resets on 2clk FIFOs * USB: Allow cancelled USB requests to occur * USB: Fix global session race condition * Logging: Always honour log level, don't log colours for non-ttys, fix includes, demote various log messages, fix logging colours, fix deadlock on Windows machines * Examples: Fix benchmark_rate INIT_DELAY, fix memory leak in tx_samples_c * Examples: Remove thread priority elevation * Examples: Add options to benchmark_rate for start delays and priority * Tests: Make the Python interpreter for devtests a parameter, add unit tests to MPM * Utilities: Fix converter benchmark for Py3k and scaling issue * Tools: Fix kitchen_sink * Tools: Fix Wireshark dissectors to work with WS1, 2, and 3 * Tools: Various fixes to FPGA functional verification tests * Docs: Various fixes, fix Doxygen warnings, fix links to KB, update DPDK information about building libraries, add DPDK subsection about thread priorities, update testing procedures * C API: Add uhd_get_abi_string, uhd_get_version_string * CMake: Make manpage compression optional, allow setting of PKG_DOC_DIR from the CMake commandline, add replay example, fix missing 'project', replace ENABLE_PYTHON3 with a simpler Python detection, clean up superfluous modules, improve log statements, bump dependency min versions, add MPM unit testing, fix missing BIGOBJ for MSVC, add our own UHDBoost.cmake to better find Boost across versions and systems, constrain DPDK check to exact version * Formatting: Apply clang-format to all files, break after template<> @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/04 10:41:44 adam Exp $ d3 1 a3 1 Allow overrides on PKG_DOC_DIR and PKG_MAN_DIR. d6 5 a10 3 --- 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 @@@@ d21 12 @ 1.1 log @uhd: updated to 3.14.1.1 003.014.001.001 Device3: latch n on m in axi_rate_change in DUC/DDC Device3: UART: fix TX <-> RX, FIFO size as parameter Device3: Restore default buffer sizes for MPMD UDP RFNoC: Fix off by one error in window.v E320: fix time source clobbering ref source B200: Add command to query bootloader status RFNoC: fix multidevice graph connections MPMD: Fix corner case in MPM device discovery MPM: fixed mboard_max_revision value (MPM compat check failures) MPM: Fix version string for logger Docs: x300: update docs for multiple timed commands Docs: Fix Doxygen warnings due to spurious backslashes Docs: RFNoC: Fix Doxygen warning due to undoc'd parameter Docs: Adjust FPGA functional verification tests Docs: Fix MPM cmake command for E320 RFNoC: Re-enable flow ctrl for blocks on same xbar Tools: Fix build issues with kitchen_sink cmake: Add UHD_COMPONENT variable @ text @d1 1 a1 1 $NetBSD$ d6 5 a10 5 --- 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) a11 5 -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() d13 2 a14 1 + set(PKG_MAN_DIR share/man/man1) a15 1 d18 1 @