CVS commit: pkgsrc/ham/uhd

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  4 13:18:29 UTC 2025

Modified Files:
        pkgsrc/ham/uhd: Makefile buildlink3.mk distinfo
        pkgsrc/ham/uhd/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/ham/uhd/patches: patch-uhd.pc.in

Log Message:
uhd: remove boost_system references


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/uhd/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/uhd/patches/patch-uhd.pc.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.89 pkgsrc/ham/uhd/Makefile:1.90
--- pkgsrc/ham/uhd/Makefile:1.89        Tue Sep 30 16:23:07 2025
+++ pkgsrc/ham/uhd/Makefile     Sat Oct  4 13:18:29 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2025/09/30 16:23:07 gdt Exp $
+# $NetBSD: Makefile,v 1.90 2025/10/04 13:18:29 tnn Exp $
 
 DISTNAME=      uhd-4.8.0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=EttusResearch/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,9 +11,6 @@ HOMEPAGE=     https://github.com/EttusResear
 COMMENT=       USRP (Universal Software Radio Peripheral) Hardware Drivers
 LICENSE=       gnu-gpl-v3
 
-# This will fail to build with boost 1.89.0:
-#   https://github.com/EttusResearch/uhd/issues/869";
-
 # to avoid extra pax_global_header
 EXTRACT_USING= gtar
 WRKSRC=                ${WRKDIR}/${DISTNAME}/host

Index: pkgsrc/ham/uhd/buildlink3.mk
diff -u pkgsrc/ham/uhd/buildlink3.mk:1.10 pkgsrc/ham/uhd/buildlink3.mk:1.11
--- pkgsrc/ham/uhd/buildlink3.mk:1.10   Sat Sep 27 09:57:24 2025
+++ pkgsrc/ham/uhd/buildlink3.mk        Sat Oct  4 13:18:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2025/09/27 09:57:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2025/10/04 13:18:29 tnn Exp $
 
 BUILDLINK_TREE+=       uhd
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        uhd
 UHD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.uhd+=    uhd>=2.22
-BUILDLINK_ABI_DEPENDS.uhd+=    uhd>=4.8.0.0nb1
+BUILDLINK_ABI_DEPENDS.uhd+=    uhd>=4.8.0.0nb2
 BUILDLINK_PKGSRCDIR.uhd?=      ../../ham/uhd
 
 # gnuradio-uhd FindUHD.cmake uses this env var as a hint for finding uhd

Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.43 pkgsrc/ham/uhd/distinfo:1.44
--- pkgsrc/ham/uhd/distinfo:1.43        Tue Apr 29 09:17:25 2025
+++ pkgsrc/ham/uhd/distinfo     Sat Oct  4 13:18:29 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2025/04/29 09:17:25 tnn Exp $
+$NetBSD: distinfo,v 1.44 2025/10/04 13:18:29 tnn 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) = 97613e3acf75f4cedf26a0ead98c80c110194a94
+SHA1 (patch-CMakeLists.txt) = 559a0c660654505a1221fb434e5b8ee4453d9814
 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
@@ -14,4 +14,5 @@ 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-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.7 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.7     Wed Feb 26 22:05:41 2025
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt Sat Oct  4 13:18:29 2025
@@ -1,11 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2025/02/26 22:05:41 adam Exp $
+$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
+Don't link with removed boost_system.
 
---- CMakeLists.txt.orig        2024-12-11 13:37:26.000000000 +0000
+--- CMakeLists.txt.orig        2025-01-27 14:59:07.000000000 +0000
 +++ CMakeLists.txt
-@@ -131,8 +131,9 @@ endif()
+@@ -147,8 +147,9 @@ endif()
  if(NOT DEFINED PKG_DOC_DIR)
      set(PKG_DOC_DIR share/doc/uhd)
  endif()
@@ -16,3 +17,11 @@ https://github.com/EttusResearch/uhd/iss
  ########################################################################
  # UHD config files
  ########################################################################
+@@ -300,7 +301,6 @@ set(UHD_BOOST_REQUIRED_COMPONENTS
+     date_time
+     filesystem
+     program_options
+-    system
+     serialization
+     thread
+     unit_test_framework

Added files:

Index: pkgsrc/ham/uhd/patches/patch-uhd.pc.in
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-uhd.pc.in:1.1
--- /dev/null   Sat Oct  4 13:18:30 2025
+++ pkgsrc/ham/uhd/patches/patch-uhd.pc.in      Sat Oct  4 13:18:29 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-uhd.pc.in,v 1.1 2025/10/04 13:18:29 tnn Exp $
+
+Don't link with removed boost_system.
+
+--- uhd.pc.in.orig     2025-10-04 13:01:17.558315471 +0000
++++ uhd.pc.in
+@@ -11,5 +11,5 @@ Requires:
+ Requires.private: @UHD_PC_REQUIRES@
+ Conflicts:
+ Cflags: -I${includedir} @UHD_PC_CFLAGS@
+-Libs: -L${libdir} -luhd -lboost_system
++Libs: -L${libdir} -luhd
+ Libs.private: @UHD_PC_LIBS@