Attachment #250843 for bug #277802





PLIST_SUB=	VERSION="${PORTVERSION}"

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

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




--- configure.ac.orig	2024-01-15 13:41:34 UTC
+++ configure.ac
@@ -113,7 +113,8 @@ if [[ "x$ac_cv_no_overload_virt" = "xyes" ]]; then
 fi
 AC_MSG_RESULT([$ac_cv_no_overload_virt])
 

 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"




--- 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 <sp_dec.h>
+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




--- 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 <sp_dec.h>
+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;

Lines 151-158 lib/yate/sig/ss7_lnp_ansi.yate Link Here

(-)b/net/yate/pkg-plist (-2 / +2 lines)
151	lib/yate/jabber/jabberserver.yate	151	lib/yate/jabber/jabberserver.yate
152	lib/yate/jabber/jbfeatures.yate	152	lib/yate/jabber/jbfeatures.yate
153	lib/yate/sip/sip_cnam_lnp.yate	153	lib/yate/sip/sip_cnam_lnp.yate
154	%%AMRNB%%lib/yate/amrnbcodec.yate	154	%%AMR%%lib/yate/amrnbcodec.yate
155	%%AMRNB%%lib/yate/efrcodec.yate	155	%%AMR%%lib/yate/efrcodec.yate
156	%%SPANDSP%%lib/yate/faxchan.yate	156	%%SPANDSP%%lib/yate/faxchan.yate
157	%%H323%%lib/yate/h323chan.yate	157	%%H323%%lib/yate/h323chan.yate
158	%%ILBC%%lib/yate/ilbccodec.yate	158	%%ILBC%%lib/yate/ilbccodec.yate

Return to bug 277802

Lines 49-67 GROUPS= yate Link Here

(-)b/net/yate/Makefile (-4 / +3 lines)
49		49
50	PLIST_SUB= VERSION="${PORTVERSION}"	50	PLIST_SUB= VERSION="${PORTVERSION}"
51		51
52	OPTIONS_DEFINE= AMRNB DAHDI DOCS H323 ILBC MYSQL PGSQL SCTP SPANDSP \	52	OPTIONS_DEFINE= AMR DAHDI DOCS H323 ILBC MYSQL PGSQL SCTP SPANDSP \
53	SQLITE	53	SQLITE
54	OPTIONS_DEFAULT= SCTP	54	OPTIONS_DEFAULT= SCTP
55	OPTIONS_SUB= yes	55	OPTIONS_SUB= yes
56		56
57	AMRNB_DESC= Adaptive Multi-Rate Narrowband support
58	DAHDI_DESC= Dahdi support	57	DAHDI_DESC= Dahdi support
59	H323_DESC= H323 software channel/protocol support	58	H323_DESC= H323 software channel/protocol support
60	ILBC_DESC= iLBC narrowband speech codec support	59	ILBC_DESC= iLBC narrowband speech codec support
61	SCTP_DESC= Stream Control Transmission Protocol support	60	SCTP_DESC= Stream Control Transmission Protocol support
62		61
63	AMRNB_LIB_DEPENDS= libamrnb.so:audio/libamrnb	62	AMR_CONFIGURE_WITH= amrnb=${LOCALBASE}
64	AMRNB_CONFIGURE_WITH= amrnb=${LOCALBASE}	63	AMR_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
65		64
66	DAHDI_BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:misc/dahdi \	65	DAHDI_BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:misc/dahdi \
67	libpri>=1.4.10:misc/libpri	66	libpri>=1.4.10:misc/libpri

Lines 1-6 Link Here

(-)b/net/yate/files/patch-configure.ac (-1 / +23 lines)
1	--- configure.ac.orig 2024-01-15 13:41:34 UTC	1	--- configure.ac.orig 2024-01-15 13:41:34 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -113,7 +113,8 @@ AC_MSG_RESULT([$ac_cv_no_overload_virt])	3	@@ -113,7 +113,8 @@ if [[ "x$ac_cv_no_overload_virt" = "xyes" ]]; then
4	fi	4	fi
5	AC_MSG_RESULT([$ac_cv_no_overload_virt])	5	AC_MSG_RESULT([$ac_cv_no_overload_virt])
6		6
Lines 10-12 Link Here
10	ld_unresolved_symbols=no	10	ld_unresolved_symbols=no
11	AC_MSG_CHECKING([if ld supports reporting unresolved symbols])	11	AC_MSG_CHECKING([if ld supports reporting unresolved symbols])
12	SAVE_CFLAGS="$CFLAGS"	12	SAVE_CFLAGS="$CFLAGS"
		13	@@ -1204,7 +1205,7 @@ AC_SUBST(SPEEX_LIB)
		14
		15	HAVE_AMRNB=no
		16	AMRNB_INC=""
		17	-AMRNB_LIB="-lamrnb"
		18	+AMRNB_LIB="-lopencore-amrnb"
		19	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])
		20	if [[ "x$ac_cv_use_amrnb" = "xstatic" ]]; then
		21	ac_cv_use_amrnb=/usr
		22	@@ -1213,9 +1214,9 @@ fi
		23	if [[ "x$ac_cv_use_amrnb" != "xno" ]]; then
		24	AC_MSG_CHECKING([for AMR-NB in $ac_cv_use_amrnb])
		25	local_lib="$ARCHLIB"
		26	-amrinc="$ac_cv_use_amrnb/include/amrnb"
		27	-test -f "$ac_cv_use_amrnb/$local_lib/libamrnb.so" \|\| local_lib="lib"
		28	-if [[ -f "$ac_cv_use_amrnb/$local_lib/libamrnb.so" -a -f "$amrinc/interf_rom.h" ]]; then
		29	+amrinc="$ac_cv_use_amrnb/include/opencore-amrnb"
		30	+test -f "$ac_cv_use_amrnb/$local_lib/libopencore-amrnb.so" \|\| local_lib="lib"
		31	+if [[ -f "$ac_cv_use_amrnb/$local_lib/libopencore-amrnb.so" -a -f "$amrinc/interf_enc.h" ]]; then
		32	HAVE_AMRNB=yes
		33	AMRNB_LIB="-L$ac_cv_use_amrnb/$local_lib $AMRNB_LIB"
		34	AMRNB_INC="-I$amrinc"

Added Link Here

(-)b/net/yate/files/patch-modules_amrnbcodec.cpp (+23 lines)
1	--- modules/amrnbcodec.cpp.orig 2017-08-14 12:53:31 UTC
2	+++ modules/amrnbcodec.cpp
3	@@ -30,7 +30,19 @@ extern "C" {
4	}
5	namespace RxTypes {
6	// There is a conflict between encoder and decoder so insulate in a namespace
7	-#include <sp_dec.h>
8	+extern "C" {
9	+ // copied from ${WRKSRC}/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/frame.h of audio/opencore-amr
10	+ enum RXFrameType { RX_SPEECH_GOOD = 0,
11	+ RX_SPEECH_DEGRADED,
12	+ RX_ONSET,
13	+ RX_SPEECH_BAD,
14	+ RX_SID_FIRST,
15	+ RX_SID_UPDATE,
16	+ RX_SID_BAD,
17	+ RX_NO_DATA,
18	+ RX_N_FRAMETYPES /* number of frame types */
19	+ };
20	+}
21	};
22
23	// IF1/GP3 is Bandwidth-Efficient Mode

Added Link Here

(-)b/net/yate/files/patch-modules_efrcodec.cpp (+23 lines)
1	--- modules/efrcodec.cpp.orig 2017-03-28 09:13:48 UTC
2	+++ modules/efrcodec.cpp
3	@@ -31,7 +31,19 @@ extern "C" {
4	}
5	namespace RxTypes {
6	// There is a conflict between encoder and decoder so insulate in a namespace
7	-#include <sp_dec.h>
8	+extern "C" {
9	+ // copied from ${WRKSRC}/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/frame.h of audio/opencore-amr
10	+ enum RXFrameType { RX_SPEECH_GOOD = 0,
11	+ RX_SPEECH_DEGRADED,
12	+ RX_ONSET,
13	+ RX_SPEECH_BAD,
14	+ RX_SID_FIRST,
15	+ RX_SID_UPDATE,
16	+ RX_SID_BAD,
17	+ RX_NO_DATA,
18	+ RX_N_FRAMETYPES /* number of frame types */
19	+ };
20	+}
21	};
22
23	using namespace TelEngine;