ham/codec2: update to 0.9.2

5 files changed, 38 insertions, 26 deletions

diff --git a/ham/codec2/DESCR b/ham/codec2/DESCR
index 212b186d6b9..cb782c99f03 100644
--- a/ham/codec2/DESCR
+++ b/ham/codec2/DESCR
@@ -1,7 +1,5 @@
-Codec2 is an open source low bit rate speech codec designed for
-communications quality speech at 2400 bit/s and below. Applications
-include low bandwidth HF/VHF digital radio and VOIP trunking. Codec 2
-operating at 2400 bit/s can send 26 phone calls using the bandwidth
-required for one 64 kbit/s uncompressed phone call. It fills a gap in
-open source, free-as-in-speech voice codecs beneath 5000 bit/s and is
-released under the GNU Lesser General Public License (LGPL).
+Codec 2 is an open source speech codec designed for communications
+quality speech between 700 and 3200 bit/s. The main application is low
+bandwidth HF/VHF digital radio. It fills a gap in open source voice
+codecs beneath 5000 bit/s and is released under the GNU Lesser General
+Public License (LGPL).
diff --git a/ham/codec2/Makefile b/ham/codec2/Makefile
index 18ba41e03a5..a5e2589e1a0 100644
--- a/ham/codec2/Makefile
+++ b/ham/codec2/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:24 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/29 23:10:25 dbj Exp $
 #
 
-DISTNAME=	codec2-0.5.1
+# https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz
+DISTNAME=	codec2-0.9.2
 CATEGORIES=	ham
-MASTER_SITES=	http://files.freedv.org/codec2/
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=drowe67/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	dbj@NetBSD.org
 HOMEPAGE=	https://rowetel.com/codec2.html
-COMMENT=	Speech codec for 2400 bit/s and below
+COMMENT=	Speech codec for between 700 and 3200 bit/s
 
 LICENSE=	gnu-lgpl-v2.1
 
@@ -17,8 +18,15 @@ USE_LANGUAGES=	c
 USE_CMAKE=	yes
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
 pre-configure:
 	cd ${WRKSRC} && mkdir build
 
+# XXX this creates a circular dependency between
+# lpcnetfreedv and codec2 that requires bootstrapping
+# and causes problems with pkg tools once created.
+#CMAKE_ARGS+=	-DLPCNET=ON
+#.include "../../ham/lpcnetfreedv/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/codec2/PLIST b/ham/codec2/PLIST
index 92d5883361e..04f25ffd0ce 100644
--- a/ham/codec2/PLIST
+++ b/ham/codec2/PLIST
@@ -1,29 +1,35 @@
-@comment $NetBSD: PLIST,v 1.4 2016/01/19 04:02:07 dbj Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/11/29 23:10:25 dbj Exp $
 bin/c2dec
-bin/c2demo
 bin/c2enc
-bin/c2sim
+bin/drs232
+bin/drs232_ldpc
 bin/fdmdv_demod
 bin/fdmdv_get_test_bits
-bin/fdmdv_interleave
 bin/fdmdv_mod
 bin/fdmdv_put_test_bits
-bin/fec_dec
-bin/fec_enc
 bin/fm_demod
+bin/fsk_mod
 bin/insert_errors
 include/codec2/codec2.h
 include/codec2/codec2_cohpsk.h
 include/codec2/codec2_fdmdv.h
 include/codec2/codec2_fifo.h
 include/codec2/codec2_fm.h
+include/codec2/codec2_ofdm.h
 include/codec2/comp.h
 include/codec2/comp_prim.h
+include/codec2/filter.h
 include/codec2/freedv_api.h
 include/codec2/freedv_api_internal.h
+include/codec2/fsk.h
 include/codec2/golay23.h
+include/codec2/horus_api.h
 include/codec2/kiss_fft.h
 include/codec2/modem_stats.h
 include/codec2/varicode.h
+include/codec2/version.h
+lib/cmake/codec2/codec2-config-release.cmake
+lib/cmake/codec2/codec2-config.cmake
 lib/libcodec2.so
-lib/libcodec2.so.0.5
+lib/libcodec2.so.0.9
+lib/pkgconfig/codec2.pc
diff --git a/ham/codec2/buildlink3.mk b/ham/codec2/buildlink3.mk
index cccdb3877fe..44ce2929644 100644
--- a/ham/codec2/buildlink3.mk
+++ b/ham/codec2/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/01/19 04:02:07 dbj Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/11/29 23:10:25 dbj Exp $
 
 BUILDLINK_TREE+=	codec2
 
 .if !defined(CODEC2_BUILDLINK3_MK)
 CODEC2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.codec2+=	codec2>=0.5
+BUILDLINK_API_DEPENDS.codec2+=	codec2>=0.9.2
 BUILDLINK_PKGSRCDIR.codec2?=	../../ham/codec2
 
 BUILDLINK_INCDIRS.codec2+=	include/codec2
diff --git a/ham/codec2/distinfo b/ham/codec2/distinfo
index 8cd51f7400b..537eebf4fce 100644
--- a/ham/codec2/distinfo
+++ b/ham/codec2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/09/19 09:27:57 mef Exp $
+$NetBSD: distinfo,v 1.5 2020/11/29 23:10:25 dbj Exp $
 
-SHA1 (codec2-0.5.1.tar.xz) = dcac0544048787a07a891e71c77fbf9ae3d78aca
-RMD160 (codec2-0.5.1.tar.xz) = ed6c2474231e64c905d320751d5b4432cd6bf0a4
-SHA512 (codec2-0.5.1.tar.xz) = 2ddfe2ef3dc89bd440a9861ed0d7b43a0be126712b18c29e40a6044da1b6a2cec508e0f40cb1d90fb8d4710646fa13606820f016a040cd147c84c44600b22cd9
-Size (codec2-0.5.1.tar.xz) = 7862968 bytes
+SHA1 (codec2-0.9.2.tar.gz) = 5ff524082a508d123df9f0951349c96a62235a62
+RMD160 (codec2-0.9.2.tar.gz) = 5b0fa0e72b56b5ddc432c5809ef8693ee5047860
+SHA512 (codec2-0.9.2.tar.gz) = 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
+Size (codec2-0.9.2.tar.gz) = 12244006 bytes