pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/ham/uhd
Module Name: pkgsrc
Committed By: adam
Date: Wed Feb 26 22:05:42 UTC 2025
Modified Files:
pkgsrc/ham/uhd: Makefile PLIST PLIST.Linux PLIST.x4xx distinfo
pkgsrc/ham/uhd/patches: patch-CMakeLists.txt
Added Files:
pkgsrc/ham/uhd/patches: patch-utils_CMakeLists.txt
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/ham/uhd/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/uhd/PLIST.Linux pkgsrc/ham/uhd/PLIST.x4xx
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/uhd/patches/patch-utils_CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/ham/uhd/Makefile
diff -u pkgsrc/ham/uhd/Makefile:1.83 pkgsrc/ham/uhd/Makefile:1.84
--- pkgsrc/ham/uhd/Makefile:1.83 Wed Jan 8 15:30:27 2025
+++ pkgsrc/ham/uhd/Makefile Wed Feb 26 22:05:41 2025
@@ -1,83 +1,48 @@
-# $NetBSD: Makefile,v 1.83 2025/01/08 15:30:27 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2025/02/26 22:05:41 adam Exp $
-DISTNAME= uhd-4.7.0.0
-PKGREVISION= 2
+DISTNAME= uhd-4.8.0.0
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
-#GITHUB_TAG= v${PKGVERSION_NOREV}
-GITHUB_TAG= e75629c3cfb4d0a654648f775e65e79375cf4f13
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/EttusResearch/uhd
COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers
LICENSE= gnu-gpl-v3
+# to avoid extra pax_global_header
+EXTRACT_USING= gtar
+WRKSRC= ${WRKDIR}/${DISTNAME}/host
+
DEPENDS+= ${PYPKGPREFIX}-mako>=0.4.2:../../devel/py-mako
-# Does not build
-#DEPENDS+= ${PYPKGPREFIX}-numpy>=1.11:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.15:../../devel/py-ruamel-yaml
+USE_CXX_FEATURES= c++17
+USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
+TEST_TARGET= test
+
CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
CMAKE_CONFIGURE_ARGS+= -DENABLE_MAN_PAGE_COMPRESSION=OFF
CMAKE_CONFIGURE_ARGS+= -DPKG_MAN_DIR=${PKGMANDIR}/man1
CMAKE_CONFIGURE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
CMAKE_CONFIGURE_ARGS+= -Wno-dev
-PYTHON_VERSIONS_INCOMPATIBLE= 27
-
.include "../../lang/python/pyversion.mk"
CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON3=ON
-# Upstream says C++11 is required, even though it is not documented.
-# It is documented that gcc 4.8 is required, when using gcc.
-# https://github.com/EttusResearch/uhd/issues/236
-#
-# Upstream does not seem to have any documentation that gnu++11 is
-# required, but it builds with tha and not with c++11 on netbsd-8. No
-# ticket filed because #236 resulted in in-ticket clarification only
-# (and not a doc edit), and having experimented no clarification is
-# needed.
-USE_LANGUAGES= c gnu++14
-USE_TOOLS+= pkg-config
-GCC_REQD+= 4.8
-# to avoid extra pax_global_header
-EXTRACT_USING= gtar
-WRKSRC= ${WRKDIR}/uhd-${GITHUB_TAG}/host
+PY_PATCHPLIST= yes
# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
-REPLACE_PYTHON+= utils/convert_cal_data.py
-REPLACE_PYTHON+= utils/converter_benchmark.py
-REPLACE_PYTHON+= utils/latency/graph.py
-REPLACE_PYTHON+= utils/latency/run_tests.py
-REPLACE_PYTHON+= utils/rfnoc_image_builder.py
-REPLACE_PYTHON+= utils/uhd_images_downloader.py.in
-REPLACE_PYTHON+= utils/uhd_power_cal.py
-REPLACE_PYTHON+= utils/usrp2_card_burner.py
-REPLACE_PYTHON+= utils/usrp2_card_burner_gui.py
-REPLACE_PYTHON+= utils/usrp2_recovery.py
-REPLACE_PYTHON+= utils/usrpctl.py
-REPLACE_PYTHON+= tests/devtest/benchmark_rate_test.py
-REPLACE_PYTHON+= tests/devtest/multi_usrp_clock_test.py
-REPLACE_PYTHON+= tests/devtest/multi_usrp_test.py
-REPLACE_PYTHON+= tests/devtest/python_api_test.py
-REPLACE_PYTHON+= tests/devtest/python_rx_stability_test.py
-REPLACE_PYTHON+= tests/devtest/run_testsuite.py
-REPLACE_PYTHON+= tests/devtest/recv_stability_test.py
-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
-REPLACE_PYTHON+= tests/streaming_performance/batch_run_benchmark_rate.py
-REPLACE_PYTHON+= tests/streaming_performance/run_E3xx_max_rate_tests.py
-REPLACE_PYTHON+= tests/streaming_performance/run_N3xx_max_rate_tests.py
-REPLACE_PYTHON+= tests/streaming_performance/run_X3xx_max_rate_tests.py
+REPLACE_PYTHON+= ../mpm/python/usrp_hwd.py
+REPLACE_PYTHON+= examples/python/*.py
+REPLACE_PYTHON+= tests/devtest/*.py
+REPLACE_PYTHON+= tests/streaming_performance/*.py
+REPLACE_PYTHON+= utils/*.py
+REPLACE_PYTHON+= utils/latency/*.py
# -pthread needed to turn on boost threads on some platforms
CXXFLAGS.SunOS+= -pthread
@@ -93,7 +58,11 @@ PLIST_SUBST+= MODULE_VERSION=${MODULE_V
.include "options.mk"
-.if ${OPSYS} != "Darwin"
+.if ${OPSYS} == "Darwin"
+post-install:
+ install_name_tool -id ${PREFIX}/${PYSITELIB}/uhd/libpyuhd.so \
+ ${DESTDIR}${PREFIX}/${PYSITELIB}/uhd/libpyuhd.so
+.else
PLIST_SRC+= PLIST.x4xx
.endif
@@ -102,7 +71,9 @@ PLIST_SRC+= PLIST.x4xx
.include "../../devel/libusb1/buildlink3.mk"
.include "../../devel/orc/buildlink3.mk"
.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/atomic64.mk"
-FAKE_NCURSES= yes
+FAKE_NCURSES= yes
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/uhd/PLIST
diff -u pkgsrc/ham/uhd/PLIST:1.28 pkgsrc/ham/uhd/PLIST:1.29
--- pkgsrc/ham/uhd/PLIST:1.28 Tue Jan 21 22:03:12 2025
+++ pkgsrc/ham/uhd/PLIST Wed Feb 26 22:05:41 2025
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.28 2025/01/21 22:03:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2025/02/26 22:05:41 adam Exp $
+bin/rfnoc_image_builder
+bin/rfnoc_modtool
bin/uhd_adc_self_cal
bin/uhd_cal_rx_iq_balance
bin/uhd_cal_tx_dc_offset
@@ -9,6 +11,8 @@ bin/uhd_image_loader
bin/uhd_images_downloader
bin/uhd_usrp_probe
bin/usrp2_card_burner
+bin/usrp_hwd.py
+bin/usrpctl
include/uhd.h
include/uhd/build_info.hpp
include/uhd/cal/cal_metadata_generated.h
@@ -194,10 +198,236 @@ lib/cmake/uhd/UHDPython.cmake
lib/libuhd.so
lib/libuhd.so.${MODULE_VERSION}
lib/pkgconfig/uhd.pc
+${PYSITELIB}/uhd/__init__.py
+${PYSITELIB}/uhd/chdr.py
+${PYSITELIB}/uhd/dsp/__init__.py
+${PYSITELIB}/uhd/dsp/signals.py
+${PYSITELIB}/uhd/filters.py
+${PYSITELIB}/uhd/libpyuhd.so
+${PYSITELIB}/uhd/property_tree.py
+${PYSITELIB}/uhd/rfnoc.py
+${PYSITELIB}/uhd/rfnoc_utils/__init__.py
+${PYSITELIB}/uhd/rfnoc_utils/builder_config.py
+${PYSITELIB}/uhd/rfnoc_utils/common.py
+${PYSITELIB}/uhd/rfnoc_utils/connections.py
+${PYSITELIB}/uhd/rfnoc_utils/grc.py
+${PYSITELIB}/uhd/rfnoc_utils/image_builder.py
+${PYSITELIB}/uhd/rfnoc_utils/log.py
+${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/add.yml
+${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/create.yml
+${PYSITELIB}/uhd/rfnoc_utils/rfnoc_modtool.py
+${PYSITELIB}/uhd/rfnoc_utils/step_executor.py
+${PYSITELIB}/uhd/rfnoc_utils/template.py
+${PYSITELIB}/uhd/rfnoc_utils/templates/Makefile.inc.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/CMakeLists.txt.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/Makefile.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/Makefile.srcs.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/functions.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_connect_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_modules_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_wires_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_ctrl_connect_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_ctrl_modules_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_ctrl_wires_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_data_connect_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_data_modules_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_data_wires_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_pyld_ctxt_connect_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_pyld_ctxt_modules_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/axis_pyld_ctxt_wires_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/ctrlport_connect_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/ctrlport_modules_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/modules/ctrlport_wires_template.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/noc_shell_template.sv.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/rfnoc_block_template.sv.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/rfnoc_block_template_tb.sv.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/template_block_control.cpp.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/template_block_control.hpp.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/template_block_control_python.hpp.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/device_tree.dts.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/keyfile.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/chdr_xb_sep_transport.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/connect_clk_domains.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/connect_io_ports.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/ctrl_crossbar.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/device_io_ports.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/device_transport.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/drive_unused_ioports.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/drive_unused_ports.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/module.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/rfnoc_block.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/secure_image_core_inst.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/sep_xb_wires.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/static_router.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/stream_endpoints.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/modules/transport_adapter.v.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/rfnoc_image_core.sv.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/rfnoc_image_core.vh.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/secure_image_core.sv.mako
+${PYSITELIB}/uhd/rfnoc_utils/utils.py
+${PYSITELIB}/uhd/rfnoc_utils/yaml_utils.py
+${PYSITELIB}/uhd/types.py
+${PYSITELIB}/uhd/usrp/__init__.py
+${PYSITELIB}/uhd/usrp/cal/__init__.py
+${PYSITELIB}/uhd/usrp/cal/libtypes.py
+${PYSITELIB}/uhd/usrp/cal/meas_device.py
+${PYSITELIB}/uhd/usrp/cal/ni_rf_instr.py
+${PYSITELIB}/uhd/usrp/cal/switch.py
+${PYSITELIB}/uhd/usrp/cal/tone_gen.py
+${PYSITELIB}/uhd/usrp/cal/usrp_calibrator.py
+${PYSITELIB}/uhd/usrp/cal/visa.py
+${PYSITELIB}/uhd/usrp/dram_utils.py
+${PYSITELIB}/uhd/usrp/libtypes.py
+${PYSITELIB}/uhd/usrp/multi_usrp.py
+${PYSITELIB}/uhd/usrp_clock/__init__.py
+${PYSITELIB}/uhd/usrp_clock/multi_usrp_clock.py
+${PYSITELIB}/uhd/usrpctl/__init__.py
+${PYSITELIB}/uhd/usrpctl/commands/__init__.py
+${PYSITELIB}/uhd/usrpctl/commands/command.py
+${PYSITELIB}/uhd/usrpctl/commands/find.py
+${PYSITELIB}/uhd/usrpctl/commands/probe.py
+${PYSITELIB}/uhd/usrpctl/commands/reset.py
+${PYSITELIB}/uhd/utils/__init__.py
+${PYSITELIB}/uhd/utils/convert_cal_data.py
+${PYSITELIB}/uhd/utils/mpmtools.py
+${PYSITELIB}/uhd/utils/uhd_power_cal.py
+${PYSITELIB}/uhd/utils/version_check.py
+${PYSITELIB}/usrp_mpm/__init__.py
+${PYSITELIB}/usrp_mpm/aurora_control.py
+${PYSITELIB}/usrp_mpm/bfrfs.py
+${PYSITELIB}/usrp_mpm/bist.py
+${PYSITELIB}/usrp_mpm/chips/__init__.py
+${PYSITELIB}/usrp_mpm/chips/adf400x.py
+${PYSITELIB}/usrp_mpm/chips/ds125df410.py
+${PYSITELIB}/usrp_mpm/chips/ic_reg_maps/__init__.py
+${PYSITELIB}/usrp_mpm/chips/lmk03328.py
+${PYSITELIB}/usrp_mpm/chips/lmk04828.py
+${PYSITELIB}/usrp_mpm/chips/lmk04832.py
+${PYSITELIB}/usrp_mpm/chips/lmk05318.py
+${PYSITELIB}/usrp_mpm/chips/lmx2572.py
+${PYSITELIB}/usrp_mpm/chips/max10_cpld_flash_ctrl.py
+${PYSITELIB}/usrp_mpm/compat_num.py
+${PYSITELIB}/usrp_mpm/components.py
+${PYSITELIB}/usrp_mpm/cores/__init__.py
+${PYSITELIB}/usrp_mpm/cores/eyescan.py
+${PYSITELIB}/usrp_mpm/cores/nijesdcore.py
+${PYSITELIB}/usrp_mpm/cores/tdc_sync.py
+${PYSITELIB}/usrp_mpm/cores/white_rabbit.py
+${PYSITELIB}/usrp_mpm/dboard_manager/__init__.py
+${PYSITELIB}/usrp_mpm/dboard_manager/ad936x_db.py
+${PYSITELIB}/usrp_mpm/dboard_manager/adc_rh.py
+${PYSITELIB}/usrp_mpm/dboard_manager/base.py
+${PYSITELIB}/usrp_mpm/dboard_manager/dac_rh.py
+${PYSITELIB}/usrp_mpm/dboard_manager/dboard_iface.py
+${PYSITELIB}/usrp_mpm/dboard_manager/e31x_db.py
+${PYSITELIB}/usrp_mpm/dboard_manager/empty_slot.py
+${PYSITELIB}/usrp_mpm/dboard_manager/fbx.py
+${PYSITELIB}/usrp_mpm/dboard_manager/gain_rh.py
+${PYSITELIB}/usrp_mpm/dboard_manager/gaintables_rh.py
+${PYSITELIB}/usrp_mpm/dboard_manager/lmk_mg.py
+${PYSITELIB}/usrp_mpm/dboard_manager/lmk_rh.py
+${PYSITELIB}/usrp_mpm/dboard_manager/magnesium.py
+${PYSITELIB}/usrp_mpm/dboard_manager/magnesium_update_cpld.py
+${PYSITELIB}/usrp_mpm/dboard_manager/mg_init.py
+${PYSITELIB}/usrp_mpm/dboard_manager/mg_periphs.py
+${PYSITELIB}/usrp_mpm/dboard_manager/neon.py
+${PYSITELIB}/usrp_mpm/dboard_manager/rh_init.py
+${PYSITELIB}/usrp_mpm/dboard_manager/rh_periphs.py
+${PYSITELIB}/usrp_mpm/dboard_manager/rhodium.py
+${PYSITELIB}/usrp_mpm/dboard_manager/rhodium_update_cpld.py
+${PYSITELIB}/usrp_mpm/dboard_manager/test.py
+${PYSITELIB}/usrp_mpm/dboard_manager/unknown.py
+${PYSITELIB}/usrp_mpm/dboard_manager/x4xx_db.py
+${PYSITELIB}/usrp_mpm/dboard_manager/x4xx_db_iface.py
+${PYSITELIB}/usrp_mpm/dboard_manager/x4xx_debug_db.py
+${PYSITELIB}/usrp_mpm/dboard_manager/x4xx_if_test_cca.py
+${PYSITELIB}/usrp_mpm/dboard_manager/zbx.py
+${PYSITELIB}/usrp_mpm/dboard_manager/zbx_update_cpld.py
+${PYSITELIB}/usrp_mpm/discovery.py
+${PYSITELIB}/usrp_mpm/e31x_legacy_eeprom.py
+${PYSITELIB}/usrp_mpm/eeprom.py
+${PYSITELIB}/usrp_mpm/ethdispatch.py
+${PYSITELIB}/usrp_mpm/fpga_bit_to_bin.py
+${PYSITELIB}/usrp_mpm/gpsd_iface.py
+${PYSITELIB}/usrp_mpm/mpmlog.py
+${PYSITELIB}/usrp_mpm/mpmtypes.py
+${PYSITELIB}/usrp_mpm/mpmutils.py
+${PYSITELIB}/usrp_mpm/periph_manager/__init__.py
+${PYSITELIB}/usrp_mpm/periph_manager/base.py
+${PYSITELIB}/usrp_mpm/periph_manager/common.py
+${PYSITELIB}/usrp_mpm/periph_manager/e31x.py
+${PYSITELIB}/usrp_mpm/periph_manager/e31x_periphs.py
+${PYSITELIB}/usrp_mpm/periph_manager/e320.py
+${PYSITELIB}/usrp_mpm/periph_manager/e320_periphs.py
+${PYSITELIB}/usrp_mpm/periph_manager/n3xx.py
+${PYSITELIB}/usrp_mpm/periph_manager/n3xx_periphs.py
+${PYSITELIB}/usrp_mpm/periph_manager/sim.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clk_aux.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clock_ctrl.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clock_lookup.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clock_mgr.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clock_policy.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_clock_types.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_dio_control.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_gps_mgr.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_mb_cpld.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_periphs.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_reference_pll.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_rfdc_regs.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_sample_pll.py
+${PYSITELIB}/usrp_mpm/periph_manager/x4xx_update_cpld.py
+${PYSITELIB}/usrp_mpm/prefs.py
+${PYSITELIB}/usrp_mpm/process_manager.py
+${PYSITELIB}/usrp_mpm/rpc_server.py
+${PYSITELIB}/usrp_mpm/rpc_utils.py
+${PYSITELIB}/usrp_mpm/simulator/__init__.py
+${PYSITELIB}/usrp_mpm/simulator/chdr_endpoint.py
+${PYSITELIB}/usrp_mpm/simulator/chdr_stream.py
+${PYSITELIB}/usrp_mpm/simulator/config.py
+${PYSITELIB}/usrp_mpm/simulator/hardware_presets.py
+${PYSITELIB}/usrp_mpm/simulator/noc_block_regs.py
+${PYSITELIB}/usrp_mpm/simulator/rfnoc_common.py
+${PYSITELIB}/usrp_mpm/simulator/rfnoc_graph.py
+${PYSITELIB}/usrp_mpm/simulator/sample_source.py
+${PYSITELIB}/usrp_mpm/simulator/sim_dboard.py
+${PYSITELIB}/usrp_mpm/simulator/stream_endpoint_node.py
+${PYSITELIB}/usrp_mpm/simulator/stream_ep_regs.py
+${PYSITELIB}/usrp_mpm/sys_utils/__init__.py
+${PYSITELIB}/usrp_mpm/sys_utils/db_flash.py
+${PYSITELIB}/usrp_mpm/sys_utils/dtoverlay.py
+${PYSITELIB}/usrp_mpm/sys_utils/ectool.py
+${PYSITELIB}/usrp_mpm/sys_utils/filesystem_status.py
+${PYSITELIB}/usrp_mpm/sys_utils/gpio.py
+${PYSITELIB}/usrp_mpm/sys_utils/i2c_dev.py
+${PYSITELIB}/usrp_mpm/sys_utils/mount.py
+${PYSITELIB}/usrp_mpm/sys_utils/net.py
+${PYSITELIB}/usrp_mpm/sys_utils/sysfs_gpio.py
+${PYSITELIB}/usrp_mpm/sys_utils/sysfs_thermal.py
+${PYSITELIB}/usrp_mpm/sys_utils/udev.py
+${PYSITELIB}/usrp_mpm/sys_utils/uio.py
+${PYSITELIB}/usrp_mpm/sys_utils/watchdog.py
+${PYSITELIB}/usrp_mpm/test_bfrfs.py
+${PYSITELIB}/usrp_mpm/tlv_eeprom.py
+${PYSITELIB}/usrp_mpm/user_eeprom.py
+${PYSITELIB}/usrp_mpm/xports/__init__.py
+${PYSITELIB}/usrp_mpm/xports/xport_adapter_ctrl.py
+${PYSITELIB}/usrp_mpm/xports/xport_adapter_mgr.py
+${PYSITELIB}/usrp_mpm/xports/xportmgr_udp.py
lib/uhd/examples/benchmark_rate
lib/uhd/examples/gpio
lib/uhd/examples/latency_test
lib/uhd/examples/network_relay
+lib/uhd/examples/python/benchmark_rate.py
+lib/uhd/examples/python/curses_fft.py
+lib/uhd/examples/python/fft_loopback.py
+lib/uhd/examples/python/remote_rx.py
+lib/uhd/examples/python/replay_capture.py
+lib/uhd/examples/python/rx_to_file.py
+lib/uhd/examples/python/tx_waveforms.py
+lib/uhd/examples/python/usrp_power_meter.py
+lib/uhd/examples/python/x440_L_band_capture.py
lib/uhd/examples/rfnoc_nullsource_ce_rx
lib/uhd/examples/rfnoc_radio_loopback
lib/uhd/examples/rfnoc_replay_samples_from_file
@@ -243,6 +473,7 @@ lib/uhd/tests/constrained_device_args_te
lib/uhd/tests/convert_test
lib/uhd/tests/custom_reg_test
lib/uhd/tests/ddc_block_test
+lib/uhd/tests/device_addr_test.py
lib/uhd/tests/devtest/benchmark_rate_test.py
lib/uhd/tests/devtest/bitbang_test.py
lib/uhd/tests/devtest/devtest_b2xx.py
@@ -279,8 +510,8 @@ lib/uhd/tests/error_c_test
lib/uhd/tests/error_test
lib/uhd/tests/expert_test
lib/uhd/tests/fe_conn_test
-lib/uhd/tests/ferrum_radio_block_test
lib/uhd/tests/fft_block_test
+lib/uhd/tests/fft_block_test_v2
lib/uhd/tests/fir_filter_block_test
lib/uhd/tests/fosphor_block_test
lib/uhd/tests/fp_compare_delta_test
@@ -305,6 +536,8 @@ lib/uhd/tests/offload_io_srv_test
lib/uhd/tests/paths_test
lib/uhd/tests/property_test
lib/uhd/tests/pwr_cal_mgr_test
+lib/uhd/tests/pychdr_parse_test.py
+lib/uhd/tests/pyranges_test.py
lib/uhd/tests/ranges_c_test
lib/uhd/tests/ranges_test
lib/uhd/tests/replay_block_test
@@ -341,15 +574,15 @@ lib/uhd/tests/tasks_test
lib/uhd/tests/time_spec_test
lib/uhd/tests/transport_test
lib/uhd/tests/tx_streamer_test
+lib/uhd/tests/uhd_image_downloader_test.py
lib/uhd/tests/vector_iir_block_test
+lib/uhd/tests/verify_fbs_test.py
lib/uhd/tests/vrt_test
lib/uhd/tests/window_block_test
lib/uhd/tests/x400_rfdc_control_test
-lib/uhd/tests/x4xx_radio_block_test
lib/uhd/tests/xport_adapter_ctrl_test
lib/uhd/tests/zbx_cpld_test
lib/uhd/utils/b2xx_fx3_utils
-lib/uhd/utils/convert_cal_data.py
lib/uhd/utils/converter_benchmark
lib/uhd/utils/converter_benchmark.py
lib/uhd/utils/fx2_init_eeprom
@@ -359,7 +592,6 @@ lib/uhd/utils/latency/run_tests.py
lib/uhd/utils/octoclock_burn_eeprom
lib/uhd/utils/query_gpsdo_sensors
lib/uhd/utils/uhd_images_downloader.py
-lib/uhd/utils/uhd_power_cal.py
lib/uhd/utils/usrp2_card_burner.py
lib/uhd/utils/usrp2_recovery.py
lib/uhd/utils/usrp_burn_db_eeprom
@@ -377,17 +609,36 @@ man/man1/uhd_images_downloader.1
man/man1/uhd_usrp_probe.1
man/man1/usrp2_card_burner.1
man/man1/usrp_n2xx_simple_net_burner.1
+man/man1/usrpctl.1
share/doc/uhd/LICENSE
share/doc/uhd/README.md
share/uhd/cal/cal_metadata.fbs
share/uhd/cal/dsa_cal.fbs
share/uhd/cal/iq_cal.fbs
share/uhd/cal/pwr_cal.fbs
+share/uhd/rfnoc-newmod/.gitignore
+share/uhd/rfnoc-newmod/CMakeLists.txt
+share/uhd/rfnoc-newmod/README.md
+share/uhd/rfnoc-newmod/apps/CMakeLists.txt
+share/uhd/rfnoc-newmod/cmake/Modules/run_testbench.sh.in
+share/uhd/rfnoc-newmod/cmake/cmake_uninstall.cmake.in
+share/uhd/rfnoc-newmod/examples/CMakeLists.txt
+share/uhd/rfnoc-newmod/fpga/newmod/CMakeLists.txt
+share/uhd/rfnoc-newmod/icores/.gitignore
+share/uhd/rfnoc-newmod/icores/CMakeLists.txt
+share/uhd/rfnoc-newmod/include/rfnoc/newmod/CMakeLists.txt
+share/uhd/rfnoc-newmod/lib/CMakeLists.txt
+share/uhd/rfnoc-newmod/python/CMakeLists.txt
+share/uhd/rfnoc-newmod/python/pyrfnoc-newmod.cpp
+share/uhd/rfnoc-newmod/python/rfnoc_newmod/__init__.py
+share/uhd/rfnoc-newmod/python/setup.py.in
+share/uhd/rfnoc-newmod/rfnoc/CMakeLists.txt
+share/uhd/rfnoc-newmod/rfnoc/blocks/CMakeLists.txt
share/uhd/rfnoc/blocks/addsub.yml
share/uhd/rfnoc/blocks/axi_ram_fifo.yml
share/uhd/rfnoc/blocks/ddc.yml
share/uhd/rfnoc/blocks/duc.yml
-share/uhd/rfnoc/blocks/fft_1x64.yml
+share/uhd/rfnoc/blocks/fft.yml
share/uhd/rfnoc/blocks/fir_filter.yml
share/uhd/rfnoc/blocks/fosphor.yml
share/uhd/rfnoc/blocks/keep_one_in_n.yml
Index: pkgsrc/ham/uhd/PLIST.Linux
diff -u pkgsrc/ham/uhd/PLIST.Linux:1.1 pkgsrc/ham/uhd/PLIST.Linux:1.2
--- pkgsrc/ham/uhd/PLIST.Linux:1.1 Sat Aug 1 03:58:54 2020
+++ pkgsrc/ham/uhd/PLIST.Linux Wed Feb 26 22:05:41 2025
@@ -1,5 +1,2 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2020/08/01 03:58:54 tnn Exp $
-bin/uhd_images_downloader
-bin/usrp2_card_burner
+@comment $NetBSD: PLIST.Linux,v 1.2 2025/02/26 22:05:41 adam Exp $
lib/uhd/utils/uhd-usrp.rules
-lib/uhd/utils/usrp2_recovery.py
Index: pkgsrc/ham/uhd/PLIST.x4xx
diff -u pkgsrc/ham/uhd/PLIST.x4xx:1.1 pkgsrc/ham/uhd/PLIST.x4xx:1.2
--- pkgsrc/ham/uhd/PLIST.x4xx:1.1 Tue Oct 4 09:45:53 2022
+++ pkgsrc/ham/uhd/PLIST.x4xx Wed Feb 26 22:05:41 2025
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.x4xx,v 1.1 2022/10/04 09:45:53 wiz Exp $
+@comment $NetBSD: PLIST.x4xx,v 1.2 2025/02/26 22:05:41 adam Exp $
+lib/uhd/tests/ferrum_radio_block_test
lib/uhd/tests/x4xx_radio_block_test
Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.41 pkgsrc/ham/uhd/distinfo:1.42
--- pkgsrc/ham/uhd/distinfo:1.41 Wed Jan 8 15:30:27 2025
+++ pkgsrc/ham/uhd/distinfo Wed Feb 26 22:05:41 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2025/01/08 15:30:27 tnn Exp $
+$NetBSD: distinfo,v 1.42 2025/02/26 22:05:41 adam Exp $
-BLAKE2s (uhd-4.7.0.0-e75629c3cfb4d0a654648f775e65e79375cf4f13.tar.gz) = cd639ebceb7928d482041d935a3d35a3d49e8b0ce1a51191e48d286a5dc2c7af
-SHA512 (uhd-4.7.0.0-e75629c3cfb4d0a654648f775e65e79375cf4f13.tar.gz) = 21e788f013b2829ddb905432255b258cd34604218b9fd26b5095c9e58f4a4a6ac05a7c8ea1b2ef948838c2f9b39895e45b00dd895e772c7062bcd1b6a006ef27
-Size (uhd-4.7.0.0-e75629c3cfb4d0a654648f775e65e79375cf4f13.tar.gz) = 41266560 bytes
-SHA1 (patch-CMakeLists.txt) = e53b04bff05f14583349e855e85b1a3f52b91f9a
+BLAKE2s (uhd-4.8.0.0.tar.gz) = 8855f7a555f6e8e2138c2699577b3e18ad4591a311914f8f4dfab64add665a65
+SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7
+Size (uhd-4.8.0.0.tar.gz) = 41358938 bytes
+SHA1 (patch-CMakeLists.txt) = 97613e3acf75f4cedf26a0ead98c80c110194a94
SHA1 (patch-examples_getopt_getopt.c) = f9c7297cb1dcc9438baed9dcdaf0f52b83297e01
SHA1 (patch-examples_getopt_getopt.h) = 7f01c9385644dbf2b61dfd8bebac8016b46000c5
SHA1 (patch-lib_rfnoc_vector__iir__block__control.cpp) = d0bc32f888a6cfc30f1eb57d7f2d71bb86cdc284
@@ -12,3 +12,4 @@ SHA1 (patch-lib_usrp_common_lmx2592.cpp)
SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp) = a471808217b56d2175d33c5ca5e4bfc3f8f9f995
SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.hpp) = 3106d28c4ddc38fd304eb94de5773ff56fed0fd8
SHA1 (patch-tests_rfnoc__block__tests_vector__iir__block__test.cpp) = 5d9594ce208acd8668589b117dd58d6b1a09de3a
+SHA1 (patch-utils_CMakeLists.txt) = 3bc3a4f33956335041a83c392173c0e90bbd9646
Index: pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
diff -u pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.6 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.6 Wed Jan 8 15:30:27 2025
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt Wed Feb 26 22:05:41 2025
@@ -1,10 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2025/01/08 15:30:27 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2025/02/26 22:05:41 adam Exp $
Allow overrides on PKG_MAN_DIR.
https://github.com/EttusResearch/uhd/issues/301
-Do not use Numpy.
-
--- CMakeLists.txt.orig 2024-12-11 13:37:26.000000000 +0000
+++ CMakeLists.txt
@@ -131,8 +131,9 @@ endif()
@@ -18,18 +16,3 @@ Do not use Numpy.
########################################################################
# UHD config files
########################################################################
-@@ -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__"
Added files:
Index: pkgsrc/ham/uhd/patches/patch-utils_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-utils_CMakeLists.txt:1.1
--- /dev/null Wed Feb 26 22:05:42 2025
+++ pkgsrc/ham/uhd/patches/patch-utils_CMakeLists.txt Wed Feb 26 22:05:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-utils_CMakeLists.txt,v 1.1 2025/02/26 22:05:41 adam Exp $
+
+Install utils also on Darwin.
+
+--- utils/CMakeLists.txt.orig 2025-02-26 21:49:22.640572557 +0000
++++ utils/CMakeLists.txt
+@@ -70,7 +70,7 @@ endif(ENABLE_PYMOD_UTILS)
+ # Now, utilities which do not depend on Mako or ruamel.yaml
+ ########################################################################
+ # Decide if we install all utilities into the runtime path
+-if(LINUX OR BSD OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
++if(APPLE OR LINUX OR BSD OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+ set(UHD_INSTALL_ALL_UTILS TRUE)
+ else()
+ set(UHD_INSTALL_ALL_UTILS FALSE)
Home |
Main Index |
Thread Index |
Old Index