From owner-svn-ports-all@freebsd.org Sun Aug 6 01:07:24 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92E77DD5371; Sun, 6 Aug 2017 01:07:24 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B9F66A297; Sun, 6 Aug 2017 01:07:24 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7617NHq021718; Sun, 6 Aug 2017 01:07:23 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7617MgY021711; Sun, 6 Aug 2017 01:07:22 GMT (envelope-from db@FreeBSD.org) Message-Id: <201708060107.v7617MgY021711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Sun, 6 Aug 2017 01:07:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447437 - in head/audio/codec2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/audio/codec2: . files X-SVN-Commit-Revision: 447437 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2017 01:07:24 -0000 Author: db Date: Sun Aug 6 01:07:22 2017 New Revision: 447437 URL: https://svnweb.freebsd.org/changeset/ports/447437 Log: Update to 0.7 1. Make the 700 bit/s codec sound better, to improve speech quality on low SNR HF channels (beneath 0dB). 2. Develop a higher quality mode in the 2000 to 3000 bit/s range, that can be used on HF channels with modest SNRs (around 10dB) Modified: head/audio/codec2/Makefile head/audio/codec2/distinfo head/audio/codec2/files/patch-CMakeLists.txt head/audio/codec2/files/patch-codec2.pc.in head/audio/codec2/files/patch-src__freedv_api.c head/audio/codec2/files/patch-unittest__CMakeLists.txt head/audio/codec2/pkg-plist Modified: head/audio/codec2/Makefile ============================================================================== --- head/audio/codec2/Makefile Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/Makefile Sun Aug 6 01:07:22 2017 (r447437) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= codec2 -PORTVERSION= 0.6 +PORTVERSION= 0.7 CATEGORIES= audio hamradio MASTER_SITES= http://files.freedv.org/codec2/ \ LOCAL/db @@ -26,11 +26,11 @@ TEST_SRCFILES= cohpsk_ch cohpsk_demod cohpsk_get_test_ cohpsk_put_test_bits fdmdv_channel freedv_rx freedv_tx\ generate_codebook TEST_UNITTESTFILES= c2validate create_interleaver de extract fdmdv_mem\ - genampdata genlsp genphdata genres lspsync polar2rect\ + genlsp genres polar2rect\ pre raw2h scalarlsptest speexnoisesup t16_8\ t16_8_short tcohpsk test_cohpsk_ch tfdmdv tfifo\ - tinterp tlspsens tnlp tprede tquant vq_train_jvm\ - vqtrain vqtrainjnd vqtrainph vqtrainsp + tnlp tprede vq_train_jvm\ + vqtrain SHEBANG_FILES= ${WRKSRC}/octave/fsk_horus_stream.m\ ${WRKSRC}/script/menu.sh Modified: head/audio/codec2/distinfo ============================================================================== --- head/audio/codec2/distinfo Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/distinfo Sun Aug 6 01:07:22 2017 (r447437) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494899272 -SHA256 (codec2-0.6.tar.xz) = 57754bf3507a7ac9f9402cae054787a3572bea6a791137cdd5fa35f6c5af1144 -SIZE (codec2-0.6.tar.xz) = 8352824 +TIMESTAMP = 1500555166 +SHA256 (codec2-0.7.tar.xz) = 0695bb93cd985dd39f02f0db35ebc28a98b9b88747318f90774aba5f374eadb2 +SIZE (codec2-0.7.tar.xz) = 8386048 Modified: head/audio/codec2/files/patch-CMakeLists.txt ============================================================================== --- head/audio/codec2/files/patch-CMakeLists.txt Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/files/patch-CMakeLists.txt Sun Aug 6 01:07:22 2017 (r447437) @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-02-15 02:10:02 UTC +--- CMakeLists.txt.orig 2017-07-18 14:11:40 UTC +++ CMakeLists.txt @@ -14,6 +14,7 @@ mark_as_advanced(CLEAR CMAKE_INSTALL_BINDIR @@ -8,7 +8,7 @@ ) # -@@ -166,13 +167,24 @@ if(UNITTEST) +@@ -164,13 +165,24 @@ if(UNITTEST) # Find speex library # message(STATUS "Looking for Speex DSP library.") @@ -32,5 +32,5 @@ + message(FATAL_ERROR "samplerate library not found!") + endif() - add_subdirectory(unittest) - endif(UNITTEST) + # + # Samplerate Library Modified: head/audio/codec2/files/patch-codec2.pc.in ============================================================================== --- head/audio/codec2/files/patch-codec2.pc.in Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/files/patch-codec2.pc.in Sun Aug 6 01:07:22 2017 (r447437) @@ -1,9 +1,9 @@ ---- codec2.pc.in.orig 2016-04-13 23:50:56 UTC +--- codec2.pc.in.orig 2017-04-04 20:42:22 UTC +++ codec2.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@CMAKE_INSTALL_LIBDIR@ --includedir=/usr/include/codec2 +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/ +libdir=${prefix}/lib +includedir=${prefix}/include/codec2 Modified: head/audio/codec2/files/patch-src__freedv_api.c ============================================================================== --- head/audio/codec2/files/patch-src__freedv_api.c Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/files/patch-src__freedv_api.c Sun Aug 6 01:07:22 2017 (r447437) @@ -1,4 +1,4 @@ ---- src/freedv_api.c.orig 2017-02-07 04:36:38 UTC +--- src/freedv_api.c.orig 2017-03-30 20:09:46 UTC +++ src/freedv_api.c @@ -36,7 +36,7 @@ #ifdef __APPLE__ @@ -9,7 +9,7 @@ #endif /* __APPLE__ */ #include "fsk.h" -@@ -258,7 +258,7 @@ struct freedv *freedv_open(int mode) { +@@ -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; @@ -18,7 +18,7 @@ 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 +@@ -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 */ Modified: head/audio/codec2/files/patch-unittest__CMakeLists.txt ============================================================================== --- head/audio/codec2/files/patch-unittest__CMakeLists.txt Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/files/patch-unittest__CMakeLists.txt Sun Aug 6 01:07:22 2017 (r447437) @@ -1,6 +1,6 @@ ---- unittest/CMakeLists.txt.orig 2017-01-30 20:52:36 UTC +--- unittest/CMakeLists.txt.orig 2017-06-12 01:04:28 UTC +++ unittest/CMakeLists.txt -@@ -118,7 +118,10 @@ add_executable(tnewamp1 tnewamp1.c ../sr +@@ -91,7 +91,10 @@ add_executable(tnewamp1 tnewamp1.c ../sr target_link_libraries(tnewamp1 codec2) add_executable(tsrc tsrc.c) Modified: head/audio/codec2/pkg-plist ============================================================================== --- head/audio/codec2/pkg-plist Sun Aug 6 00:31:24 2017 (r447436) +++ head/audio/codec2/pkg-plist Sun Aug 6 01:07:22 2017 (r447437) @@ -29,8 +29,36 @@ include/codec2/kiss_fft.h include/codec2/modem_stats.h include/codec2/varicode.h lib/libcodec2.so -lib/libcodec2.so.0.6 +lib/libcodec2.so.0.7 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/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 @@ -235,6 +263,7 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/script/menu.sh %%EXAMPLES%%%%DATADIR%%/script/playraw.sh %%EXAMPLES%%%%DATADIR%%/script/raw2wav.sh +%%EXAMPLES%%%%DATADIR%%/script/separate_all.sh %%EXAMPLES%%%%DATADIR%%/script/wav2raw.sh %%EXAMPLES%%%%DATADIR%%/wav/all.wav %%EXAMPLES%%%%DATADIR%%/wav/cross.wav @@ -283,12 +312,9 @@ libdata/pkgconfig/codec2.pc %%TEST%%bin/fdmdv_mem %%TEST%%bin/freedv_rx %%TEST%%bin/freedv_tx -%%TEST%%bin/genampdata %%TEST%%bin/generate_codebook %%TEST%%bin/genlsp -%%TEST%%bin/genphdata %%TEST%%bin/genres -%%TEST%%bin/lspsync %%TEST%%bin/polar2rect %%TEST%%bin/pre %%TEST%%bin/raw2h @@ -300,13 +326,7 @@ libdata/pkgconfig/codec2.pc %%TEST%%bin/test_cohpsk_ch %%TEST%%bin/tfdmdv %%TEST%%bin/tfifo -%%TEST%%bin/tinterp -%%TEST%%bin/tlspsens %%TEST%%bin/tnlp %%TEST%%bin/tprede -%%TEST%%bin/tquant %%TEST%%bin/vq_train_jvm %%TEST%%bin/vqtrain -%%TEST%%bin/vqtrainjnd -%%TEST%%bin/vqtrainph -%%TEST%%bin/vqtrainsp