Update to latest freedv codec2 0.6

See http://www.rowetel.com/?page_id=452

PR:		ports/219348
Submitted by:	takefu@airport.fm

8 files changed, 359 insertions, 215 deletions

diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile
index f0295fe264db..3125896482ee 100644
--- a/audio/codec2/Makefile
+++ b/audio/codec2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	codec2
-PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTVERSION=	0.6
 CATEGORIES=	audio hamradio
 MASTER_SITES=	http://files.freedv.org/codec2/ \
 		LOCAL/db
@@ -12,23 +11,20 @@ COMMENT=	Low bit rate codec
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libspeex.so:audio/speex
+LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 
-CONFLICTS=	libcodec2-*
-USES=		cmake:outsource compiler:c11 shebangfix tar:xz
+CONFLICTS=	libcodec2-[0-9]*
+USES=		cmake:outsource pathfix pkgconfig shebangfix tar:xz
 USE_LDCONFIG=	yes
-SHEBANG_FILES=	script/menu.sh
 
 OPTIONS_DEFINE=	EXAMPLES TEST
 OPTIONS_SUB=	yes
 EXAMPLES_CMAKE_ON=	-DINSTALL_EXAMPLES=ON
 TEST_CMAKE_ON=		-DUNITTEST=ON
 
-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
-
 TEST_SRCFILES=	cohpsk_ch cohpsk_demod cohpsk_get_test_bits cohpsk_mod\
 		cohpsk_put_test_bits fdmdv_channel freedv_rx freedv_tx\
-		generate_codebook genlspdtcb
+		generate_codebook
 TEST_UNITTESTFILES=	c2validate create_interleaver de extract fdmdv_mem\
 			genampdata genlsp genphdata genres lspsync polar2rect\
 			pre raw2h scalarlsptest speexnoisesup t16_8\
@@ -36,9 +32,17 @@ TEST_UNITTESTFILES=	c2validate create_interleaver de extract fdmdv_mem\
 			tinterp tlspsens tnlp tprede tquant vq_train_jvm\
 			vqtrain vqtrainjnd vqtrainph vqtrainsp
 
+SHEBANG_FILES=	${WRKSRC}/octave/fsk_horus_stream.m\
+		${WRKSRC}/script/menu.sh
+
+SHEBANG_LANG=		octave
+octave_OLD_CMD=		/usr/bin/octave
+octave_CMD=		${LOCALBASE}/bin/octave
+TEST_RUN_DEPENDS=	octave:math/octave
+TEST_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
+
 pre-patch-TEST-on:
-	${REINPLACE_CMD} 's|speex/speex.h|speex/speex_preprocess.h|;\
-		s|"_FLAGS"|_FLAGS|' ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} 's|%ld|%u|' ${WRKSRC}/unittest/fdmdv_mem.c
 
 post-install-TEST-on:
 .for a in ${TEST_SRCFILES}
diff --git a/audio/codec2/distinfo b/audio/codec2/distinfo
index 41ff5bcdcf23..1943931fab76 100644
--- a/audio/codec2/distinfo
+++ b/audio/codec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475074829
-SHA256 (codec2-0.5.1.tar.xz) = f7cf14b02763ffdcd231027f9811b06862790bf76d900ba9443d2a57f4ce7b38
-SIZE (codec2-0.5.1.tar.xz) = 7862968
+TIMESTAMP = 1494899272
+SHA256 (codec2-0.6.tar.xz) = 57754bf3507a7ac9f9402cae054787a3572bea6a791137cdd5fa35f6c5af1144
+SIZE (codec2-0.6.tar.xz) = 8352824
diff --git a/audio/codec2/files/patch-CMakeLists.txt b/audio/codec2/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..fb022ede2809
--- /dev/null
+++ b/audio/codec2/files/patch-CMakeLists.txt
@@ -0,0 +1,36 @@
+--- CMakeLists.txt.orig	2017-02-15 02:10:02 UTC
++++ CMakeLists.txt
+@@ -14,6 +14,7 @@ mark_as_advanced(CLEAR
+     CMAKE_INSTALL_BINDIR
+     CMAKE_INSTALL_INCLUDEDIR
+     CMAKE_INSTALL_LIBDIR
++    CMAKE_INSTALL_LIBEXECDIR
+ )
+ 
+ #
+@@ -166,13 +167,24 @@ if(UNITTEST)
+     # Find speex library
+     #
+     message(STATUS "Looking for Speex DSP library.")
+-    find_path(SPEEXDSP_INCLUDE_DIR speex/speex.h)
++    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
+     find_library(SPEEXDSP_LIBRARY speexdsp)
+     message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
+     message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
+     if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
+         message(FATAL_ERROR "Speex DSP library not found!")
+     endif()
++    #
++    # Find samplerate library
++    #
++    message(STATUS "Looking for samplerate library.")
++    find_path(SAMPLERATE_INCLUDE_DIR samplerate.h)
++    find_library(SAMPLERATE_LIBRARY samplerate)
++    message(STATUS "  samplerate headers: ${SAMPLERATE_INCLUDE_DIR}")
++    message(STATUS "  samplerate library: ${SAMPLERATE_LIBRARY}")
++    if(NOT SAMPLERATE_INCLUDE_DIR AND NOT SAMPLERATE_LIBRARY)
++        message(FATAL_ERROR "samplerate library not found!")
++    endif()
+ 
+     add_subdirectory(unittest)
+ endif(UNITTEST)
diff --git a/audio/codec2/files/patch-codec2.pc.in b/audio/codec2/files/patch-codec2.pc.in
new file mode 100644
index 000000000000..98c512255304
--- /dev/null
+++ b/audio/codec2/files/patch-codec2.pc.in
@@ -0,0 +1,11 @@
+--- codec2.pc.in.orig	2016-04-13 23:50:56 UTC
++++ codec2.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_LIBDIR@
+-includedir=/usr/include/codec2
++libdir=${prefix}/lib
++includedir=${prefix}/include/codec2
+ 
+ Name: codec2
+ Description: A speech codec for 2400 bit/s and below
diff --git a/audio/codec2/files/patch-src__freedv_api.c b/audio/codec2/files/patch-src__freedv_api.c
new file mode 100644
index 000000000000..965799ad88b5
--- /dev/null
+++ b/audio/codec2/files/patch-src__freedv_api.c
@@ -0,0 +1,29 @@
+--- src/freedv_api.c.orig	2017-02-07 04:36:38 UTC
++++ src/freedv_api.c
+@@ -36,7 +36,7 @@
+ #ifdef __APPLE__
+ #include <malloc/malloc.h>
+ #else
+-#include <malloc.h>
++#include <sys/malloc.h>
+ #endif /* __APPLE__ */
+ 
+ #include "fsk.h"
+@@ -258,7 +258,7 @@ struct freedv *freedv_open(int mode) {
+         f->n_codec_bits = codec2_bits_per_frame(f->codec2);
+         nbit = f->n_codec_bits;
+         nbyte = (nbit + 7) / 8;
+-    } else if ((mode == FREEDV_MODE_800XA)) {
++    } else if ((mode = FREEDV_MODE_800XA)) {
+         f->n_speech_samples = 2*codec2_samples_per_frame(f->codec2);
+         f->n_codec_bits = codec2_bits_per_frame(f->codec2);
+         nbit = f->n_codec_bits;
+@@ -504,7 +504,7 @@ void freedv_tx(struct freedv *f, short m
+      
+     if((f->mode == FREEDV_MODE_2400A) || (f->mode == FREEDV_MODE_2400B) || (f->mode == FREEDV_MODE_800XA)){
+         /* 800XA has two codec frames per modem frame */
+-        if((f->mode == FREEDV_MODE_800XA)){
++        if((f->mode = FREEDV_MODE_800XA)){
+             codec2_encode(f->codec2, &f->packed_codec_bits[0], &speech_in[  0]);
+             codec2_encode(f->codec2, &f->packed_codec_bits[4], &speech_in[320]);
+         }else{
diff --git a/audio/codec2/files/patch-unittest__CMakeLists.txt b/audio/codec2/files/patch-unittest__CMakeLists.txt
new file mode 100644
index 000000000000..0c27737bfeab
--- /dev/null
+++ b/audio/codec2/files/patch-unittest__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- unittest/CMakeLists.txt.orig	2017-01-30 20:52:36 UTC
++++ unittest/CMakeLists.txt
+@@ -118,7 +118,10 @@ add_executable(tnewamp1 tnewamp1.c ../sr
+ target_link_libraries(tnewamp1 codec2)
+ 
+ add_executable(tsrc tsrc.c)
+-target_link_libraries(tsrc samplerate)
++target_link_libraries(tsrc ${SAMPLERATE_LIBRARY})
++set_target_properties(tsrc
++    PROPERTIES INCLUDE_DIRECTORIES ${SAMPLERATE_INCLUDE_DIR}
++)
+ 
+ add_executable(tlininterp tlininterp.c)
+ add_executable(tdec tdec.c)
diff --git a/audio/codec2/pkg-descr b/audio/codec2/pkg-descr
index 55404b2b0219..b3cbb5e85874 100644
--- a/audio/codec2/pkg-descr
+++ b/audio/codec2/pkg-descr
@@ -1,10 +1,7 @@
-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, free-as-in-speech voice codecs beneath 5000
+bit/s and is released under the GNU Lesser General Public License (LGPL).
 
-
-WWW: http://www.rowetel.com/blog/?page_id=452
+WWW: http://www.rowetel.com/?page_id=452
diff --git a/audio/codec2/pkg-plist b/audio/codec2/pkg-plist
index 52483b672874..52e7a30b997c 100644
--- a/audio/codec2/pkg-plist
+++ b/audio/codec2/pkg-plist
@@ -2,6 +2,8 @@ bin/c2dec
 bin/c2demo
 bin/c2enc
 bin/c2sim
+bin/drs232
+bin/drs232_ldpc
 bin/fdmdv_demod
 bin/fdmdv_get_test_bits
 bin/fdmdv_interleave
@@ -10,6 +12,7 @@ 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
@@ -20,202 +23,253 @@ include/codec2/comp.h
 include/codec2/comp_prim.h
 include/codec2/freedv_api.h
 include/codec2/freedv_api_internal.h
+include/codec2/fsk.h
 include/codec2/golay23.h
 include/codec2/kiss_fft.h
 include/codec2/modem_stats.h
 include/codec2/varicode.h
 lib/libcodec2.so
-lib/libcodec2.so.0.5
-%%EXAMPLES%%share/codec2/octave/adc_sfdr_ut.m
-%%EXAMPLES%%share/codec2/octave/adcres.m
-%%EXAMPLES%%share/codec2/octave/autotest.m
-%%EXAMPLES%%share/codec2/octave/av_imp.m
-%%EXAMPLES%%share/codec2/octave/bandpasssampling.m
-%%EXAMPLES%%share/codec2/octave/bpf.m
-%%EXAMPLES%%share/codec2/octave/cbphase.m
-%%EXAMPLES%%share/codec2/octave/cellmodem.m
-%%EXAMPLES%%share/codec2/octave/ciccomp.m
-%%EXAMPLES%%share/codec2/octave/cml.patch
-%%EXAMPLES%%share/codec2/octave/codec2_demo.m
-%%EXAMPLES%%share/codec2/octave/cohpsk.m
-%%EXAMPLES%%share/codec2/octave/cohpsk_demod_plot.m
-%%EXAMPLES%%share/codec2/octave/cohpsk_frame_design.ods
-%%EXAMPLES%%share/codec2/octave/cspec.m
-%%EXAMPLES%%share/codec2/octave/dacres.m
-%%EXAMPLES%%share/codec2/octave/diff_codec.m
-%%EXAMPLES%%share/codec2/octave/fdmdv.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_demod.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_demod_c.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_demod_coh.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_mod.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_sweep.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_ut.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_ut_coh.m
-%%EXAMPLES%%share/codec2/octave/fdmdv_ut_freq_off.m
-%%EXAMPLES%%share/codec2/octave/fm.m
-%%EXAMPLES%%share/codec2/octave/fsk.m
-%%EXAMPLES%%share/codec2/octave/fsk4.m
-%%EXAMPLES%%share/codec2/octave/fuzzy_gray.m
-%%EXAMPLES%%share/codec2/octave/gen_rn_coeffs.m
-%%EXAMPLES%%share/codec2/octave/glottal.m
-%%EXAMPLES%%share/codec2/octave/gmsk.m
-%%EXAMPLES%%share/codec2/octave/hf_sim.m
-%%EXAMPLES%%share/codec2/octave/hfper.m
-%%EXAMPLES%%share/codec2/octave/hp_filt.m
-%%EXAMPLES%%share/codec2/octave/ldpc.m
-%%EXAMPLES%%share/codec2/octave/ldpcdec.m
-%%EXAMPLES%%share/codec2/octave/ldpcenc.m
-%%EXAMPLES%%share/codec2/octave/ldpcut.m
-%%EXAMPLES%%share/codec2/octave/linreg.m
-%%EXAMPLES%%share/codec2/octave/load_comp.m
-%%EXAMPLES%%share/codec2/octave/load_raw.m
-%%EXAMPLES%%share/codec2/octave/lpcauto.m
-%%EXAMPLES%%share/codec2/octave/lpcpf.m
-%%EXAMPLES%%share/codec2/octave/lsp.m
-%%EXAMPLES%%share/codec2/octave/lsp_pdf.m
-%%EXAMPLES%%share/codec2/octave/lspvar.m
-%%EXAMPLES%%share/codec2/octave/lspwarp.m
-%%EXAMPLES%%share/codec2/octave/mag_to_phase.m
-%%EXAMPLES%%share/codec2/octave/make_hilb.m
-%%EXAMPLES%%share/codec2/octave/make_ssbfilt.m
-%%EXAMPLES%%share/codec2/octave/melstats.m
-%%EXAMPLES%%share/codec2/octave/melvq.m
-%%EXAMPLES%%share/codec2/octave/newamp.m
-%%EXAMPLES%%share/codec2/octave/newamp_batch.m
-%%EXAMPLES%%share/codec2/octave/newamp_fbf.m
-%%EXAMPLES%%share/codec2/octave/phase.m
-%%EXAMPLES%%share/codec2/octave/phase2.m
-%%EXAMPLES%%share/codec2/octave/phasesecord.m
-%%EXAMPLES%%share/codec2/octave/pitch_test.m
-%%EXAMPLES%%share/codec2/octave/pl.m
-%%EXAMPLES%%share/codec2/octave/pl2.m
-%%EXAMPLES%%share/codec2/octave/plamp.m
-%%EXAMPLES%%share/codec2/octave/plinterp.m
-%%EXAMPLES%%share/codec2/octave/pllpcpf.m
-%%EXAMPLES%%share/codec2/octave/pllsp.m
-%%EXAMPLES%%share/codec2/octave/pllspdt.m
-%%EXAMPLES%%share/codec2/octave/plnlp.m
-%%EXAMPLES%%share/codec2/octave/plphase.m
-%%EXAMPLES%%share/codec2/octave/plpitch.m
-%%EXAMPLES%%share/codec2/octave/plppe.m
-%%EXAMPLES%%share/codec2/octave/plsub.m
-%%EXAMPLES%%share/codec2/octave/plvoicing.m
-%%EXAMPLES%%share/codec2/octave/png.m
-%%EXAMPLES%%share/codec2/octave/postfilter.m
-%%EXAMPLES%%share/codec2/octave/pulse.m
-%%EXAMPLES%%share/codec2/octave/qpsk.m
-%%EXAMPLES%%share/codec2/octave/save_array_c_header.m
-%%EXAMPLES%%share/codec2/octave/save_raw.m
-%%EXAMPLES%%share/codec2/octave/sd.m
-%%EXAMPLES%%share/codec2/octave/spec.m
-%%EXAMPLES%%share/codec2/octave/tcohpsk.m
-%%EXAMPLES%%share/codec2/octave/test_cohpsk.m
-%%EXAMPLES%%share/codec2/octave/test_cohpsk_ch.m
-%%EXAMPLES%%share/codec2/octave/test_dqpsk.m
-%%EXAMPLES%%share/codec2/octave/test_dqpsk2.m
-%%EXAMPLES%%share/codec2/octave/test_dsss.m
-%%EXAMPLES%%share/codec2/octave/test_dsss_pilot.m
-%%EXAMPLES%%share/codec2/octave/test_fec.m
-%%EXAMPLES%%share/codec2/octave/test_foff.m
-%%EXAMPLES%%share/codec2/octave/test_ftrack.m
-%%EXAMPLES%%share/codec2/octave/test_ml.m
-%%EXAMPLES%%share/codec2/octave/test_pilot.m
-%%EXAMPLES%%share/codec2/octave/test_qpsk.m
-%%EXAMPLES%%share/codec2/octave/test_qpsk2.m
-%%EXAMPLES%%share/codec2/octave/test_qpsk3.m
-%%EXAMPLES%%share/codec2/octave/tfdmdv.m
-%%EXAMPLES%%share/codec2/octave/tget_spec.m
-%%EXAMPLES%%share/codec2/octave/tlinreg.m
-%%EXAMPLES%%share/codec2/octave/tpapr.m
-%%EXAMPLES%%share/codec2/octave/tqpsk.m
-%%EXAMPLES%%share/codec2/octave/trellis.m
-%%EXAMPLES%%share/codec2/octave/twomixer.m
-%%EXAMPLES%%share/codec2/octave/twotone.m
-%%EXAMPLES%%share/codec2/octave/twotone1.m
-%%EXAMPLES%%share/codec2/octave/tximage.m
-%%EXAMPLES%%share/codec2/octave/undersample.m
-%%EXAMPLES%%share/codec2/octave/xormixer.m
-%%EXAMPLES%%share/codec2/raw/b0067.raw
-%%EXAMPLES%%share/codec2/raw/cq_ref.raw
-%%EXAMPLES%%share/codec2/raw/cross.raw
-%%EXAMPLES%%share/codec2/raw/cross_melp2400.raw
-%%EXAMPLES%%share/codec2/raw/f2400.raw
-%%EXAMPLES%%share/codec2/raw/forig.raw
-%%EXAMPLES%%share/codec2/raw/forig_ambe2000.raw
-%%EXAMPLES%%share/codec2/raw/forig_g729a.raw
-%%EXAMPLES%%share/codec2/raw/forig_gsm13k.raw
-%%EXAMPLES%%share/codec2/raw/forig_speex_8k.raw
-%%EXAMPLES%%share/codec2/raw/g3plx.raw
-%%EXAMPLES%%share/codec2/raw/hts.raw
-%%EXAMPLES%%share/codec2/raw/hts1.raw
-%%EXAMPLES%%share/codec2/raw/hts1a.raw
-%%EXAMPLES%%share/codec2/raw/hts1a_ambe2000.raw
-%%EXAMPLES%%share/codec2/raw/hts1a_g729a.raw
-%%EXAMPLES%%share/codec2/raw/hts1a_gsm13k.raw
-%%EXAMPLES%%share/codec2/raw/hts1a_melp.raw
-%%EXAMPLES%%share/codec2/raw/hts1a_speex_8k.raw
-%%EXAMPLES%%share/codec2/raw/hts2.raw
-%%EXAMPLES%%share/codec2/raw/hts2a.raw
-%%EXAMPLES%%share/codec2/raw/hts2a_ambe2000.raw
-%%EXAMPLES%%share/codec2/raw/hts2a_g729a.raw
-%%EXAMPLES%%share/codec2/raw/hts2a_gsm13k.raw
-%%EXAMPLES%%share/codec2/raw/hts2a_melp.raw
-%%EXAMPLES%%share/codec2/raw/hts2a_speex_8k.raw
-%%EXAMPLES%%share/codec2/raw/k6hx.raw
-%%EXAMPLES%%share/codec2/raw/kristoff.raw
-%%EXAMPLES%%share/codec2/raw/m2400.raw
-%%EXAMPLES%%share/codec2/raw/mmt1.raw
-%%EXAMPLES%%share/codec2/raw/mmt1_ambe2000.raw
-%%EXAMPLES%%share/codec2/raw/mmt1_g729a.raw
-%%EXAMPLES%%share/codec2/raw/mmt1_gsm13k.raw
-%%EXAMPLES%%share/codec2/raw/mmt1_speex_8k.raw
-%%EXAMPLES%%share/codec2/raw/morig.raw
-%%EXAMPLES%%share/codec2/raw/morig_ambe2000.raw
-%%EXAMPLES%%share/codec2/raw/morig_g729a.raw
-%%EXAMPLES%%share/codec2/raw/morig_gsm13k.raw
-%%EXAMPLES%%share/codec2/raw/morig_speex_8k.raw
-%%EXAMPLES%%share/codec2/raw/sine1k_2Hz_spread.raw
-%%EXAMPLES%%share/codec2/raw/sine1k_2ms_delay_2Hz_spread.raw
-%%EXAMPLES%%share/codec2/raw/ve9qrp.raw
-%%EXAMPLES%%share/codec2/raw/ve9qrp_10s.raw
-%%EXAMPLES%%share/codec2/script/menu.sh
-%%EXAMPLES%%share/codec2/script/playraw.sh
-%%EXAMPLES%%share/codec2/script/raw2wav.sh
-%%EXAMPLES%%share/codec2/script/wav2raw.sh
-%%EXAMPLES%%share/codec2/wav/all.wav
-%%EXAMPLES%%share/codec2/wav/cross.wav
-%%EXAMPLES%%share/codec2/wav/cross_melp2400.wav
-%%EXAMPLES%%share/codec2/wav/f2400.wav
-%%EXAMPLES%%share/codec2/wav/forig.wav
-%%EXAMPLES%%share/codec2/wav/forig_ambe2000.wav
-%%EXAMPLES%%share/codec2/wav/forig_speex_8k.wav
-%%EXAMPLES%%share/codec2/wav/hts1a.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_ambe2000.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_c2_v0.1.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_c2_v0.1a.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_g729a.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_lpc10.wav
-%%EXAMPLES%%share/codec2/wav/hts1a_speex_8k.wav
-%%EXAMPLES%%share/codec2/wav/hts2a.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_ambe2000.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_c2_v0.1.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_c2_v0.1a.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_g729a.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_lpc10.wav
-%%EXAMPLES%%share/codec2/wav/hts2a_speex_8k.wav
-%%EXAMPLES%%share/codec2/wav/m2400.wav
-%%EXAMPLES%%share/codec2/wav/mmt1.wav
-%%EXAMPLES%%share/codec2/wav/mmt1_ambe2000.wav
-%%EXAMPLES%%share/codec2/wav/mmt1_c2_v01a.wav
-%%EXAMPLES%%share/codec2/wav/mmt1_lpc10.wav
-%%EXAMPLES%%share/codec2/wav/mmt1_speex_8k.wav
-%%EXAMPLES%%share/codec2/wav/morig.wav
-%%EXAMPLES%%share/codec2/wav/morig_ambe2000.wav
-%%EXAMPLES%%share/codec2/wav/morig_speex_8k.wav
-%%EXAMPLES%%share/codec2/wav/ve9qrp.wav
-%%EXAMPLES%%share/codec2/wav/vk5qi.wav
-%%EXAMPLES%%share/codec2/wav/x200_ext.wav
-%%EXAMPLES%%share/codec2/wav/x200_int.wav
+lib/libcodec2.so.0.6
+libdata/pkgconfig/codec2.pc
+%%EXAMPLES%%%%DATADIR%%/octave/2400ab_frame_design.ods
+%%EXAMPLES%%%%DATADIR%%/octave/H2064_516_sparse.mat
+%%EXAMPLES%%%%DATADIR%%/octave/Mat2Hrows.m
+%%EXAMPLES%%%%DATADIR%%/octave/adc_plot_spec.m
+%%EXAMPLES%%%%DATADIR%%/octave/adc_sfdr_ut.m
+%%EXAMPLES%%%%DATADIR%%/octave/adcres.m
+%%EXAMPLES%%%%DATADIR%%/octave/autotest.m
+%%EXAMPLES%%%%DATADIR%%/octave/av_imp.m
+%%EXAMPLES%%%%DATADIR%%/octave/bandpasssampling.m
+%%EXAMPLES%%%%DATADIR%%/octave/bfq19ssa.m
+%%EXAMPLES%%%%DATADIR%%/octave/bpf.m
+%%EXAMPLES%%%%DATADIR%%/octave/cbphase.m
+%%EXAMPLES%%%%DATADIR%%/octave/cellmodem.m
+%%EXAMPLES%%%%DATADIR%%/octave/ciccomp.m
+%%EXAMPLES%%%%DATADIR%%/octave/cma.m
+%%EXAMPLES%%%%DATADIR%%/octave/cml.patch
+%%EXAMPLES%%%%DATADIR%%/octave/codec2_demo.m
+%%EXAMPLES%%%%DATADIR%%/octave/cohpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/cohpsk_demod_plot.m
+%%EXAMPLES%%%%DATADIR%%/octave/cohpsk_frame_design.ods
+%%EXAMPLES%%%%DATADIR%%/octave/cohpsk_plots.m
+%%EXAMPLES%%%%DATADIR%%/octave/crc16.m
+%%EXAMPLES%%%%DATADIR%%/octave/cspec.m
+%%EXAMPLES%%%%DATADIR%%/octave/dacres.m
+%%EXAMPLES%%%%DATADIR%%/octave/df_mixer.m
+%%EXAMPLES%%%%DATADIR%%/octave/diff_codec.m
+%%EXAMPLES%%%%DATADIR%%/octave/doppler_spread.m
+%%EXAMPLES%%%%DATADIR%%/octave/doppler_spread_ut.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_demod.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_demod_c.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_demod_coh.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_mod.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_sweep.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_ut.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_ut_coh.m
+%%EXAMPLES%%%%DATADIR%%/octave/fdmdv_ut_freq_off.m
+%%EXAMPLES%%%%DATADIR%%/octave/fm.m
+%%EXAMPLES%%%%DATADIR%%/octave/fm_radio_filt_model.txt
+%%EXAMPLES%%%%DATADIR%%/octave/fmfsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk4.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk_basic.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk_cont_phase.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk_horus.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk_horus_2fsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/fsk_horus_stream.m
+%%EXAMPLES%%%%DATADIR%%/octave/fskdemodgui.py
+%%EXAMPLES%%%%DATADIR%%/octave/fuzzy_gray.m
+%%EXAMPLES%%%%DATADIR%%/octave/gen_complex_short.m
+%%EXAMPLES%%%%DATADIR%%/octave/gen_rn_coeffs.m
+%%EXAMPLES%%%%DATADIR%%/octave/glottal.m
+%%EXAMPLES%%%%DATADIR%%/octave/gmsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/hackrf_dc.m
+%%EXAMPLES%%%%DATADIR%%/octave/hackrf_twotone.m
+%%EXAMPLES%%%%DATADIR%%/octave/hackrf_uc.m
+%%EXAMPLES%%%%DATADIR%%/octave/hf_modem_curves.m
+%%EXAMPLES%%%%DATADIR%%/octave/hf_sim.m
+%%EXAMPLES%%%%DATADIR%%/octave/hfper.m
+%%EXAMPLES%%%%DATADIR%%/octave/horus_high_speed.bin
+%%EXAMPLES%%%%DATADIR%%/octave/horus_msg.txt
+%%EXAMPLES%%%%DATADIR%%/octave/horus_payload_rtty.txt
+%%EXAMPLES%%%%DATADIR%%/octave/horus_tx_bits_binary.txt
+%%EXAMPLES%%%%DATADIR%%/octave/hp_filt.m
+%%EXAMPLES%%%%DATADIR%%/octave/ldpc.m
+%%EXAMPLES%%%%DATADIR%%/octave/ldpc_fsk_lib.m
+%%EXAMPLES%%%%DATADIR%%/octave/ldpcdec.m
+%%EXAMPLES%%%%DATADIR%%/octave/ldpcenc.m
+%%EXAMPLES%%%%DATADIR%%/octave/ldpcut.m
+%%EXAMPLES%%%%DATADIR%%/octave/linreg.m
+%%EXAMPLES%%%%DATADIR%%/octave/load_comp.m
+%%EXAMPLES%%%%DATADIR%%/octave/load_hackrf.m
+%%EXAMPLES%%%%DATADIR%%/octave/load_raw.m
+%%EXAMPLES%%%%DATADIR%%/octave/lpcauto.m
+%%EXAMPLES%%%%DATADIR%%/octave/lpcpf.m
+%%EXAMPLES%%%%DATADIR%%/octave/lsp.m
+%%EXAMPLES%%%%DATADIR%%/octave/lsp_pdf.m
+%%EXAMPLES%%%%DATADIR%%/octave/lspvar.m
+%%EXAMPLES%%%%DATADIR%%/octave/lspwarp.m
+%%EXAMPLES%%%%DATADIR%%/octave/mag_to_phase.m
+%%EXAMPLES%%%%DATADIR%%/octave/make_hilb.m
+%%EXAMPLES%%%%DATADIR%%/octave/make_ssbfilt.m
+%%EXAMPLES%%%%DATADIR%%/octave/mancyfsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/melstats.m
+%%EXAMPLES%%%%DATADIR%%/octave/melvq.m
+%%EXAMPLES%%%%DATADIR%%/octave/mfsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp1_batch.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp1_compare.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp1_fbf.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp_batch.m
+%%EXAMPLES%%%%DATADIR%%/octave/newamp_fbf.m
+%%EXAMPLES%%%%DATADIR%%/octave/nf_from_gr.m
+%%EXAMPLES%%%%DATADIR%%/octave/oqpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/phase.m
+%%EXAMPLES%%%%DATADIR%%/octave/phase2.m
+%%EXAMPLES%%%%DATADIR%%/octave/phasesecord.m
+%%EXAMPLES%%%%DATADIR%%/octave/pitch_test.m
+%%EXAMPLES%%%%DATADIR%%/octave/pl.m
+%%EXAMPLES%%%%DATADIR%%/octave/pl2.m
+%%EXAMPLES%%%%DATADIR%%/octave/plamp.m
+%%EXAMPLES%%%%DATADIR%%/octave/plinterp.m
+%%EXAMPLES%%%%DATADIR%%/octave/pllpcpf.m
+%%EXAMPLES%%%%DATADIR%%/octave/pllsp.m
+%%EXAMPLES%%%%DATADIR%%/octave/pllspdt.m
+%%EXAMPLES%%%%DATADIR%%/octave/plnlp.m
+%%EXAMPLES%%%%DATADIR%%/octave/plphase.m
+%%EXAMPLES%%%%DATADIR%%/octave/plpitch.m
+%%EXAMPLES%%%%DATADIR%%/octave/plppe.m
+%%EXAMPLES%%%%DATADIR%%/octave/plsub.m
+%%EXAMPLES%%%%DATADIR%%/octave/plvoicing.m
+%%EXAMPLES%%%%DATADIR%%/octave/png.m
+%%EXAMPLES%%%%DATADIR%%/octave/postfilter.m
+%%EXAMPLES%%%%DATADIR%%/octave/pulse.m
+%%EXAMPLES%%%%DATADIR%%/octave/qpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/rfdesign.m
+%%EXAMPLES%%%%DATADIR%%/octave/s_param_rf.m
+%%EXAMPLES%%%%DATADIR%%/octave/save_array_c_header.m
+%%EXAMPLES%%%%DATADIR%%/octave/save_raw.m
+%%EXAMPLES%%%%DATADIR%%/octave/sd.m
+%%EXAMPLES%%%%DATADIR%%/octave/spec.m
+%%EXAMPLES%%%%DATADIR%%/octave/tcohpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/telem_upload.py
+%%EXAMPLES%%%%DATADIR%%/octave/test_cohpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_cohpsk_ch.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_dqpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_dqpsk2.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_dsss.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_dsss_pilot.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_fec.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_foff.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_ftrack.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_ldpc_fsk_lib.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_ml.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_pilot.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_qpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_qpsk2.m
+%%EXAMPLES%%%%DATADIR%%/octave/test_qpsk3.m
+%%EXAMPLES%%%%DATADIR%%/octave/tfdmdv.m
+%%EXAMPLES%%%%DATADIR%%/octave/tfmfsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/tfsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/tfsk_2400a.m
+%%EXAMPLES%%%%DATADIR%%/octave/tget_spec.m
+%%EXAMPLES%%%%DATADIR%%/octave/tlinreg.m
+%%EXAMPLES%%%%DATADIR%%/octave/tnewamp1.m
+%%EXAMPLES%%%%DATADIR%%/octave/tpapr.m
+%%EXAMPLES%%%%DATADIR%%/octave/tqpsk.m
+%%EXAMPLES%%%%DATADIR%%/octave/trellis.m
+%%EXAMPLES%%%%DATADIR%%/octave/twomixer.m
+%%EXAMPLES%%%%DATADIR%%/octave/twotone.m
+%%EXAMPLES%%%%DATADIR%%/octave/twotone1.m
+%%EXAMPLES%%%%DATADIR%%/octave/tximage.m
+%%EXAMPLES%%%%DATADIR%%/octave/undersample.m
+%%EXAMPLES%%%%DATADIR%%/octave/vhf_pa.m
+%%EXAMPLES%%%%DATADIR%%/octave/vq
+%%EXAMPLES%%%%DATADIR%%/octave/xormixer.m
+%%EXAMPLES%%%%DATADIR%%/octave/yafsk.m
+%%EXAMPLES%%%%DATADIR%%/raw/b0067.raw
+%%EXAMPLES%%%%DATADIR%%/raw/cq_ref.raw
+%%EXAMPLES%%%%DATADIR%%/raw/cross.raw
+%%EXAMPLES%%%%DATADIR%%/raw/cross_melp2400.raw
+%%EXAMPLES%%%%DATADIR%%/raw/f2400.raw
+%%EXAMPLES%%%%DATADIR%%/raw/forig.raw
+%%EXAMPLES%%%%DATADIR%%/raw/forig_ambe2000.raw
+%%EXAMPLES%%%%DATADIR%%/raw/forig_g729a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/forig_gsm13k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/forig_speex_8k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/g3plx.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a_ambe2000.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a_g729a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a_gsm13k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a_melp.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts1a_speex_8k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a_ambe2000.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a_g729a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a_gsm13k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a_melp.raw
+%%EXAMPLES%%%%DATADIR%%/raw/hts2a_speex_8k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/k6hx.raw
+%%EXAMPLES%%%%DATADIR%%/raw/kristoff.raw
+%%EXAMPLES%%%%DATADIR%%/raw/m2400.raw
+%%EXAMPLES%%%%DATADIR%%/raw/mmt1.raw
+%%EXAMPLES%%%%DATADIR%%/raw/mmt1_ambe2000.raw
+%%EXAMPLES%%%%DATADIR%%/raw/mmt1_g729a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/mmt1_gsm13k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/mmt1_speex_8k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/morig.raw
+%%EXAMPLES%%%%DATADIR%%/raw/morig_ambe2000.raw
+%%EXAMPLES%%%%DATADIR%%/raw/morig_g729a.raw
+%%EXAMPLES%%%%DATADIR%%/raw/morig_gsm13k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/morig_speex_8k.raw
+%%EXAMPLES%%%%DATADIR%%/raw/sine1k_2Hz_spread.raw
+%%EXAMPLES%%%%DATADIR%%/raw/sine1k_2ms_delay_2Hz_spread.raw
+%%EXAMPLES%%%%DATADIR%%/raw/ve9qrp.raw
+%%EXAMPLES%%%%DATADIR%%/raw/ve9qrp_10s.raw
+%%EXAMPLES%%%%DATADIR%%/raw/vk5qi.raw
+%%EXAMPLES%%%%DATADIR%%/script/menu.sh
+%%EXAMPLES%%%%DATADIR%%/script/playraw.sh
+%%EXAMPLES%%%%DATADIR%%/script/raw2wav.sh
+%%EXAMPLES%%%%DATADIR%%/script/wav2raw.sh
+%%EXAMPLES%%%%DATADIR%%/wav/all.wav
+%%EXAMPLES%%%%DATADIR%%/wav/cross.wav
+%%EXAMPLES%%%%DATADIR%%/wav/cross_melp2400.wav
+%%EXAMPLES%%%%DATADIR%%/wav/f2400.wav
+%%EXAMPLES%%%%DATADIR%%/wav/forig.wav
+%%EXAMPLES%%%%DATADIR%%/wav/forig_ambe2000.wav
+%%EXAMPLES%%%%DATADIR%%/wav/forig_speex_8k.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_ambe2000.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_c2_v0.1.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_c2_v0.1a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_g729a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_lpc10.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts1a_speex_8k.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_ambe2000.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_c2_v0.1.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_c2_v0.1a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_g729a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_lpc10.wav
+%%EXAMPLES%%%%DATADIR%%/wav/hts2a_speex_8k.wav
+%%EXAMPLES%%%%DATADIR%%/wav/m2400.wav
+%%EXAMPLES%%%%DATADIR%%/wav/mmt1.wav
+%%EXAMPLES%%%%DATADIR%%/wav/mmt1_ambe2000.wav
+%%EXAMPLES%%%%DATADIR%%/wav/mmt1_c2_v01a.wav
+%%EXAMPLES%%%%DATADIR%%/wav/mmt1_lpc10.wav
+%%EXAMPLES%%%%DATADIR%%/wav/mmt1_speex_8k.wav
+%%EXAMPLES%%%%DATADIR%%/wav/morig.wav
+%%EXAMPLES%%%%DATADIR%%/wav/morig_ambe2000.wav
+%%EXAMPLES%%%%DATADIR%%/wav/morig_speex_8k.wav
+%%EXAMPLES%%%%DATADIR%%/wav/ve9qrp.wav
+%%EXAMPLES%%%%DATADIR%%/wav/vk5qi.wav
+%%EXAMPLES%%%%DATADIR%%/wav/x200_ext.wav
+%%EXAMPLES%%%%DATADIR%%/wav/x200_int.wav
 %%TEST%%bin/c2validate
 %%TEST%%bin/cohpsk_ch
 %%TEST%%bin/cohpsk_demod
@@ -232,7 +286,6 @@ lib/libcodec2.so.0.5
 %%TEST%%bin/genampdata
 %%TEST%%bin/generate_codebook
 %%TEST%%bin/genlsp
-%%TEST%%bin/genlspdtcb
 %%TEST%%bin/genphdata
 %%TEST%%bin/genres
 %%TEST%%bin/lspsync