CVS commit: pkgsrc/ham/uhd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/ham/uhd
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Wed, 8 Jan 2025 15:30:27 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Jan  8 15:30:27 UTC 2025

Modified Files:
        pkgsrc/ham/uhd: Makefile PLIST distinfo
        pkgsrc/ham/uhd/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/ham/uhd/patches:
            patch-examples_rfnoc-example_cmake_Modules_run__testbench.sh.in

Log Message:
uhd: update to snapshot to deal with boost 1.87 fallout

See upstream commit adfe953d965e58b5931c1b1968899492c8087cf6


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/uhd/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/ham/uhd/patches/patch-examples_rfnoc-example_cmake_Modules_run__testbench.sh.in

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.82 pkgsrc/ham/uhd/Makefile:1.83
--- pkgsrc/ham/uhd/Makefile:1.82        Sun Dec 29 15:09:53 2024
+++ pkgsrc/ham/uhd/Makefile     Wed Jan  8 15:30:27 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.82 2024/12/29 15:09:53 adam Exp $
+# $NetBSD: Makefile,v 1.83 2025/01/08 15:30:27 tnn Exp $
 
 DISTNAME=      uhd-4.7.0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=EttusResearch/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+#GITHUB_TAG=   v${PKGVERSION_NOREV}
+GITHUB_TAG=    e75629c3cfb4d0a654648f775e65e79375cf4f13
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/EttusResearch/uhd
@@ -44,7 +45,7 @@ USE_TOOLS+=           pkg-config
 GCC_REQD+=             4.8
 # to avoid extra pax_global_header
 EXTRACT_USING=         gtar
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/host
+WRKSRC=                        ${WRKDIR}/uhd-${GITHUB_TAG}/host
 
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON+=       utils/convert_cal_data.py
@@ -59,6 +60,7 @@ REPLACE_PYTHON+=      utils/usrp2_card_burner
 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

Index: pkgsrc/ham/uhd/PLIST
diff -u pkgsrc/ham/uhd/PLIST:1.26 pkgsrc/ham/uhd/PLIST:1.27
--- pkgsrc/ham/uhd/PLIST:1.26   Mon Oct  7 20:55:47 2024
+++ pkgsrc/ham/uhd/PLIST        Wed Jan  8 15:30:27 2025
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2024/10/07 20:55:47 mef Exp $
-bin/rfnoc_image_builder
+@comment $NetBSD: PLIST,v 1.27 2025/01/08 15:30:27 tnn Exp $
 bin/uhd_adc_self_cal
 bin/uhd_cal_rx_iq_balance
 bin/uhd_cal_tx_dc_offset
@@ -7,7 +6,9 @@ bin/uhd_cal_tx_iq_balance
 bin/uhd_config_info
 bin/uhd_find_devices
 bin/uhd_image_loader
+bin/uhd_images_downloader
 bin/uhd_usrp_probe
+bin/usrp2_card_burner
 include/uhd.h
 include/uhd/build_info.hpp
 include/uhd/cal/cal_metadata_generated.h
@@ -188,6 +189,8 @@ include/uhd/version.hpp
 lib/cmake/uhd/UHDBoost.cmake
 lib/cmake/uhd/UHDConfig.cmake
 lib/cmake/uhd/UHDConfigVersion.cmake
+lib/cmake/uhd/UHDMinDepVersions.cmake
+lib/cmake/uhd/UHDPython.cmake
 lib/libuhd.so
 lib/libuhd.so.${MODULE_VERSION}
 lib/pkgconfig/uhd.pc
@@ -251,6 +254,7 @@ lib/uhd/tests/devtest/devtest_x410.py
 lib/uhd/tests/devtest/devtest_x440.py
 lib/uhd/tests/devtest/gpio_test.py
 lib/uhd/tests/devtest/list_sensors_test.py
+lib/uhd/tests/devtest/multi_usrp_clock_test.py
 lib/uhd/tests/devtest/multi_usrp_test.py
 lib/uhd/tests/devtest/python_api_test.py
 lib/uhd/tests/devtest/python_rx_stability_test.py
@@ -354,11 +358,16 @@ lib/uhd/utils/latency/responder
 lib/uhd/utils/latency/run_tests.py
 lib/uhd/utils/octoclock_burn_eeprom
 lib/uhd/utils/query_gpsdo_sensors
+lib/uhd/utils/uhd-usrp.rules
 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
 lib/uhd/utils/usrp_burn_mb_eeprom
+man/man1/rfnoc_image_builder.1
+man/man1/rfnoc_modtool.1
+man/man1/uhd_adc_self_cal.1
 man/man1/uhd_cal_rx_iq_balance.1
 man/man1/uhd_cal_tx_dc_offset.1
 man/man1/uhd_cal_tx_iq_balance.1

Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.40 pkgsrc/ham/uhd/distinfo:1.41
--- pkgsrc/ham/uhd/distinfo:1.40        Mon Oct  7 20:55:47 2024
+++ pkgsrc/ham/uhd/distinfo     Wed Jan  8 15:30:27 2025
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.40 2024/10/07 20:55:47 mef Exp $
+$NetBSD: distinfo,v 1.41 2025/01/08 15:30:27 tnn Exp $
 
-BLAKE2s (uhd-4.7.0.0.tar.gz) = 142576ecc2b2acd76416c92b3f20997c4e35873a976d9f206f9019e76e19167c
-SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb
-Size (uhd-4.7.0.0.tar.gz) = 41128157 bytes
-SHA1 (patch-CMakeLists.txt) = 91784faf3eab2eb7f3340a2b05f7f89da1e0fada
+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
 SHA1 (patch-examples_getopt_getopt.c) = f9c7297cb1dcc9438baed9dcdaf0f52b83297e01
 SHA1 (patch-examples_getopt_getopt.h) = 7f01c9385644dbf2b61dfd8bebac8016b46000c5
-SHA1 (patch-examples_rfnoc-example_cmake_Modules_run__testbench.sh.in) = f3c5c350abc82e0821eff45f00f4d1a0a1c7472b
 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

Index: pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
diff -u pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.5 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.5     Fri Sep 30 18:12:44 2022
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt Wed Jan  8 15:30:27 2025
@@ -1,13 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2022/09/30 18:12:44 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2025/01/08 15:30:27 tnn Exp $
 
 Allow overrides on PKG_MAN_DIR.
 https://github.com/EttusResearch/uhd/issues/301
 
 Do not use Numpy.
 
---- CMakeLists.txt.orig        2022-09-14 14:19:33.000000000 +0000
+--- CMakeLists.txt.orig        2024-12-11 13:37:26.000000000 +0000
 +++ CMakeLists.txt
-@@ -127,8 +127,9 @@ endif()
+@@ -131,8 +131,9 @@ endif()
  if(NOT DEFINED PKG_DOC_DIR)
      set(PKG_DOC_DIR share/doc/uhd)
  endif()
@@ -18,18 +18,18 @@ Do not use Numpy.
  ########################################################################
  # UHD config files
  ########################################################################
-@@ -337,14 +338,6 @@ PYTHON_CHECK_MODULE_VERSION(
+@@ -341,14 +342,6 @@ UHD_PYTHON_CHECK_MODULE_VERSION(
  )
  
- PYTHON_CHECK_MODULE_VERSION(
+ UHD_PYTHON_CHECK_MODULE_VERSION(
 -    "numpy module"
 -    "numpy"
 -    "numpy.__version__"
--    ${NUMPY_MIN_VERSION}
+-    ${UHD_NUMPY_MIN_VERSION}
 -    HAVE_PYTHON_MODULE_NUMPY
 -)
 -
--PYTHON_CHECK_MODULE_VERSION(
+-UHD_PYTHON_CHECK_MODULE_VERSION(
      "ruamel.yaml module"
      "ruamel.yaml"
      "ruamel.yaml.__version__"

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

Home | Main Index | Thread Index | Old Index