CVS commit: pkgsrc/ham/uhd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/ham/uhd
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Tue, 21 Oct 2025 12:06:29 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Oct 21 12:06:29 UTC 2025

Modified Files:
        pkgsrc/ham/uhd: Makefile PLIST distinfo
        pkgsrc/ham/uhd/patches: patch-CMakeLists.txt
            patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp
Removed Files:
        pkgsrc/ham/uhd/patches:
            patch-include_uhd_features_ref__clk__calibration__iface.hpp
            patch-lib_include_uhdlib_usrp_dboard_fbx_fbx__constants.hpp
            patch-uhd.pc.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/ham/uhd/PLIST
cvs rdiff -u -r1.44 -r1.45 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/ham/uhd/patches/patch-include_uhd_features_ref__clk__calibration__iface.hpp \
    pkgsrc/ham/uhd/patches/patch-lib_include_uhdlib_usrp_dboard_fbx_fbx__constants.hpp \
    pkgsrc/ham/uhd/patches/patch-uhd.pc.in
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp

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.91 pkgsrc/ham/uhd/Makefile:1.92
--- pkgsrc/ham/uhd/Makefile:1.91        Thu Oct  9 07:57:43 2025
+++ pkgsrc/ham/uhd/Makefile     Tue Oct 21 12:06:29 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2025/10/09 07:57:43 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2025/10/21 12:06:29 gdt Exp $
 
-DISTNAME=      uhd-4.8.0.0
-PKGREVISION=   2
+DISTNAME=      uhd-4.9.0.1
+#PKGREVISION=  0
 CATEGORIES=    ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=EttusResearch/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/ham/uhd/PLIST
diff -u pkgsrc/ham/uhd/PLIST:1.29 pkgsrc/ham/uhd/PLIST:1.30
--- pkgsrc/ham/uhd/PLIST:1.29   Wed Feb 26 22:05:41 2025
+++ pkgsrc/ham/uhd/PLIST        Tue Oct 21 12:06:29 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2025/02/26 22:05:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2025/10/21 12:06:29 gdt Exp $
 bin/rfnoc_image_builder
 bin/rfnoc_modtool
 bin/uhd_adc_self_cal
@@ -54,6 +54,7 @@ include/uhd/rfnoc/chdr_types.hpp
 include/uhd/rfnoc/constants.hpp
 include/uhd/rfnoc/ddc_block_control.hpp
 include/uhd/rfnoc/defaults.hpp
+include/uhd/rfnoc/detail/graph.hpp
 include/uhd/rfnoc/dirtifier.hpp
 include/uhd/rfnoc/dmafifo_block_control.hpp
 include/uhd/rfnoc/duc_block_control.hpp
@@ -67,12 +68,14 @@ include/uhd/rfnoc/lc_block_control.hpp
 include/uhd/rfnoc/logpwr_block_control.hpp
 include/uhd/rfnoc/mb_controller.hpp
 include/uhd/rfnoc/mock_block.hpp
+include/uhd/rfnoc/mock_nodes.hpp
 include/uhd/rfnoc/moving_average_block_control.hpp
 include/uhd/rfnoc/multichan_register_iface.hpp
 include/uhd/rfnoc/noc_block_base.hpp
 include/uhd/rfnoc/noc_block_make_args.hpp
 include/uhd/rfnoc/node.hpp
 include/uhd/rfnoc/node.ipp
+include/uhd/rfnoc/node_accessor.hpp
 include/uhd/rfnoc/null_block_control.hpp
 include/uhd/rfnoc/property.hpp
 include/uhd/rfnoc/property.ipp
@@ -144,7 +147,6 @@ include/uhd/usrp/dboard_iface.hpp
 include/uhd/usrp/dboard_manager.hpp
 include/uhd/usrp/fe_connection.hpp
 include/uhd/usrp/gpio_defs.hpp
-include/uhd/usrp/gps_ctrl.hpp
 include/uhd/usrp/mboard_eeprom.h
 include/uhd/usrp/mboard_eeprom.hpp
 include/uhd/usrp/multi_usrp.hpp
@@ -163,6 +165,7 @@ include/uhd/utils/byteswap.ipp
 include/uhd/utils/cast.hpp
 include/uhd/utils/chdr/chdr_packet.hpp
 include/uhd/utils/chdr/chdr_packet.ipp
+include/uhd/utils/compat_check.hpp
 include/uhd/utils/csv.hpp
 include/uhd/utils/dirty_tracked.hpp
 include/uhd/utils/fp_compare_delta.ipp
@@ -195,6 +198,7 @@ lib/cmake/uhd/UHDConfig.cmake
 lib/cmake/uhd/UHDConfigVersion.cmake
 lib/cmake/uhd/UHDMinDepVersions.cmake
 lib/cmake/uhd/UHDPython.cmake
+lib/cmake/uhd/UHDUnitTest.cmake
 lib/libuhd.so
 lib/libuhd.so.${MODULE_VERSION}
 lib/pkgconfig/uhd.pc
@@ -213,8 +217,12 @@ ${PYSITELIB}/uhd/rfnoc_utils/connections
 ${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-gr-block.yml
+${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/add-gr-oot.yml
+${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/add-grc.yml
 ${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/add.yml
 ${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/create.yml
+${PYSITELIB}/uhd/rfnoc_utils/modtool_commands/make-yaml.yml
 ${PYSITELIB}/uhd/rfnoc_utils/rfnoc_modtool.py
 ${PYSITELIB}/uhd/rfnoc_utils/step_executor.py
 ${PYSITELIB}/uhd/rfnoc_utils/template.py
@@ -222,7 +230,9 @@ ${PYSITELIB}/uhd/rfnoc_utils/templates/M
 ${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/descriptor.yml.mako
 ${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/functions.mako
+${PYSITELIB}/uhd/rfnoc_utils/templates/blocktool/grc_bindings_template.block.yml.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
@@ -276,6 +286,8 @@ ${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/chips/__init__.py
+${PYSITELIB}/uhd/usrp/chips/max287x.py
 ${PYSITELIB}/uhd/usrp/dram_utils.py
 ${PYSITELIB}/uhd/usrp/libtypes.py
 ${PYSITELIB}/uhd/usrp/multi_usrp.py
@@ -418,13 +430,14 @@ ${PYSITELIB}/usrp_mpm/xports/xportmgr_ud
 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/rfnoc_rx_replay_samples_to_file.py
+lib/uhd/examples/python/rfnoc_rx_to_file.py
+lib/uhd/examples/python/rfnoc_txrx_fft_block_loopback.py
+lib/uhd/examples/python/rx_spectrum_to_asciiplot.py
+lib/uhd/examples/python/rx_spectrum_to_pyplot.py
 lib/uhd/examples/python/rx_to_file.py
+lib/uhd/examples/python/rx_to_remote_udp.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
@@ -455,7 +468,6 @@ lib/uhd/examples/txrx_loopback_to_file
 lib/uhd/examples/usrp_list_sensors
 lib/uhd/tests/actions_test
 lib/uhd/tests/addr_test
-lib/uhd/tests/addsub_block_test
 lib/uhd/tests/adf535x_test
 lib/uhd/tests/block_id_test
 lib/uhd/tests/buffer_test
@@ -472,7 +484,6 @@ lib/uhd/tests/config_parser_test
 lib/uhd/tests/constrained_device_args_test
 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
@@ -493,6 +504,7 @@ lib/uhd/tests/devtest/recv_stability_tes
 lib/uhd/tests/devtest/run_testsuite.py
 lib/uhd/tests/devtest/rx_multi_spc_timed_commands_test.py
 lib/uhd/tests/devtest/rx_samples_to_file_test.py
+lib/uhd/tests/devtest/rx_stream_cmds_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
@@ -503,35 +515,26 @@ lib/uhd/tests/devtest/usrp_probe.py
 lib/uhd/tests/devtest/usrp_probe_test.py
 lib/uhd/tests/dict_test
 lib/uhd/tests/discoverable_feature_test
-lib/uhd/tests/duc_block_test
 lib/uhd/tests/eeprom_c_test
 lib/uhd/tests/eeprom_utils_test
 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/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/ferrum_radio_block_test
 lib/uhd/tests/fp_compare_delta_test
 lib/uhd/tests/fp_compare_epsilon_test
 lib/uhd/tests/gain_group_test
 lib/uhd/tests/interpolation_test
 lib/uhd/tests/isatty_test
-lib/uhd/tests/keep_one_in_n_test
-lib/uhd/tests/lc_block_test
 lib/uhd/tests/link_test
 lib/uhd/tests/lmx2572_test
 lib/uhd/tests/log_test
-lib/uhd/tests/logpwr_block_test
 lib/uhd/tests/math_test
 lib/uhd/tests/max287x_test
 lib/uhd/tests/mb_controller_test
-lib/uhd/tests/moving_average_block_test
 lib/uhd/tests/multichan_register_iface_test
 lib/uhd/tests/narrow_cast_test
-lib/uhd/tests/null_block_test
 lib/uhd/tests/offload_io_srv_test
 lib/uhd/tests/paths_test
 lib/uhd/tests/property_test
@@ -540,8 +543,25 @@ 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
 lib/uhd/tests/rf_control_gain_profile_test
+lib/uhd/tests/rfnoc_block_tests/addsub_block_test
+lib/uhd/tests/rfnoc_block_tests/ddc_block_test
+lib/uhd/tests/rfnoc_block_tests/duc_block_test
+lib/uhd/tests/rfnoc_block_tests/fft_block_test
+lib/uhd/tests/rfnoc_block_tests/fft_block_test_v2
+lib/uhd/tests/rfnoc_block_tests/fir_filter_block_test
+lib/uhd/tests/rfnoc_block_tests/fosphor_block_test
+lib/uhd/tests/rfnoc_block_tests/keep_one_in_n_test
+lib/uhd/tests/rfnoc_block_tests/lc_block_test
+lib/uhd/tests/rfnoc_block_tests/logpwr_block_test
+lib/uhd/tests/rfnoc_block_tests/moving_average_block_test
+lib/uhd/tests/rfnoc_block_tests/null_block_test
+lib/uhd/tests/rfnoc_block_tests/replay_block_test
+lib/uhd/tests/rfnoc_block_tests/siggen_block_test
+lib/uhd/tests/rfnoc_block_tests/split_stream_block_test
+lib/uhd/tests/rfnoc_block_tests/switchboard_block_test
+lib/uhd/tests/rfnoc_block_tests/vector_iir_block_test
+lib/uhd/tests/rfnoc_block_tests/window_block_test
 lib/uhd/tests/rfnoc_chdr_test
 lib/uhd/tests/rfnoc_detailgraph_test
 lib/uhd/tests/rfnoc_node_test
@@ -553,11 +573,9 @@ lib/uhd/tests/scope_exit_test
 lib/uhd/tests/sensors_c_test
 lib/uhd/tests/sensors_test
 lib/uhd/tests/serial_number_test
-lib/uhd/tests/siggen_block_test
 lib/uhd/tests/soft_reg_test
 lib/uhd/tests/sph_recv_test
 lib/uhd/tests/sph_send_test
-lib/uhd/tests/split_stream_block_test
 lib/uhd/tests/streamer_benchmark
 lib/uhd/tests/streaming_performance/batch_run_benchmark_rate.py
 lib/uhd/tests/streaming_performance/parse_benchmark_rate.py
@@ -568,18 +586,17 @@ lib/uhd/tests/streaming_performance/run_
 lib/uhd/tests/string_vector_c_test
 lib/uhd/tests/subdev_spec_c_test
 lib/uhd/tests/subdev_spec_test
-lib/uhd/tests/switchboard_block_test
 lib/uhd/tests/system_time_test
 lib/uhd/tests/tasks_test
 lib/uhd/tests/time_spec_test
+lib/uhd/tests/tmp468_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
@@ -620,13 +637,14 @@ 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/rfnoc-newmodConfig.cmake
 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/include/rfnoc/newmod/config.hpp
 share/uhd/rfnoc-newmod/lib/CMakeLists.txt
 share/uhd/rfnoc-newmod/python/CMakeLists.txt
 share/uhd/rfnoc-newmod/python/pyrfnoc-newmod.cpp
@@ -634,6 +652,10 @@ share/uhd/rfnoc-newmod/python/rfnoc_newm
 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-newmod/rfnoc/fpga/newmod/CMakeLists.txt
+share/uhd/rfnoc-newmod/tests/CMakeLists.txt
+share/uhd/rfnoc-newmod/tests/newmod_block_test.cpp
+share/uhd/rfnoc-newmod/tests/newmod_math_test.cpp
 share/uhd/rfnoc/blocks/addsub.yml
 share/uhd/rfnoc/blocks/axi_ram_fifo.yml
 share/uhd/rfnoc/blocks/ddc.yml

Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.44 pkgsrc/ham/uhd/distinfo:1.45
--- pkgsrc/ham/uhd/distinfo:1.44        Sat Oct  4 13:18:29 2025
+++ pkgsrc/ham/uhd/distinfo     Tue Oct 21 12:06:29 2025
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.44 2025/10/04 13:18:29 tnn Exp $
+$NetBSD: distinfo,v 1.45 2025/10/21 12:06:29 gdt Exp $
 
-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) = 559a0c660654505a1221fb434e5b8ee4453d9814
+BLAKE2s (uhd-4.9.0.1.tar.gz) = 1f39df766608ff580d0a35d393a1be51ceaefad60897f690151c837788b819ef
+SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497
+Size (uhd-4.9.0.1.tar.gz) = 37508709 bytes
 SHA1 (patch-examples_getopt_getopt.c) = f9c7297cb1dcc9438baed9dcdaf0f52b83297e01
 SHA1 (patch-examples_getopt_getopt.h) = 7f01c9385644dbf2b61dfd8bebac8016b46000c5
-SHA1 (patch-include_uhd_features_ref__clk__calibration__iface.hpp) = 08b79958742f3d72e4ac2bc68e8f04540fdf242d
-SHA1 (patch-lib_include_uhdlib_usrp_dboard_fbx_fbx__constants.hpp) = 69b2c7c741681be3298359b04ec2fa889f4fd14c
 SHA1 (patch-lib_rfnoc_vector__iir__block__control.cpp) = d0bc32f888a6cfc30f1eb57d7f2d71bb86cdc284
 SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 5117c7593c4e92ed6bfb86388cc366c41a1dead7
 SHA1 (patch-lib_usrp_common_lmx2592.cpp) = 2828dcf989f1fc43c70e10b8de1e34485066842d
-SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp) = a471808217b56d2175d33c5ca5e4bfc3f8f9f995
+SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp) = c99a05100e482615065e72d4ce586f6484b43925
 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-uhd.pc.in) = 4a6cfea392ccb24840584e22d0e4e0490947d495
 SHA1 (patch-utils_CMakeLists.txt) = 3bc3a4f33956335041a83c392173c0e90bbd9646

Index: pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
diff -u pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.8 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.9
--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.8     Sat Oct  4 13:18:29 2025
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt Tue Oct 21 12:06:29 2025
@@ -1,27 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.8 2025/10/04 13:18:29 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.9 2025/10/21 12:06:29 gdt Exp $
 
 Allow overrides on PKG_MAN_DIR.
 https://github.com/EttusResearch/uhd/issues/301
-Don't link with removed boost_system.
 
---- CMakeLists.txt.orig        2025-01-27 14:59:07.000000000 +0000
+--- CMakeLists.txt.orig        2025-09-01 13:24:04.000000000 +0000
 +++ CMakeLists.txt
-@@ -147,8 +147,9 @@ endif()
- if(NOT DEFINED PKG_DOC_DIR)
-     set(PKG_DOC_DIR share/doc/uhd)
+@@ -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 share/man/man1)
--
++set(PKG_MAN_DIR ${CMAKE_INSTALL_MANDIR}/man1)
 +endif()
+ 
  ########################################################################
  # UHD config files
+=======
  ########################################################################
-@@ -300,7 +301,6 @@ set(UHD_BOOST_REQUIRED_COMPONENTS
-     date_time
-     filesystem
-     program_options
--    system
-     serialization
-     thread
-     unit_test_framework

Index: pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp
diff -u pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp:1.4 pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp:1.5
--- pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp:1.4        Mon Dec 18 22:44:41 2023
+++ pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp    Tue Oct 21 12:06:29 2025
@@ -1,15 +1,20 @@
-$NetBSD: patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp,v 1.4 2023/12/18 22:44:41 mef Exp $
+$NetBSD: patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp,v 1.5 2025/10/21 12:06:29 gdt Exp $
 
 work around namespace pollution in NetBSD-9's <net/if.h> before 1.282
 
---- host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp.orig  2023-11-14 00:22:00.000000000 +0900
-+++ lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp    2023-12-19 07:26:31.730670831 +0900
-@@ -78,10 +78,10 @@ mpmd_link_if_ctrl_udp::udp_link_info_map
-                                           ? std::stoul(link_info.at("link_rate"))
-                                           : MAX_RATE_1GIGE;
+--- lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp.orig       2025-10-13 09:07:19.000000000 +0000
++++ lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp
+@@ -90,7 +90,7 @@ mpmd_link_if_ctrl_udp::udp_link_info_map
+             }
+         }();
          const std::string link_type = link_info.at("type");
--        const size_t if_mtu         = std::stoul(link_info.at("mtu"));
-+        const size_t if_mtu_         = std::stoul(link_info.at("mtu"));
+-        const size_t if_mtu         = [&link_info]() {
++        const size_t if_mtu_         = [&link_info]() {
+             try {
+                 return uhd::cast::from_str<size_t>(link_info.at("mtu"));
+             } catch (const uhd::runtime_error&) {
+@@ -103,7 +103,7 @@ mpmd_link_if_ctrl_udp::udp_link_info_map
+         }();
          result.emplace(link_info.at("ipv4"),
              mpmd_link_if_ctrl_udp::udp_link_info_t{
 -                udp_port, link_rate, link_type, if_mtu});
@@ -17,7 +22,7 @@ work around namespace pollution in NetBS
      }
  
      return result;
-@@ -317,8 +317,8 @@ mpmd_link_if_ctrl_udp::mpmd_link_if_ctrl
+@@ -344,8 +344,8 @@ mpmd_link_if_ctrl_udp::mpmd_link_if_ctrl
              if (info.link_type == "internal") {
                  UHD_LOG_TRACE("MPMD::XPORT::UDP",
                      "MTU for internal interface " << ip_addr << " is "

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index