CVS commit: pkgsrc/ham/uhd

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon May  8 18:18:50 UTC 2023

Modified Files:
        pkgsrc/ham/uhd: distinfo
        pkgsrc/ham/uhd/patches:
            patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp
Added Files:
        pkgsrc/ham/uhd/patches:
            patch-lib_include_uhdlib_utils_compat__check.hpp

Log Message:
uhd: fix build with GCC13


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/ham/uhd/patches/patch-lib_include_uhdlib_utils_compat__check.hpp
cvs rdiff -u -r1.2 -r1.3 \
    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/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.35 pkgsrc/ham/uhd/distinfo:1.36
--- pkgsrc/ham/uhd/distinfo:1.35        Fri Feb  3 21:19:55 2023
+++ pkgsrc/ham/uhd/distinfo     Mon May  8 18:18:50 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2023/02/03 21:19:55 adam Exp $
+$NetBSD: distinfo,v 1.36 2023/05/08 18:18:50 tnn Exp $
 
 BLAKE2s (uhd-4.4.0.0.tar.gz) = 3657d5be4f310a8e07bf6c739c6d57f5d84a9ea337f00b855f26cd9e2d0429fb
 SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
@@ -7,9 +7,10 @@ SHA1 (patch-CMakeLists.txt) = 91784faf3e
 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_include_uhdlib_utils_compat__check.hpp) = 3ebd8250071e92ce701fd1328357aa590a1151a6
 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) = fa58dd75c52bddde4dbc25588be6f6a37eedbdfe
+SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp) = b4db60cd2eefbc0f36c2647376ddb53b8c4bff19
 SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.hpp) = 3106d28c4ddc38fd304eb94de5773ff56fed0fd8
 SHA1 (patch-tests_rfnoc__block__tests_vector__iir__block__test.cpp) = 5d9594ce208acd8668589b117dd58d6b1a09de3a

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.2 pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp:1.3
--- pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp:1.2        Fri Sep 30 18:12:44 2022
+++ pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp    Mon May  8 18:18:50 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp,v 1.2 2022/09/30 18:12:44 adam Exp $
+$NetBSD: patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp,v 1.3 2023/05/08 18:18:50 tnn Exp $
+
+work around namespace pollution in NetBSD-9's <net/if.h> before 1.282
 
 --- lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp.orig       2022-09-14 14:19:33.000000000 +0000
 +++ lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp

Added files:

Index: pkgsrc/ham/uhd/patches/patch-lib_include_uhdlib_utils_compat__check.hpp
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-lib_include_uhdlib_utils_compat__check.hpp:1.1
--- /dev/null   Mon May  8 18:18:50 2023
+++ pkgsrc/ham/uhd/patches/patch-lib_include_uhdlib_utils_compat__check.hpp     Mon May  8 18:18:50 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_include_uhdlib_utils_compat__check.hpp,v 1.1 2023/05/08 18:18:50 tnn Exp $
+
+Complains about missing uint8_t with GCC 13 on Fedora 38.
+
+--- lib/include/uhdlib/utils/compat_check.hpp.orig     2023-01-27 21:17:39.000000000 +0000
++++ lib/include/uhdlib/utils/compat_check.hpp
+@@ -8,6 +8,7 @@
+ 
+ #include <cstddef>
+ #include <string>
++#include <cinttypes>
+ 
+ namespace uhd {
+