--- ./Makefile 2017-10-22 14:40:54.000000000 +0000 +++ ./Makefile 2018-08-29 05:25:51.717594000 +0000 @@ -1,10 +1,9 @@ # $FreeBSD: head/audio/codec2/Makefile 452647 2017-10-22 14:40:54Z db $ PORTNAME= codec2 -PORTVERSION= 0.7 +PORTVERSION= 0.8 CATEGORIES= audio hamradio -MASTER_SITES= https://freedv.com/wp-content/uploads/sites/8/2017/10/ \ - LOCAL/db +MASTER_SITES= https://hobbes1069.fedorapeople.org/freetel/codec2/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Low bit rate codec @@ -34,10 +33,8 @@ TEST_UNITTESTFILES= c2validate create_in 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 --- ./distinfo 2017-10-22 14:40:54.000000000 +0000 +++ ./distinfo 2018-08-29 02:35:49.407671000 +0000 @@ -1,3 +1,3 @@ -TIMESTAMP = 1508682185 -SHA256 (codec2-0.7.tar.xz) = 0695bb93cd985dd39f02f0db35ebc28a98b9b88747318f90774aba5f374eadb2 -SIZE (codec2-0.7.tar.xz) = 8386048 +TIMESTAMP = 1535510149 +SHA256 (codec2-0.8.tar.xz) = 361e0aa7e9634f64cef17239d03a2564fe117f2743463ec915f1272901f6025f +SIZE (codec2-0.8.tar.xz) = 8866680 --- ./files/patch-CMakeLists.txt 2017-08-06 01:07:22.000000000 +0000 +++ ./files/patch-CMakeLists.txt 2018-08-29 05:40:18.945342000 +0000 @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-07-18 14:11:40 UTC +--- CMakeLists.txt.orig 2018-05-26 12:21:13 UTC +++ CMakeLists.txt @@ -14,6 +14,7 @@ mark_as_advanced(CLEAR CMAKE_INSTALL_BINDIR @@ -8,19 +8,10 @@ ) # -@@ -164,13 +165,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!") +@@ -179,6 +180,18 @@ if(UNITTEST) endif() -+ # + + # + # Find samplerate library + # + message(STATUS "Looking for samplerate library.") @@ -31,6 +22,8 @@ + if(NOT SAMPLERATE_INCLUDE_DIR AND NOT SAMPLERATE_LIBRARY) + message(FATAL_ERROR "samplerate library not found!") + endif() - - # ++ ++ # # Samplerate Library + # + message(STATUS "Looking for samplerate...") --- ./files/patch-codec2.pc.in 2017-08-06 01:07:22.000000000 +0000 +++ ./files/patch-codec2.pc.in 2018-08-29 02:43:12.670314000 +0000 @@ -1,9 +1,9 @@ ---- codec2.pc.in.orig 2017-04-04 20:42:22 UTC +--- codec2.pc.in.orig 2017-08-03 21:22:16 UTC +++ codec2.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ --includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2 +libdir=${prefix}/lib +includedir=${prefix}/include/codec2 --- ./files/patch-src__freedv_api.c 2017-08-06 01:07:22.000000000 +0000 +++ ./files/patch-src__freedv_api.c 2018-08-29 05:49:01.288599000 +0000 @@ -1,4 +1,4 @@ ---- src/freedv_api.c.orig 2017-03-30 20:09:46 UTC +--- src/freedv_api.c.orig 2018-05-24 09:41:22 UTC +++ src/freedv_api.c @@ -36,7 +36,7 @@ #ifdef __APPLE__ @@ -9,21 +9,3 @@ #endif /* __APPLE__ */ #include "fsk.h" -@@ -260,7 +260,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; -@@ -506,7 +506,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{ --- ./files/patch-unittest__CMakeLists.txt 2017-08-06 01:07:22.000000000 +0000 +++ ./files/patch-unittest__CMakeLists.txt 2018-08-29 05:44:24.405265000 +0000 @@ -1,6 +1,6 @@ ---- unittest/CMakeLists.txt.orig 2017-06-12 01:04:28 UTC +--- unittest/CMakeLists.txt.orig 2018-04-12 23:12:25 UTC +++ unittest/CMakeLists.txt -@@ -91,7 +91,10 @@ add_executable(tnewamp1 tnewamp1.c ../sr +@@ -92,7 +92,10 @@ add_executable(tnewamp1 tnewamp1.c ../sr target_link_libraries(tnewamp1 codec2) add_executable(tsrc tsrc.c) --- ./pkg-plist 2017-08-06 01:07:22.000000000 +0000 +++ ./pkg-plist 2018-08-29 04:27:32.133024000 +0000 @@ -19,6 +19,7 @@ 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/freedv_api.h @@ -28,39 +29,16 @@ include/codec2/golay23.h include/codec2/kiss_fft.h include/codec2/modem_stats.h include/codec2/varicode.h +include/codec2/version.h lib/libcodec2.so -lib/libcodec2.so.0.7 +lib/libcodec2.so.0.8 libdata/pkgconfig/codec2.pc -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_rx.m -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_tx.m -%%EXAMPLES%%%%DATADIR%%/octave/plot_specgram.m -%%EXAMPLES%%%%DATADIR%%/octave/sample_clock_offset.m -%%EXAMPLES%%%%DATADIR%%/octave/tofdm.m -%%EXAMPLES%%%%DATADIR%%/octave/vq_pager.m +%%EXAMPLES%%%%DATADIR%%/octave/2400ab_frame_design.ods +%%EXAMPLES%%%%DATADIR%%/octave/H2064_516_sparse.mat %%EXAMPLES%%%%DATADIR%%/octave/HRA_112_112.txt %%EXAMPLES%%%%DATADIR%%/octave/HRA_112_56.txt %%EXAMPLES%%%%DATADIR%%/octave/HRA_56_28.txt %%EXAMPLES%%%%DATADIR%%/octave/HRA_56_56.txt -%%EXAMPLES%%%%DATADIR%%/octave/bpsk.m -%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_batch.m -%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_const.m -%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_fbf.m -%%EXAMPLES%%%%DATADIR%%/octave/estsnr.m -%%EXAMPLES%%%%DATADIR%%/octave/fsk_eme.m -%%EXAMPLES%%%%DATADIR%%/octave/fsk_lib.m -%%EXAMPLES%%%%DATADIR%%/octave/gp_interleaver.m -%%EXAMPLES%%%%DATADIR%%/octave/impulse_noise.m -%%EXAMPLES%%%%DATADIR%%/octave/kmeans2.m -%%EXAMPLES%%%%DATADIR%%/octave/kmeans_tests.m -%%EXAMPLES%%%%DATADIR%%/octave/ldpc_gen_h_file.m -%%EXAMPLES%%%%DATADIR%%/octave/ldpc_qpsk.m -%%EXAMPLES%%%%DATADIR%%/octave/ldpc_short.m -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_dev.m -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_lib.m -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_load_const.m -%%EXAMPLES%%%%DATADIR%%/octave/ofdm_rs.m -%%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 @@ -70,23 +48,32 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/bandpasssampling.m %%EXAMPLES%%%%DATADIR%%/octave/bfq19ssa.m %%EXAMPLES%%%%DATADIR%%/octave/bpf.m +%%EXAMPLES%%%%DATADIR%%/octave/bpsk.m +%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_batch.m +%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_const.m +%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_fbf.m +%%EXAMPLES%%%%DATADIR%%/octave/c2wideband_map %%EXAMPLES%%%%DATADIR%%/octave/cbphase.m %%EXAMPLES%%%%DATADIR%%/octave/cellmodem.m %%EXAMPLES%%%%DATADIR%%/octave/ciccomp.m +%%EXAMPLES%%%%DATADIR%%/octave/closed_quant_slope.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_ch_fading.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/dec_pager.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/estsnr.m %%EXAMPLES%%%%DATADIR%%/octave/fdmdv.m %%EXAMPLES%%%%DATADIR%%/octave/fdmdv_demod.m %%EXAMPLES%%%%DATADIR%%/octave/fdmdv_demod_c.m @@ -102,19 +89,24 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/fsk.m %%EXAMPLES%%%%DATADIR%%/octave/fsk4.m %%EXAMPLES%%%%DATADIR%%/octave/fsk_basic.m +%%EXAMPLES%%%%DATADIR%%/octave/fsk_basic_alt.m %%EXAMPLES%%%%DATADIR%%/octave/fsk_cont_phase.m +%%EXAMPLES%%%%DATADIR%%/octave/fsk_eme.m %%EXAMPLES%%%%DATADIR%%/octave/fsk_horus.m %%EXAMPLES%%%%DATADIR%%/octave/fsk_horus_2fsk.m %%EXAMPLES%%%%DATADIR%%/octave/fsk_horus_stream.m +%%EXAMPLES%%%%DATADIR%%/octave/fsk_lib.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/gp_interleaver.m %%EXAMPLES%%%%DATADIR%%/octave/hackrf_dc.m %%EXAMPLES%%%%DATADIR%%/octave/hackrf_twotone.m %%EXAMPLES%%%%DATADIR%%/octave/hackrf_uc.m +%%EXAMPLES%%%%DATADIR%%/octave/handvq.m %%EXAMPLES%%%%DATADIR%%/octave/hf_modem_curves.m %%EXAMPLES%%%%DATADIR%%/octave/hf_sim.m %%EXAMPLES%%%%DATADIR%%/octave/hfper.m @@ -123,8 +115,14 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/horus_payload_rtty.txt %%EXAMPLES%%%%DATADIR%%/octave/horus_tx_bits_binary.txt %%EXAMPLES%%%%DATADIR%%/octave/hp_filt.m +%%EXAMPLES%%%%DATADIR%%/octave/impulse_noise.m +%%EXAMPLES%%%%DATADIR%%/octave/kmeans2.m +%%EXAMPLES%%%%DATADIR%%/octave/kmeans_tests.m %%EXAMPLES%%%%DATADIR%%/octave/ldpc.m %%EXAMPLES%%%%DATADIR%%/octave/ldpc_fsk_lib.m +%%EXAMPLES%%%%DATADIR%%/octave/ldpc_gen_h_file.m +%%EXAMPLES%%%%DATADIR%%/octave/ldpc_qpsk.m +%%EXAMPLES%%%%DATADIR%%/octave/ldpc_short.m %%EXAMPLES%%%%DATADIR%%/octave/ldpcdec.m %%EXAMPLES%%%%DATADIR%%/octave/ldpcenc.m %%EXAMPLES%%%%DATADIR%%/octave/ldpcut.m @@ -152,6 +150,17 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/newamp_batch.m %%EXAMPLES%%%%DATADIR%%/octave/newamp_fbf.m %%EXAMPLES%%%%DATADIR%%/octave/nf_from_gr.m +%%EXAMPLES%%%%DATADIR%%/octave/nf_from_stdio.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_demod_c.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_dev.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_ldpc_rx.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_ldpc_tx.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_lib.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_load_const.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_rs.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_rx.m +%%EXAMPLES%%%%DATADIR%%/octave/ofdm_tx.m +%%EXAMPLES%%%%DATADIR%%/octave/open_quant_slope.m %%EXAMPLES%%%%DATADIR%%/octave/oqpsk.m %%EXAMPLES%%%%DATADIR%%/octave/phase.m %%EXAMPLES%%%%DATADIR%%/octave/phase2.m @@ -165,6 +174,7 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/pllsp.m %%EXAMPLES%%%%DATADIR%%/octave/pllspdt.m %%EXAMPLES%%%%DATADIR%%/octave/plnlp.m +%%EXAMPLES%%%%DATADIR%%/octave/plot_specgram.m %%EXAMPLES%%%%DATADIR%%/octave/plphase.m %%EXAMPLES%%%%DATADIR%%/octave/plpitch.m %%EXAMPLES%%%%DATADIR%%/octave/plppe.m @@ -176,11 +186,13 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/qpsk.m %%EXAMPLES%%%%DATADIR%%/octave/rfdesign.m %%EXAMPLES%%%%DATADIR%%/octave/s_param_rf.m +%%EXAMPLES%%%%DATADIR%%/octave/sample_clock_offset.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/tdetphase.m %%EXAMPLES%%%%DATADIR%%/octave/telem_upload.py %%EXAMPLES%%%%DATADIR%%/octave/test_cohpsk.m %%EXAMPLES%%%%DATADIR%%/octave/test_cohpsk_ch.m @@ -204,9 +216,13 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/tget_spec.m %%EXAMPLES%%%%DATADIR%%/octave/tlinreg.m %%EXAMPLES%%%%DATADIR%%/octave/tnewamp1.m +%%EXAMPLES%%%%DATADIR%%/octave/tofdm.m %%EXAMPLES%%%%DATADIR%%/octave/tpapr.m %%EXAMPLES%%%%DATADIR%%/octave/tqpsk.m +%%EXAMPLES%%%%DATADIR%%/octave/train_120_1.txt +%%EXAMPLES%%%%DATADIR%%/octave/train_120_2.txt %%EXAMPLES%%%%DATADIR%%/octave/trellis.m +%%EXAMPLES%%%%DATADIR%%/octave/twod_fbf.m %%EXAMPLES%%%%DATADIR%%/octave/twomixer.m %%EXAMPLES%%%%DATADIR%%/octave/twotone.m %%EXAMPLES%%%%DATADIR%%/octave/twotone1.m @@ -214,6 +230,15 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/undersample.m %%EXAMPLES%%%%DATADIR%%/octave/vhf_pa.m %%EXAMPLES%%%%DATADIR%%/octave/vq +%%EXAMPLES%%%%DATADIR%%/octave/vq_construct_indep_mg.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_construct_mg.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_nm_xx_11_40_hpf150 +%%EXAMPLES%%%%DATADIR%%/octave/vq_pager.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_search_gain.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_search_mse.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_search_para.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_search_sg.m +%%EXAMPLES%%%%DATADIR%%/octave/vq_search_slope.m %%EXAMPLES%%%%DATADIR%%/octave/xormixer.m %%EXAMPLES%%%%DATADIR%%/octave/yafsk.m %%EXAMPLES%%%%DATADIR%%/raw/b0067.raw @@ -257,6 +282,7 @@ libdata/pkgconfig/codec2.pc %%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/speech_orig_16k.wav %%EXAMPLES%%%%DATADIR%%/raw/ve9qrp.raw %%EXAMPLES%%%%DATADIR%%/raw/ve9qrp_10s.raw %%EXAMPLES%%%%DATADIR%%/raw/vk5qi.raw