CVS commit: pkgsrc/ham/freedv

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Dec 14 23:56:56 UTC 2021

Modified Files:
        pkgsrc/ham/freedv: distinfo
Added Files:
        pkgsrc/ham/freedv/patches: patch-src_hamlib.cpp

Log Message:
ham/freedv: Patch undefined constant, likely from hamlib

freedv uses FILPATHLEN, which is undefined, and not apparently POSIX.
hamlib defines HAMLIB_FILPATHLEN.  Speculate that hamlib used to not
namespace the constant, that hamlib has been updated, and freedv not,
and patch freedv to match.  freedv is due for an update anyway, and
this can be upstreamed then if it is still an issue.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/freedv/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/freedv/patches/patch-src_hamlib.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/freedv/distinfo
diff -u pkgsrc/ham/freedv/distinfo:1.8 pkgsrc/ham/freedv/distinfo:1.9
--- pkgsrc/ham/freedv/distinfo:1.8      Tue Oct 26 10:48:38 2021
+++ pkgsrc/ham/freedv/distinfo  Tue Dec 14 23:56:56 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:48:38 nia Exp $
+$NetBSD: distinfo,v 1.9 2021/12/14 23:56:56 gdt Exp $
 
 BLAKE2s (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 99e09f474f7c41b23aac1be374d06a6e1295ad3e658152dead9adc7778096e8c
 SHA512 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 
fc7589606a208938129ad622966fa108e4c1ee84a86273a1b33705331282e811f7891bbc47528e475742a9b78f4dbc78cc1d84c13e1784b7923de9babf60171d
@@ -6,3 +6,4 @@ Size (freedv-1.4.2-bb9558cc496b7b253fb54
 SHA1 (patch-cmake_FindPortaudio.cmake) = 1105012bc3287bd5044250ad6f1c4609cbf7c217
 SHA1 (patch-src_CMakeLists.txt) = 05636fb3c3f836fb8287b16147f5e99a745fb265
 SHA1 (patch-src_fdmdv2__main.cpp) = b002f17ecbe8f3091a10bd6854b0400ce50d3105
+SHA1 (patch-src_hamlib.cpp) = fb70eea89bee4df588159018d7ddf2462eff988d

Added files:

Index: pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp
diff -u /dev/null pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp:1.1
--- /dev/null   Tue Dec 14 23:56:56 2021
+++ pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp      Tue Dec 14 23:56:56 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hamlib.cpp,v 1.1 2021/12/14 23:56:56 gdt Exp $
+
+Fix semi-obvious use of wrong constant.  Perhaps hamlib has prefixed the
+constant to avoid collisions, since this freedv release.  Not reported
+upstream because the package is not up to date.
+ 
+--- src/hamlib.cpp.orig        2020-07-18 23:16:05.000000000 +0000
++++ src/hamlib.cpp
+@@ -114,7 +114,7 @@ bool Hamlib::connect(unsigned int rig_in
+ 
+     /* TODO we may also need civaddr for Icom */
+ 
+-    strncpy(m_rig->state.rigport.pathname, serial_port, FILPATHLEN - 1);
++    strncpy(m_rig->state.rigport.pathname, serial_port, HAMLIB_FILPATHLEN - 1);
+     if (serial_rate) {
+         fprintf(stderr, "hamlib: setting serial rate: %d\n", serial_rate);
+         m_rig->state.rigport.parm.serial.rate = serial_rate;