From nobody Tue Feb 18 14:26:37 2025 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 4Yy1zy0Z7Zz5ngKn; Tue, 18 Feb 2025 14:26:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy1zx1wtFz44cl; Tue, 18 Feb 2025 14:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739888797; 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=RGNwH/NIjPMxTGe7Qz4iNVuYGsyQ25yewbVfKUWL7YU=; b=ndAZX49zL4TsJRixg6dChmHOA13IMaeVUL6LlgavQLFOJ8FQPkYLHhuHhKch74fHsbcpPP 1q+INruh6e453PB2h1GfSdzzDoFN+0hVi3RMyBrMbREeaPUGK60PJ5NVDX/o+qaHNjdR56 0kI67h8o2bJIvdbDYnUFllNGJRZ/BlcMvFBXFu2YxZXeZMk57++rZA3Z/UqNWVgGMbDKKJ 1qbn6825iR6VrNsy8mjJ5K03rpaKwXysFgw1xPJwHoq9w5K+5/mE/A87o+jmLlJ3D204Wl a334H3VqoHPI0nIMZqdrXe4CV2tKY5YeS6RFvPcOA0g/DRsFztfi/1GGDHs/Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739888797; a=rsa-sha256; cv=none; b=rTVfKqNVIzvifVtBQaJcrlRJCA3AjS9ML7uIEE22IcQjrAlNH20WENvPHMe9+zEne1dSvF dl++xQLm2NnGUQcM/UREB6t3rNxVlcRcAgUDOQWQRrsQTr+SFhCiohGWFQvPQTcJdPy3fs hfWNp3BgX9ULx3Y0A57FtSP/lWGdzAKVtG3gqAzwg99s8jaHAy5Uf4qVeAQKkCjIzHH5ie aA1qO1wPa+ELlFoBNhakkEAq5tkXhYXE69RzHo7ux7G+lYoB0JglJSQ0gL6Gub64Q/hbWy GVB2eFOY6Lc5gaMco85c7bc95VFrF8ezXSLUoiLdkt2mv4jV7YVnoSY+9+0tHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739888797; 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=RGNwH/NIjPMxTGe7Qz4iNVuYGsyQ25yewbVfKUWL7YU=; b=xXewLxQifjbfUMKlRNYpbVgq2+PSpi+MrOM4DmShvh0QYIbq+XNtBjgufWq0+j+9c//SRt kl/fRDe6vj55SLZTfTOFen1j8uiaY0ax7hALSDB7BhE6WvQKfM4XCJrNFOI8Er4l+agu8s EEByFpr3rKs0J8s4jQhbtRJvJ74itv9OHlSPzSCZg8gEesPlUR6J0zZLyfW5DouQcSBYdd /MTBDOojSy129cog0N1ZE/Qpnk44VvCAGV/d5hIOGAf693XkMtclbVcXPf0edeWbl8pJd6 0Yg8kOlQZvElYD0cnE4kF4t6OavOesmmgMcA0/3BYNO5PvRew0vhKcM4VLrwtA== 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 4Yy1zx1S6wz7ll; Tue, 18 Feb 2025 14:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IEQbb0045320; Tue, 18 Feb 2025 14:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IEQbCW045317; Tue, 18 Feb 2025 14:26:37 GMT (envelope-from git) Date: Tue, 18 Feb 2025 14:26:37 GMT Message-Id: <202502181426.51IEQbCW045317@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 92fc8d2fcd5f - main - net/yate: convert AMR codec to opencore one 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92fc8d2fcd5f4314a6f73faa9afa95b29f972301 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=92fc8d2fcd5f4314a6f73faa9afa95b29f972301 commit 92fc8d2fcd5f4314a6f73faa9afa95b29f972301 Author: Tatsuki Makino AuthorDate: 2025-02-13 19:18:45 +0000 Commit: Robert Clausecker CommitDate: 2025-02-18 14:16:17 +0000 net/yate: convert AMR codec to opencore one This would allow us to sunset audio/libamrnb. PR: 277803, 277802 --- net/yate/Makefile | 8 ++++---- net/yate/files/patch-configure.ac | 24 +++++++++++++++++++++++- net/yate/files/patch-modules_amrnbcodec.cpp | 23 +++++++++++++++++++++++ net/yate/files/patch-modules_efrcodec.cpp | 23 +++++++++++++++++++++++ net/yate/pkg-plist | 4 ++-- 5 files changed, 75 insertions(+), 7 deletions(-) diff --git a/net/yate/Makefile b/net/yate/Makefile index 298bac251beb..fd3599bb6572 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -1,6 +1,7 @@ PORTNAME= yate DISTVERSION= 6.4.1 DISTVERSIONSUFFIX= -g${GH_TAGNAME} +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ports@FreeBSD.org @@ -49,19 +50,18 @@ GROUPS= yate PLIST_SUB= VERSION="${PORTVERSION}" -OPTIONS_DEFINE= AMRNB DAHDI DOCS H323 ILBC MYSQL PGSQL SCTP SPANDSP \ +OPTIONS_DEFINE= AMR DAHDI DOCS H323 ILBC MYSQL PGSQL SCTP SPANDSP \ SQLITE OPTIONS_DEFAULT= SCTP OPTIONS_SUB= yes -AMRNB_DESC= Adaptive Multi-Rate Narrowband support DAHDI_DESC= Dahdi support H323_DESC= H323 software channel/protocol support ILBC_DESC= iLBC narrowband speech codec support SCTP_DESC= Stream Control Transmission Protocol support -AMRNB_LIB_DEPENDS= libamrnb.so:audio/libamrnb -AMRNB_CONFIGURE_WITH= amrnb=${LOCALBASE} +AMR_CONFIGURE_WITH= amrnb=${LOCALBASE} +AMR_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr DAHDI_BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:misc/dahdi \ libpri>=1.4.10:misc/libpri diff --git a/net/yate/files/patch-configure.ac b/net/yate/files/patch-configure.ac index 980b6363bad9..e85d38d43979 100644 --- a/net/yate/files/patch-configure.ac +++ b/net/yate/files/patch-configure.ac @@ -1,6 +1,6 @@ --- configure.ac.orig 2024-01-15 13:41:34 UTC +++ configure.ac -@@ -113,7 +113,8 @@ AC_MSG_RESULT([$ac_cv_no_overload_virt]) +@@ -113,7 +113,8 @@ if [[ "x$ac_cv_no_overload_virt" = "xyes" ]]; then fi AC_MSG_RESULT([$ac_cv_no_overload_virt]) @@ -10,3 +10,25 @@ ld_unresolved_symbols=no AC_MSG_CHECKING([if ld supports reporting unresolved symbols]) SAVE_CFLAGS="$CFLAGS" +@@ -1204,7 +1205,7 @@ AC_SUBST(SPEEX_LIB) + + HAVE_AMRNB=no + AMRNB_INC="" +-AMRNB_LIB="-lamrnb" ++AMRNB_LIB="-lopencore-amrnb" + AC_ARG_WITH(amrnb,AC_HELP_STRING([--with-amrnb=DIR],[use AMR-NB if available (default)]),[ac_cv_use_amrnb=$withval],[ac_cv_use_amrnb=/usr]) + if [[ "x$ac_cv_use_amrnb" = "xstatic" ]]; then + ac_cv_use_amrnb=/usr +@@ -1213,9 +1214,9 @@ fi + if [[ "x$ac_cv_use_amrnb" != "xno" ]]; then + AC_MSG_CHECKING([for AMR-NB in $ac_cv_use_amrnb]) + local_lib="$ARCHLIB" +-amrinc="$ac_cv_use_amrnb/include/amrnb" +-test -f "$ac_cv_use_amrnb/$local_lib/libamrnb.so" || local_lib="lib" +-if [[ -f "$ac_cv_use_amrnb/$local_lib/libamrnb.so" -a -f "$amrinc/interf_rom.h" ]]; then ++amrinc="$ac_cv_use_amrnb/include/opencore-amrnb" ++test -f "$ac_cv_use_amrnb/$local_lib/libopencore-amrnb.so" || local_lib="lib" ++if [[ -f "$ac_cv_use_amrnb/$local_lib/libopencore-amrnb.so" -a -f "$amrinc/interf_enc.h" ]]; then + HAVE_AMRNB=yes + AMRNB_LIB="-L$ac_cv_use_amrnb/$local_lib $AMRNB_LIB" + AMRNB_INC="-I$amrinc" diff --git a/net/yate/files/patch-modules_amrnbcodec.cpp b/net/yate/files/patch-modules_amrnbcodec.cpp new file mode 100644 index 000000000000..f0ac4587c3bb --- /dev/null +++ b/net/yate/files/patch-modules_amrnbcodec.cpp @@ -0,0 +1,23 @@ +--- modules/amrnbcodec.cpp.orig 2017-08-14 12:53:31 UTC ++++ modules/amrnbcodec.cpp +@@ -30,7 +30,19 @@ extern "C" { + } + namespace RxTypes { + // There is a conflict between encoder and decoder so insulate in a namespace +-#include ++extern "C" { ++ // copied from ${WRKSRC}/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/frame.h of audio/opencore-amr ++ enum RXFrameType { RX_SPEECH_GOOD = 0, ++ RX_SPEECH_DEGRADED, ++ RX_ONSET, ++ RX_SPEECH_BAD, ++ RX_SID_FIRST, ++ RX_SID_UPDATE, ++ RX_SID_BAD, ++ RX_NO_DATA, ++ RX_N_FRAMETYPES /* number of frame types */ ++ }; ++} + }; + + // IF1/GP3 is Bandwidth-Efficient Mode diff --git a/net/yate/files/patch-modules_efrcodec.cpp b/net/yate/files/patch-modules_efrcodec.cpp new file mode 100644 index 000000000000..f5865f06c209 --- /dev/null +++ b/net/yate/files/patch-modules_efrcodec.cpp @@ -0,0 +1,23 @@ +--- modules/efrcodec.cpp.orig 2017-03-28 09:13:48 UTC ++++ modules/efrcodec.cpp +@@ -31,7 +31,19 @@ extern "C" { + } + namespace RxTypes { + // There is a conflict between encoder and decoder so insulate in a namespace +-#include ++extern "C" { ++ // copied from ${WRKSRC}/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/frame.h of audio/opencore-amr ++ enum RXFrameType { RX_SPEECH_GOOD = 0, ++ RX_SPEECH_DEGRADED, ++ RX_ONSET, ++ RX_SPEECH_BAD, ++ RX_SID_FIRST, ++ RX_SID_UPDATE, ++ RX_SID_BAD, ++ RX_NO_DATA, ++ RX_N_FRAMETYPES /* number of frame types */ ++ }; ++} + }; + + using namespace TelEngine; diff --git a/net/yate/pkg-plist b/net/yate/pkg-plist index 8c0e99c8c1d6..31b2e083a15c 100644 --- a/net/yate/pkg-plist +++ b/net/yate/pkg-plist @@ -151,8 +151,8 @@ lib/yate/sig/ss7_lnp_ansi.yate lib/yate/jabber/jabberserver.yate lib/yate/jabber/jbfeatures.yate lib/yate/sip/sip_cnam_lnp.yate -%%AMRNB%%lib/yate/amrnbcodec.yate -%%AMRNB%%lib/yate/efrcodec.yate +%%AMR%%lib/yate/amrnbcodec.yate +%%AMR%%lib/yate/efrcodec.yate %%SPANDSP%%lib/yate/faxchan.yate %%H323%%lib/yate/h323chan.yate %%ILBC%%lib/yate/ilbccodec.yate