From nobody Thu Jan 20 15:33:25 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6F6521954183; Thu, 20 Jan 2022 15:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JfmkG14Pyz4W4y; Thu, 20 Jan 2022 15:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642692806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DyNFNWxtHFGeNEgrNAFGSxhrByL072z8L0Z8X1lWt3w=; b=B9F8TB1ZGQugYjOtXbq5MIDIW/K1efaSJA5S9lTxfklufJNdSkHkwGSRAG3sUq7SYW5N9G YQKrvhOAB568UXoMTqP6bI/0HV1QYQBhsllwJrk9aJOOU0xMCzmom++7lprUFTBIXfoJ/P YKGtpawhZWdi57T89mU2D2QRNz+LAbD4tG/74PLH6vYvrQDnXWiZVxtCBArZX3WyWdKUqp eFGu7MtIz6YWn8etptAVxBQiNNFb1cof3ie6Zb38gtooBbgVbD0QLPHy4q8G1SWU9+pTKh ODS6Sk9TcBK5JJ21GIvLXmKK0xtDUfgjlgBtXDftpAgsYIyipD+cKKDInHaUzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0013429CA; Thu, 20 Jan 2022 15:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KFXPPk031704; Thu, 20 Jan 2022 15:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KFXPNh031703; Thu, 20 Jan 2022 15:33:25 GMT (envelope-from git) Date: Thu, 20 Jan 2022 15:33:25 GMT Message-Id: <202201201533.20KFXPNh031703@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Diane Bruce Subject: git: 8074f1dc3daa - 2022Q1 - audio/codec2: Unbreak swig List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 8074f1dc3daaef898413415c0c08e4629e932dc1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642692806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DyNFNWxtHFGeNEgrNAFGSxhrByL072z8L0Z8X1lWt3w=; b=OrTtzRy5gZTNuYMi9SkRV9GzvQ5XypGN/DIbo4XG5tB0evewrH7LC41SY/+coWRWtEvLyq gKkVl+aFw26SwHg8BTHAZPsaWZDNGGGDbAXmb7/3N8mFNG3oz7nF2TMKpvZwsFCSHI9pP+ Wug02U5QvPfnmoGEnPGwt4IeCfVkaOsfjqaiUZCyZFFuCIGzXd6lzy2JEgnBEjxyAMJHRa EwsX7cYKNQ6zNWWkE6MtIguX576cWRsBqduYm35ZkgGwI9fU56pgdkF3LhF27MD5/lLcnJ 7IphSWtqZUMJsqnXF3TSOHYTw7Ry+GClDNkOzk0TeTpjS83Tiu7Uj1Uf0qGfsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642692806; a=rsa-sha256; cv=none; b=EhPTzigffue0UcUpfVHc5afAIpX/rdEUVYXJFGCrMPkgiLFrt2LBdR4C/zlH2G7WWtzju7 WU1Tdc8OwzctY0QDsScHa73AI3R4cLda3QbQ0qGRpl6HRtthx3Hicdyye4aKHAToRDrCYr 8MJ40tzdEnGsNJpkw9zxYNVIjBcQtp6K+58Ca8tgzYdOuYpVIRWbRuH1IGcpzWC3GLTFfM 9xu/YQjHuKNtcQHu0ZOmhMomrselDAJVOjq2TYp7DflKxPFGiwFUYppz9ROR6mrQBfByda zPqnFSoc2B929dfK5RQOmVI+ctJ3KBJo7KE7p6C0O9Jwd/r+Z28y3VztpmFoRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=8074f1dc3daaef898413415c0c08e4629e932dc1 commit 8074f1dc3daaef898413415c0c08e4629e932dc1 Author: Diane Bruce AuthorDate: 2022-01-04 14:20:25 +0000 Commit: Diane Bruce CommitDate: 2022-01-20 15:33:16 +0000 audio/codec2: Unbreak swig Numerous tiny changes in the git log for codec2 but the big one for us is fixing swig. codec2 exposed a complex type in an interface that swig breaks on. This impacts other ports such as gnuradio. upstream moved the interface to private and this unbreaks swig. N.B. I have patched out the Octave CML testjig for now since this will take more time to resolve. Patches welcome. (cherry picked from commit a8bd0d5cd8d1292780967b8c8a94f5db9f3b3f13) --- audio/codec2/Makefile | 21 +++++++++++++-------- audio/codec2/distinfo | 6 +++--- audio/codec2/pkg-plist | 2 -- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile index 736f1af4c82b..b06a9672ae5a 100644 --- a/audio/codec2/Makefile +++ b/audio/codec2/Makefile @@ -1,6 +1,6 @@ PORTNAME= codec2 DISTVERSIONPREFIX=v -DISTVERSION= 1.0.1 +DISTVERSION= 1.0.3 CATEGORIES= audio hamradio MAINTAINER= hamradio@FreeBSD.org @@ -17,7 +17,7 @@ GH_ACCOUNT= drowe67 GH_PROJECT= codec2 USE_LDCONFIG= yes -USE_GITHUB= yes +USE_GITHUB= yes OPTIONS_DEFINE= EXAMPLES TEST OPTIONS_SUB= yes @@ -34,16 +34,21 @@ TEST_UNITTESTFILES= compare_ints fdmdv_mem ofdm_mem ofdm_stack \ tfreedv_data_channel tfsk tfsk_llr thash tnewamp1 \ tofdm tofdm_acq tqam16 tst_codec2_fft_init tvq_mbest -SHEBANG_FILES= ${WRKSRC}/script/gen_phi0 \ +SHEBANG_FILES= ${WRKSRC}/script/separate_all.sh \ + ${WRKSRC}/demo/freedv_700d_rx.py \ + ${WRKSRC}/script/gen_phi0 \ ${WRKSRC}/script/phi0_plot.py \ - ${WRKSRC}/script/build_cml.sh \ ${WRKSRC}/script/subsetvq.sh \ ${WRKSRC}/script/train_700c_quant.sh \ ${WRKSRC}/script/ofdm_stack_use.py \ - ${WRKSRC}/script/train_sub_quant.sh - -TEST_RUN_DEPENDS= octave:math/octave -TEST_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate + ${WRKSRC}/script/train_sub_quant.sh \ + ${WRKSRC}/unittest/*.sh \ + ${WRKSRC}/octave/fsk_demod_BER_test.py \ + ${WRKSRC}/octave/fskdemodgui.py \ + ${WRKSRC}/octave/plot_fsk_demod_stats.py + +#TEST_RUN_DEPENDS= octave:math/octave +#TEST_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate PORTEXAMPLES= * diff --git a/audio/codec2/distinfo b/audio/codec2/distinfo index aa8b64e2be1e..bb50c4dd79fe 100644 --- a/audio/codec2/distinfo +++ b/audio/codec2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640012007 -SHA256 (drowe67-codec2-v1.0.1_GH0.tar.gz) = 14227963940d79e0ec5af810f37101b30e1c7e8555abd96c56b3c0473abac8ef -SIZE (drowe67-codec2-v1.0.1_GH0.tar.gz) = 15062219 +TIMESTAMP = 1641299100 +SHA256 (drowe67-codec2-v1.0.3_GH0.tar.gz) = 48162d562ea3bf4ca273f3c45df04505a006bd9a2b376006c75706c4de957da7 +SIZE (drowe67-codec2-v1.0.3_GH0.tar.gz) = 15000736 diff --git a/audio/codec2/pkg-plist b/audio/codec2/pkg-plist index bd516aef4a46..8c205c851e0d 100644 --- a/audio/codec2/pkg-plist +++ b/audio/codec2/pkg-plist @@ -70,7 +70,6 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/octave/channel_lib.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_ch_fading.m %%EXAMPLES%%%%DATADIR%%/octave/cohpsk_demod_plot.m @@ -238,7 +237,6 @@ libdata/pkgconfig/codec2.pc %%EXAMPLES%%%%DATADIR%%/raw/ve9qrp.raw %%EXAMPLES%%%%DATADIR%%/raw/ve9qrp_10s.raw %%EXAMPLES%%%%DATADIR%%/raw/vk5qi.raw -%%EXAMPLES%%%%DATADIR%%/script/build_cml.sh %%EXAMPLES%%%%DATADIR%%/script/gen_phi0 %%EXAMPLES%%%%DATADIR%%/script/ofdm_stack_use.py %%EXAMPLES%%%%DATADIR%%/script/phi0_plot.py