CVS commit: pkgsrc/ham/freedv

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jan 13 23:02:50 UTC 2025

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

Log Message:
ham/freedv: Update to 1.9.9.2

Packaging change: Accomodate hamlib 4.6 API break, filed upstream.

Upstream changes are bugfixes and a lot of minor enhancements: - new
modes - GUI niceties but nothing that seems disruptive, based on
trying to scan upstream's ChangeLog-style notes because they lack
NEWS.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/ham/freedv/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/ham/freedv/distinfo
cvs rdiff -u -r1.1 -r1.2 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/Makefile
diff -u pkgsrc/ham/freedv/Makefile:1.40 pkgsrc/ham/freedv/Makefile:1.41
--- pkgsrc/ham/freedv/Makefile:1.40     Fri Dec 27 08:20:04 2024
+++ pkgsrc/ham/freedv/Makefile  Mon Jan 13 23:02:50 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2024/12/27 08:20:04 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2025/01/13 23:02:50 gdt Exp $
 
-DISTNAME=      freedv-1.4.2
-PKGREVISION=   16
+DISTNAME=      freedv-1.9.9.2
 CATEGORIES=    ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=drowe67/}
 GITHUB_PROJECT=        freedv-gui
@@ -44,7 +43,8 @@ pre-configure:
 .include "../../ham/codec2/buildlink3.mk"
 .include "../../ham/lpcnetfreedv/buildlink3.mk"
 .include "../../ham/hamlib/buildlink3.mk"
-# freedv 1.4.2 seems to only use included static sox
+# \todo Fix build using vendored sox instead of bl3 sox.
+# See CMakeFile line 211, "${PROJECT_SOURCE_DIR}/cmake/soxconfig.h.in"
 #.include "../../audio/sox/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"

Index: pkgsrc/ham/freedv/distinfo
diff -u pkgsrc/ham/freedv/distinfo:1.9 pkgsrc/ham/freedv/distinfo:1.10
--- pkgsrc/ham/freedv/distinfo:1.9      Tue Dec 14 23:56:56 2021
+++ pkgsrc/ham/freedv/distinfo  Mon Jan 13 23:02:50 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/12/14 23:56:56 gdt Exp $
+$NetBSD: distinfo,v 1.10 2025/01/13 23:02:50 gdt Exp $
 
-BLAKE2s (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 99e09f474f7c41b23aac1be374d06a6e1295ad3e658152dead9adc7778096e8c
-SHA512 (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 
fc7589606a208938129ad622966fa108e4c1ee84a86273a1b33705331282e811f7891bbc47528e475742a9b78f4dbc78cc1d84c13e1784b7923de9babf60171d
-Size (freedv-1.4.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 6177996 bytes
+BLAKE2s (freedv-1.9.9.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 99e09f474f7c41b23aac1be374d06a6e1295ad3e658152dead9adc7778096e8c
+SHA512 (freedv-1.9.9.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 
fc7589606a208938129ad622966fa108e4c1ee84a86273a1b33705331282e811f7891bbc47528e475742a9b78f4dbc78cc1d84c13e1784b7923de9babf60171d
+Size (freedv-1.9.9.2-bb9558cc496b7b253fb54bb28486b0bcd7516ae5.tar.gz) = 6177996 bytes
 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
+SHA1 (patch-src_hamlib.cpp) = f88ad89bdc396a0c791988ee9e17283a2ee108cb

Index: pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp
diff -u pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp:1.1 pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp:1.2
--- pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp:1.1  Tue Dec 14 23:56:56 2021
+++ pkgsrc/ham/freedv/patches/patch-src_hamlib.cpp      Mon Jan 13 23:02:50 2025
@@ -1,11 +1,34 @@
-$NetBSD: patch-src_hamlib.cpp,v 1.1 2021/12/14 23:56:56 gdt Exp $
+$NetBSD: patch-src_hamlib.cpp,v 1.2 2025/01/13 23:02:50 gdt Exp $
 
+Hunks 1, 2:
+hamlib 4.6 has an API break and freedv has not adapted
+https://github.com/drowe67/freedv-gui/issues/806
+
+Hunk 3:
 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
+@@ -29,7 +29,7 @@ using namespace std;
+ typedef std::vector<const struct rig_caps *> riglist_t;
+ 
+ static bool rig_cmp(const struct rig_caps *rig1, const struct rig_caps *rig2);
+-static int build_list(const struct rig_caps *rig, rig_ptr_t);
++static int build_list(struct rig_caps *rig, rig_ptr_t);
+ 
+ Hamlib::Hamlib() : 
+     m_rig(NULL),
+@@ -55,7 +55,7 @@ Hamlib::~Hamlib() {
+               close();
+ }
+ 
+-static int build_list(const struct rig_caps *rig, rig_ptr_t rigList) {
++static int build_list(struct rig_caps *rig, rig_ptr_t rigList) {
+     ((riglist_t *)rigList)->push_back(rig); 
+     return 1;
+ }
 @@ -114,7 +114,7 @@ bool Hamlib::connect(unsigned int rig_in
  
      /* TODO we may also need civaddr for Icom */