Attachment #249035 for bug #277445




PORTNAME=	pjsip
DISTVERSION=	2.14
PORTREVISION=	1
CATEGORIES=	net

MAINTAINER=	oliver.epper@gmail.com
COMMENT=	Multimedia communication library written in C language
WWW=		https://www.pjsip.org/

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libportaudio.so:audio/portaudio
		libuuid.so:misc/e2fsprogs-libuuid

USES=		cpe gmake localbase ssl
USE_LDCONFIG=	yes

USE_GITHUB=	yes

CPE_VENDOR=	teluu

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-external-pa

PATHFIX_MAKEFILEIN=	Makefile
PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"

OPTIONS_DEFINE=	SHARED OPUS WEBRTC VIDEO KQUEUE UPNP PJSUA FFMPEG DEBUG

OPTIONS_DEFAULT=SHARED OPUS WEBRTC VIDEO UPNP FFMPEG

		VIDEO VPX WEBRTC

EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk pjsip backend)
G711_DESC=	G.711 codec support
G722_DESC=	G.722 codec support
G7221_DESC=	G.722.1 codec support
ILBC_DESC=	iLBC codec support
L16_DESC=	Linear/L16 codec support
OPENH264_DESC=	OpenH264 support
PJSUA_DESC=	Command line SIP agent
PJSUA2_DESC=	SIP User agent 2 library
RESAMPLE_DESC=	Enable resampling implementations
RESAMPLEDLL_DESC=	Build libresample as shared library
SHARED_DESC=	Build shared libraries (other ports may depend on this)
SPEEXAEC_DESC=	Speex Acoustic Echo Canceller/AEC
WEBRTC_DESC=	Build libwebrtc
KQUEUE_DESC=	Use kqueue ioqueue on macos/BSD (experimental)
UPNP_DESC=	Disable UPnP (default: not disabled)
PJSUA_DESC=	Command line SIP agent

OPTIONS_SUB=	yes

AMR_CONFIGURE_WITH=		opencore-amr
AMR_LIB_DEPENDS=		libopencore-amrwb.so:audio/opencore-amr \
				libvo-amrwbenc.so:audio/vo-amrwbenc
DEBUG_CFLAGS=			-DNDEBUG=0
DEBUG_CFLAGS_OFF=		-DNDEBUG=1
EXTSRTP_CONFIGURE_WITH=		external-srtp
EXTSRTP_CONFLICTS_OFF=		libsrtp libsrtp2
EXTSRTP_LIB_DEPENDS=		libsrtp2.so:net/libsrtp2
FFMPEG_CONFIGURE_ENABLE=	ffmpeg
FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
G711_CONFIGURE_ENABLE=		g711-codec
G722_CONFIGURE_ENABLE=		g722-codec
G7221_CONFIGURE_ENABLE=		g7221-codec
GSM_CONFIGURE_ENABLE=		gsm-codec
GSM_CONFIGURE_ON=		--with-external-gsm
GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
ILBC_CONFIGURE_ENABLE=		ilbc-codec
IPV6_CFLAGS=			-DPJ_HAS_IPV6=1
IPV6_CFLAGS_OFF=		-DPJ_HAS_IPV6=0
L16_CONFIGURE_ENABLE=		l16-codec
OPENH264_CONFIGURE_ENABLE=	openh264
OPENH264_LIB_DEPENDS=		libopenh264.so:multimedia/openh264
OPUS_CONFIGURE_ENABLE=		opus
OPUS_LIB_DEPENDS=		libopus.so:audio/opus
PJSUA2_CONFIGURE_ENABLE=	pjsua2
RESAMPLE_CONFIGURE_ENABLE=	resample
RESAMPLEDLL_CONFIGURE_ENABLE=	resample-dll
SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
SDL_CONFIGURE_ENABLE=		sdl
SDL_USES=			sdl
SDL_USE=			SDL=sdl
SHARED_CONFIGURE_ENABLE=	shared
OPUS_CONFIGURE_OFF=		--disable-opus
OPUS_LIB_DEPENDS=		libopus.so:audio/opus

SPEEX_CONFIGURE_ON=		--with-external-speex
SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex \
				libspeexdsp.so:audio/speexdsp
V4L_BUILD_DEPENDS=		v4l_compat>=0:multimedia/v4l_compat
V4L_CONFIGURE_ENABLE=		v4l2
V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
VIDEO_CONFIGURE_ENABLE=		video
VPX_CONFIGURE_ENABLE=		vpx
VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
WEBRTC_CONFIGURE_OFF=		--disable-libwebrtc
VIDEO_CONFIGURE_ENABLE=		video

UPNP_CONFIGURE_OFF=		--disable-upnp
UPNP_LIB_DEPENDS=		libupnp.so:devel/upnp

FFMPEG_CONFIGURE_OFF=		--disable-ffmpeg
FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg

post-patch:
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

	@${CP} ${FILESDIR}/config_site.h \
		${WRKSRC}/pjlib/include/pj/config_site.h

pre-build:
	@${MAKE_CMD} -C ${WRKSRC} dep
	@${MAKE_CMD} -C ${WRKSRC} clean

post-install-SHARED-on:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so


	${STAGEDIR}${PREFIX}/bin/pjsystest

.include <bsd.port.mk>

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MKQUEUE}
CONFIGURE_ARGS+=	--enable-kqueue
.else
# do nothing, because giving --disable-kqueue would enable kqueue
# fixed in: https://github.com/pjsip/pjproject/commit/c36802585ddefb3ca477d1f6d773d179510c5412
# once this lands > 2.14 this can go away
.endif

Lines 1-3 Link Here

(-)b/net/pjsip/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1688848530	1	TIMESTAMP = 1709547690
2	SHA256 (pjsip-pjproject-2.13.1_GH0.tar.gz) = 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d	2	SHA256 (pjsip-pjproject-2.14_GH0.tar.gz) = 5805c1171acab4af9684d7ad096dcb92f71fc42809852144e97e1413468c9981
3	SIZE (pjsip-pjproject-2.13.1_GH0.tar.gz) = 9746437	3	SIZE (pjsip-pjproject-2.14_GH0.tar.gz) = 10320713




#include <pj/config_site_sample.h>
 * Custom options imported from asterisk provided customizations.
 */

#include <sys/select.h>

#define PJ_MAX_HOSTNAME			(256)
#define PJSIP_MAX_URL_SIZE		(512)
#define PJ_IOQUEUE_MAX_HANDLES		(FD_SETSIZE)

#define PJ_SCANNER_USE_BITWISE		0

#define PJ_LOG_MAX_LEVEL		6

#define PJSIP_MAX_TSX_COUNT		((64*1024)-1)
#define PJSIP_MAX_DIALOG_COUNT		((64*1024)-1)
#define PJSIP_UDP_SO_SNDBUF_SIZE	(512*1024)
#define PJSIP_UDP_SO_RCVBUF_SIZE	(512*1024)

#define PJSIP_MAX_PKT_LEN		32000

/* Defaults too low for WebRTC */
#define PJ_ICE_MAX_CAND			32
#define PJ_ICE_MAX_CHECKS		(PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)

/* Increase limits to allow more formats */
#define PJMEDIA_MAX_SDP_FMT		64
#define PJMEDIA_MAX_SDP_BANDW		4
#define PJMEDIA_MAX_SDP_ATTR		(PJMEDIA_MAX_SDP_FMT*2 + 4)
#define PJMEDIA_MAX_SDP_MEDIA		16

/*
 * Turn off the periodic sending of CRLNCRLN.  Default is on (90 seconds),
 * which conflicts with the global section's keep_alive_interval option in
 * pjsip.conf in asterisk.
 */
#define PJSIP_TCP_KEEP_ALIVE_INTERVAL	0
#define PJSIP_TLS_KEEP_ALIVE_INTERVAL	0




--- aconfigure.orig	2023-11-01 09:37:28 UTC
+++ aconfigure
@@ -10177,7 +10177,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
 			FFMPEG_PREFIX=$with_ffmpeg
 			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
 printf "%s\n" "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
-			export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig
+			export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig
 		fi
 
 		for ac_prog in pkg-config "python pkgconfig.py"
@@ -10129,7 +10129,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
 			ac_webrtc_instset=sse2
 			ac_webrtc_cflags="-msse2"
 			;;




--- pjmedia/build/os-auto.mak.in.orig	2022-11-24 05:24:24 UTC
+++ pjmedia/build/os-auto.mak.in
@@ -242,49 +242,7 @@ endif
 endif
 
 
-#
-# MacOSX specific
-#
-ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# Unix specific
-#
-ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# Windows specific
-#
-ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
-else
 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# Null sound device
-#
-ifeq ($(AC_PJMEDIA_SND),null)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# External sound device
-#
-ifeq ($(AC_PJMEDIA_SND),external)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
 
 #
 # QT video device

Lines 1-4 Link Here

(-)b/net/pjsip/files/patch-pkgconfig.py (-1 / +1 lines)
1	--- pkgconfig.py.orig 2012-10-04 07:36:39 UTC	1	--- pkgconfig.py.orig 2024-03-04 22:10:19 UTC
2	+++ pkgconfig.py	2	+++ pkgconfig.py
3	@@ -117,7 +117,7 @@ if __name__ == "__main__":	3	@@ -117,7 +117,7 @@ if __name__ == "__main__":
4	# Fix search path	4	# Fix search path

Lines 1-6 Link Here

(-)b/net/pjsip/files/patch-third__party_build_os-auto.mak.in (-2 / +2 lines)
1	--- third_party/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC	1	--- third_party/build/os-auto.mak.in.orig 2024-03-08 17:33:31 UTC
2	+++ third_party/build/os-auto.mak.in	2	+++ third_party/build/os-auto.mak.in
3	@@ -112,8 +112,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),)	3	@@ -118,8 +118,7 @@ else # Generic fixed point
4	else # Generic fixed point	4	else # Generic fixed point
5	WEBRTC_SRC = \	5	WEBRTC_SRC = \
6	modules/audio_processing/aecm/aecm_core_c.o \	6	modules/audio_processing/aecm/aecm_core_c.o \

Removed Link Here

(-)a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c (-11 lines)
1	--- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c.orig 2016-08-29 08:44:54 UTC
2	+++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c
3	@@ -1478,7 +1478,7 @@ AecCore* WebRtcAec_CreateAec() {
4	WebRtcAec_ComfortNoise = ComfortNoise;
5	WebRtcAec_SubbandCoherence = SubbandCoherence;
6
7	-#if defined(WEBRTC_ARCH_X86_FAMILY)
8	+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
9	if (WebRtc_GetCPUInfo(kSSE2)) {
10	WebRtcAec_InitAec_SSE2();
11	}

Removed Link Here

(-)a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c (-11 lines)
1	--- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c.orig 2016-08-25 01:36:33 UTC
2	+++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c
3	@@ -571,7 +571,7 @@ void aec_rdft_init(void) {
4	cftfsub_128 = cftfsub_128_C;
5	cftbsub_128 = cftbsub_128_C;
6	bitrv2_128 = bitrv2_128_C;
7	-#if defined(WEBRTC_ARCH_X86_FAMILY)
8	+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
9	if (WebRtc_GetCPUInfo(kSSE2)) {
10	aec_rdft_init_sse2();
11	}




--- third_party/webrtc/src/webrtc/typedefs.h.orig	2017-01-07 23:05:15 UTC
+++ third_party/webrtc/src/webrtc/typedefs.h
@@ -48,7 +48,19 @@
 #define WEBRTC_ARCH_32_BITS
 #define WEBRTC_ARCH_LITTLE_ENDIAN
 #else
-#error Please add support for your architecture in typedefs.h
+/* instead of failing, use typical unix defines... */
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define WEBRTC_ARCH_BIG_ENDIAN
+#else
+#error __BYTE_ORDER__ is not defined
+#endif
+#if defined(__LP64__)
+#define WEBRTC_ARCH_64_BITS
+#else
+#define WEBRTC_ARCH_32_BITS
+#endif
 #endif
 
 #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))




include/pj/assert.h
include/pj/compat/assert.h
include/pj/compat/cc_armcc.h
include/pj/compat/cc_clang.h
include/pj/compat/cc_codew.h
include/pj/compat/cc_gcc.h
include/pj/compat/cc_gcce.h

include/pjmedia-codec/l16.h
include/pjmedia-codec/opencore_amr.h
include/pjmedia-codec/openh264.h
include/pjmedia-codec/opus.h
include/pjmedia-codec/passthrough.h
include/pjmedia-codec/silk.h
include/pjmedia-codec/speex.h
include/pjmedia-codec/types.h
include/pjmedia-codec/vid_toolbox.h
include/pjmedia-codec/vpx.h
include/pjmedia-codec/vpx_packetizer.h
include/pjmedia-videodev/avi_dev.h
include/pjmedia-videodev/config.h

include/pjsua-lib/pjsua.h
include/pjsua-lib/pjsua_internal.h
include/pjsua.h
include/pjsua2.hpp
include/pjsua2/account.hpp
include/pjsua2/call.hpp
include/pjsua2/config.hpp
include/pjsua2/doxygen.hpp
include/pjsua2/endpoint.hpp
include/pjsua2/json.hpp
include/pjsua2/media.hpp
include/pjsua2/persistent.hpp
include/pjsua2/presence.hpp
include/pjsua2/siptypes.hpp
include/pjsua2/types.hpp
lib/libg7221codec-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libg7221codec.so
%%SHARED%%lib/libg7221codec.so.2
lib/libgsmcodec-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libgsmcodec.so
%%SHARED%%lib/libgsmcodec.so.2
lib/libilbccodec-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libilbccodec.so
%%SHARED%%lib/libilbccodec.so.2
lib/libpj-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libpj.so
%%SHARED%%lib/libpj.so.2

lib/libpjsua-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libpjsua.so
%%SHARED%%lib/libpjsua.so.2
lib/libpjsua2-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libpjsua2.so
%%SHARED%%lib/libpjsua2.so.2
lib/libresample-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libresample.so
%%SHARED%%lib/libresample.so.2
lib/libspeex-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libspeex.so
%%SHARED%%lib/libspeex.so.2
lib/libsrtp-%%CONFIGURE_TARGET%%.a
%%SHARED%%lib/libsrtp.so
%%SHARED%%lib/libsrtp.so.2
%%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a
%%WEBRTC%%%%SHARED%%lib/libwebrtc.so
%%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2
%%SHARED%%%%VIDEO%%lib/libyuv.so
%%SHARED%%%%VIDEO%%lib/libyuv.so.2
%%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a
%%VIDEO%%%%SHARED%%lib/libyuv.so
%%VIDEO%%%%SHARED%%lib/libyuv.so.2
libdata/pkgconfig/libpjproject.pc
- 

Return to bug 277445

Lines 19-24 include/pj/array.h Link Here

(-)b/net/pjsip/pkg-plist (-32 / +38 lines)
19	include/pj/assert.h	19	include/pj/assert.h
20	include/pj/compat/assert.h	20	include/pj/compat/assert.h
21	include/pj/compat/cc_armcc.h	21	include/pj/compat/cc_armcc.h
		22	include/pj/compat/cc_clang.h
22	include/pj/compat/cc_codew.h	23	include/pj/compat/cc_codew.h
23	include/pj/compat/cc_gcc.h	24	include/pj/compat/cc_gcc.h
24	include/pj/compat/cc_gcce.h	25	include/pj/compat/cc_gcce.h
Lines 152-164 include/pjmedia-codec/ipp_codecs.h Link Here
152	include/pjmedia-codec/l16.h	153	include/pjmedia-codec/l16.h
153	include/pjmedia-codec/opencore_amr.h	154	include/pjmedia-codec/opencore_amr.h
154	include/pjmedia-codec/openh264.h	155	include/pjmedia-codec/openh264.h
155	%%OPUS%%include/pjmedia-codec/opus.h	156	include/pjmedia-codec/opus.h
156	include/pjmedia-codec/passthrough.h	157	include/pjmedia-codec/passthrough.h
157	include/pjmedia-codec/silk.h	158	include/pjmedia-codec/silk.h
158	include/pjmedia-codec/speex.h	159	include/pjmedia-codec/speex.h
159	include/pjmedia-codec/types.h	160	include/pjmedia-codec/types.h
160	include/pjmedia-codec/vid_toolbox.h	161	include/pjmedia-codec/vid_toolbox.h
161	%%VPX%%include/pjmedia-codec/vpx.h	162	include/pjmedia-codec/vpx.h
162	include/pjmedia-codec/vpx_packetizer.h	163	include/pjmedia-codec/vpx_packetizer.h
163	include/pjmedia-videodev/avi_dev.h	164	include/pjmedia-videodev/avi_dev.h
164	include/pjmedia-videodev/config.h	165	include/pjmedia-videodev/config.h
Lines 303-326 include/pjsip_ua.h Link Here
303	include/pjsua-lib/pjsua.h	304	include/pjsua-lib/pjsua.h
304	include/pjsua-lib/pjsua_internal.h	305	include/pjsua-lib/pjsua_internal.h
305	include/pjsua.h	306	include/pjsua.h
306	%%PJSUA2%%include/pjsua2.hpp	307	include/pjsua2.hpp
307	%%PJSUA2%%include/pjsua2/account.hpp	308	include/pjsua2/account.hpp
308	%%PJSUA2%%include/pjsua2/call.hpp	309	include/pjsua2/call.hpp
309	%%PJSUA2%%include/pjsua2/config.hpp	310	include/pjsua2/config.hpp
310	%%PJSUA2%%include/pjsua2/doxygen.hpp	311	include/pjsua2/doxygen.hpp
311	%%PJSUA2%%include/pjsua2/endpoint.hpp	312	include/pjsua2/endpoint.hpp
312	%%PJSUA2%%include/pjsua2/json.hpp	313	include/pjsua2/json.hpp
313	%%PJSUA2%%include/pjsua2/media.hpp	314	include/pjsua2/media.hpp
314	%%PJSUA2%%include/pjsua2/persistent.hpp	315	include/pjsua2/persistent.hpp
315	%%PJSUA2%%include/pjsua2/presence.hpp	316	include/pjsua2/presence.hpp
316	%%PJSUA2%%include/pjsua2/siptypes.hpp	317	include/pjsua2/siptypes.hpp
317	%%PJSUA2%%include/pjsua2/types.hpp	318	include/pjsua2/types.hpp
318	%%G7221%%lib/libg7221codec-%%CONFIGURE_TARGET%%.a	319	lib/libg7221codec-%%CONFIGURE_TARGET%%.a
319	%%SHARED%%%%G7221%%lib/libg7221codec.so	320	%%SHARED%%lib/libg7221codec.so
320	%%SHARED%%%%G7221%%lib/libg7221codec.so.2	321	%%SHARED%%lib/libg7221codec.so.2
321	%%ILBC%%lib/libilbccodec-%%CONFIGURE_TARGET%%.a	322	lib/libgsmcodec-%%CONFIGURE_TARGET%%.a
322	%%SHARED%%%%ILBC%%lib/libilbccodec.so	323	%%SHARED%%lib/libgsmcodec.so
323	%%SHARED%%%%ILBC%%lib/libilbccodec.so.2	324	%%SHARED%%lib/libgsmcodec.so.2
		325	lib/libilbccodec-%%CONFIGURE_TARGET%%.a
		326	%%SHARED%%lib/libilbccodec.so
		327	%%SHARED%%lib/libilbccodec.so.2
324	lib/libpj-%%CONFIGURE_TARGET%%.a	328	lib/libpj-%%CONFIGURE_TARGET%%.a
325	%%SHARED%%lib/libpj.so	329	%%SHARED%%lib/libpj.so
326	%%SHARED%%lib/libpj.so.2	330	%%SHARED%%lib/libpj.so.2
Lines 354-372 lib/libpjsip-ua-%%CONFIGURE_TARGET%%.a Link Here
354	lib/libpjsua-%%CONFIGURE_TARGET%%.a	358	lib/libpjsua-%%CONFIGURE_TARGET%%.a
355	%%SHARED%%lib/libpjsua.so	359	%%SHARED%%lib/libpjsua.so
356	%%SHARED%%lib/libpjsua.so.2	360	%%SHARED%%lib/libpjsua.so.2
357	%%PJSUA2%%lib/libpjsua2-%%CONFIGURE_TARGET%%.a	361	lib/libpjsua2-%%CONFIGURE_TARGET%%.a
358	%%PJSUA2%%%%SHARED%%lib/libpjsua2.so	362	%%SHARED%%lib/libpjsua2.so
359	%%PJSUA2%%%%SHARED%%lib/libpjsua2.so.2	363	%%SHARED%%lib/libpjsua2.so.2
360	%%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a	364	lib/libresample-%%CONFIGURE_TARGET%%.a
361	%%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so	365	%%SHARED%%lib/libresample.so
362	%%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2	366	%%SHARED%%lib/libresample.so.2
363	%%NO_EXTSRTP%%lib/libsrtp-%%CONFIGURE_TARGET%%.a	367	lib/libspeex-%%CONFIGURE_TARGET%%.a
364	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so	368	%%SHARED%%lib/libspeex.so
365	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2	369	%%SHARED%%lib/libspeex.so.2
		370	lib/libsrtp-%%CONFIGURE_TARGET%%.a
		371	%%SHARED%%lib/libsrtp.so
		372	%%SHARED%%lib/libsrtp.so.2
366	%%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a	373	%%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a
367	%%WEBRTC%%%%SHARED%%lib/libwebrtc.so	374	%%WEBRTC%%%%SHARED%%lib/libwebrtc.so
368	%%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2	375	%%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2
369	%%SHARED%%%%VIDEO%%lib/libyuv.so
370	%%SHARED%%%%VIDEO%%lib/libyuv.so.2
371	%%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a	376	%%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a
		377	%%VIDEO%%%%SHARED%%lib/libyuv.so
		378	%%VIDEO%%%%SHARED%%lib/libyuv.so.2
372	libdata/pkgconfig/libpjproject.pc	379	libdata/pkgconfig/libpjproject.pc
373	-

Lines 1-19 Link Here

(-)b/net/pjsip/Makefile (-68 / +37 lines)
1	PORTNAME= pjsip	1	PORTNAME= pjsip
2	DISTVERSION= 2.13.1	2	DISTVERSION= 2.14
3	PORTREVISION= 1	3	PORTREVISION= 1
4	CATEGORIES= net	4	CATEGORIES= net
5		5
6	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= oliver.epper@gmail.com
7	COMMENT= Multimedia communication library written in C language	7	COMMENT= Multimedia communication library written in C language
8	WWW= https://www.pjsip.org/	8	WWW= https://www.pjsip.org/
9		9
10	LICENSE= GPLv2+	10	LICENSE= GPLv2+
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	LIB_DEPENDS= libportaudio.so:audio/portaudio \	13	LIB_DEPENDS= libportaudio.so:audio/portaudio
14	libuuid.so:misc/e2fsprogs-libuuid
15		14
16	USES= cpe gmake localbase pathfix ssl tar:bz2	15	USES= cpe gmake localbase ssl
17	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
18		17
19	USE_GITHUB= yes	18	USE_GITHUB= yes
Lines 22-101 GH_PROJECT= pjproject Link Here
22	CPE_VENDOR= teluu	21	CPE_VENDOR= teluu
23		22
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --with-external-pa \	24	CONFIGURE_ARGS= --with-external-pa
26	--disable-silk	25
27	PATHFIX_MAKEFILEIN= Makefile
28	PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"	26	PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"
29		27
30	OPTIONS_DEFINE= AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \	28	OPTIONS_DEFINE= SHARED OPUS WEBRTC VIDEO KQUEUE UPNP PJSUA FFMPEG DEBUG
31	L16 OPENH264 OPUS PJSUA PJSUA2 RESAMPLE RESAMPLEDLL \	29
32	SAMPLERATE SDL SHARED SOUND SPEEX SPEEXAEC V4L VIDEO VPX WEBRTC	30	OPTIONS_DEFAULT=SHARED OPUS WEBRTC VIDEO UPNP FFMPEG
33	OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 OPUS PJSUA2 SHARED SPEEX SPEEXAEC \	31
34	VIDEO VPX WEBRTC
35
36	EXTSRTP_DESC= Use libsrtp port (needed to get SRTP support in asterisk pjsip backend)
37	G711_DESC= G.711 codec support
38	G722_DESC= G.722 codec support
39	G7221_DESC= G.722.1 codec support
40	ILBC_DESC= iLBC codec support
41	L16_DESC= Linear/L16 codec support
42	OPENH264_DESC= OpenH264 support
43	PJSUA_DESC= Command line SIP agent
44	PJSUA2_DESC= SIP User agent 2 library
45	RESAMPLE_DESC= Enable resampling implementations
46	RESAMPLEDLL_DESC= Build libresample as shared library
47	SHARED_DESC= Build shared libraries (other ports may depend on this)	32	SHARED_DESC= Build shared libraries (other ports may depend on this)
48	SPEEXAEC_DESC= Speex Acoustic Echo Canceller/AEC
49	WEBRTC_DESC= Build libwebrtc	33	WEBRTC_DESC= Build libwebrtc
		34	KQUEUE_DESC= Use kqueue ioqueue on macos/BSD (experimental)
		35	UPNP_DESC= Disable UPnP (default: not disabled)
		36	PJSUA_DESC= Command line SIP agent
50		37
51	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
52		39
53	AMR_CONFIGURE_WITH= opencore-amr
54	AMR_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr \
55	libvo-amrwbenc.so:audio/vo-amrwbenc
56	DEBUG_CFLAGS= -DNDEBUG=0	40	DEBUG_CFLAGS= -DNDEBUG=0
57	DEBUG_CFLAGS_OFF= -DNDEBUG=1	41	DEBUG_CFLAGS_OFF= -DNDEBUG=1
58	EXTSRTP_CONFIGURE_WITH= external-srtp
59	EXTSRTP_CONFLICTS_OFF= libsrtp libsrtp2
60	EXTSRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2
61	FFMPEG_CONFIGURE_ENABLE= ffmpeg
62	FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg
63	G711_CONFIGURE_ENABLE= g711-codec
64	G722_CONFIGURE_ENABLE= g722-codec
65	G7221_CONFIGURE_ENABLE= g7221-codec
66	GSM_CONFIGURE_ENABLE= gsm-codec
67	GSM_CONFIGURE_ON= --with-external-gsm
68	GSM_LIB_DEPENDS= libgsm.so:audio/gsm
69	ILBC_CONFIGURE_ENABLE= ilbc-codec
70	IPV6_CFLAGS= -DPJ_HAS_IPV6=1
71	IPV6_CFLAGS_OFF= -DPJ_HAS_IPV6=0
72	L16_CONFIGURE_ENABLE= l16-codec
73	OPENH264_CONFIGURE_ENABLE= openh264
74	OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
75	OPUS_CONFIGURE_ENABLE= opus
76	OPUS_LIB_DEPENDS= libopus.so:audio/opus
77	PJSUA2_CONFIGURE_ENABLE= pjsua2
78	RESAMPLE_CONFIGURE_ENABLE= resample
79	RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll
80	SAMPLERATE_CONFIGURE_ENABLE= libsamplerate
81	SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
82	SDL_CONFIGURE_ENABLE= sdl
83	SDL_USES= sdl
84	SDL_USE= SDL=sdl
85	SHARED_CONFIGURE_ENABLE= shared	42	SHARED_CONFIGURE_ENABLE= shared
86	SOUND_CONFIGURE_ENABLE= sound	43	OPUS_CONFIGURE_OFF= --disable-opus
87	SPEEXAEC_CONFIGURE_ENABLE= speex-aec	44	OPUS_LIB_DEPENDS= libopus.so:audio/opus
88	SPEEX_CONFIGURE_ENABLE= speex-codec	45
89	SPEEX_CONFIGURE_ON= --with-external-speex
90	SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \
91	libspeexdsp.so:audio/speexdsp
92	V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
93	V4L_CONFIGURE_ENABLE= v4l2
94	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
95	VIDEO_CONFIGURE_ENABLE= video
96	VPX_CONFIGURE_ENABLE= vpx
97	VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
98	WEBRTC_CONFIGURE_OFF= --disable-libwebrtc	46	WEBRTC_CONFIGURE_OFF= --disable-libwebrtc
		47	VIDEO_CONFIGURE_ENABLE= video
		48
		49	UPNP_CONFIGURE_OFF= --disable-upnp
		50	UPNP_LIB_DEPENDS= libupnp.so:devel/upnp
		51
		52	FFMPEG_CONFIGURE_OFF= --disable-ffmpeg
		53	FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg
99		54
100	post-patch:	55	post-patch:
101	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \	56	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
Lines 103-108 post-patch: Link Here
103	@${CP} ${FILESDIR}/config_site.h \	58	@${CP} ${FILESDIR}/config_site.h \
104	${WRKSRC}/pjlib/include/pj/config_site.h	59	${WRKSRC}/pjlib/include/pj/config_site.h
105		60
		61	pre-build:
		62	@${MAKE_CMD} -C ${WRKSRC} dep
		63	@${MAKE_CMD} -C ${WRKSRC} clean
		64
106	post-install-SHARED-on:	65	post-install-SHARED-on:
107	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so	66	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
108		67
Lines 115-117 post-install-PJSUA-on: Link Here
115	${STAGEDIR}${PREFIX}/bin/pjsystest	74	${STAGEDIR}${PREFIX}/bin/pjsystest
116		75
117	.include <bsd.port.mk>	76	.include <bsd.port.mk>
		77
		78	.include <bsd.port.options.mk>
		79
		80	.if ${PORT_OPTIONS:MKQUEUE}
		81	CONFIGURE_ARGS+= --enable-kqueue
		82	.else
		83	# do nothing, because giving --disable-kqueue would enable kqueue
		84	# fixed in: https://github.com/pjsip/pjproject/commit/c36802585ddefb3ca477d1f6d773d179510c5412
		85	# once this lands > 2.14 this can go away
		86	.endif

Lines 1-38 Link Here

(-)b/net/pjsip/files/config_site.h (-38 / +1 lines)
1	/*	1	#include <pj/config_site_sample.h>
2	* Custom options imported from asterisk provided customizations.
3	*/
4
5	#include <sys/select.h>
6
7	#define PJ_MAX_HOSTNAME (256)
8	#define PJSIP_MAX_URL_SIZE (512)
9	#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)
10
11	#define PJ_SCANNER_USE_BITWISE 0
12
13	#define PJ_LOG_MAX_LEVEL 6
14
15	#define PJSIP_MAX_TSX_COUNT ((64*1024)-1)
16	#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1)
17	#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024)
18	#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024)
19
20	#define PJSIP_MAX_PKT_LEN 32000
21
22	/* Defaults too low for WebRTC */
23	#define PJ_ICE_MAX_CAND 32
24	#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)
25
26	/* Increase limits to allow more formats */
27	#define PJMEDIA_MAX_SDP_FMT 64
28	#define PJMEDIA_MAX_SDP_BANDW 4
29	#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*2 + 4)
30	#define PJMEDIA_MAX_SDP_MEDIA 16
31
32	/*
33	* Turn off the periodic sending of CRLNCRLN. Default is on (90 seconds),
34	* which conflicts with the global section's keep_alive_interval option in
35	* pjsip.conf in asterisk.
36	*/
37	#define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0
38	#define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0

Lines 1-15 Link Here

(-)b/net/pjsip/files/patch-aconfigure (-11 / +2 lines)
1	--- aconfigure.orig 2022-11-24 05:24:24 UTC	1	--- aconfigure.orig 2023-11-01 09:37:28 UTC
2	+++ aconfigure	2	+++ aconfigure
3	@@ -8059,7 +8059,7 @@ else $as_nop	3	@@ -10177,7 +10177,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
4	FFMPEG_PREFIX=$with_ffmpeg
5	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
6	printf "%s\n" "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
7	- export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig
8	+ export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig
9	fi
10
11	for ac_prog in pkg-config "python pkgconfig.py"
12	@@ -10129,7 +10129,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
13	ac_webrtc_instset=sse2	4	ac_webrtc_instset=sse2
14	ac_webrtc_cflags="-msse2"	5	ac_webrtc_cflags="-msse2"
15	;;	6	;;

Removed Link Here

(-)a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (-52 lines)
1	--- pjmedia/build/os-auto.mak.in.orig 2022-11-24 05:24:24 UTC
2	+++ pjmedia/build/os-auto.mak.in
3	@@ -242,49 +242,7 @@ endif
4	endif
5
6
7	-#
8	-# MacOSX specific
9	-#
10	-ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
11	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
12	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
13	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
14	-endif
15	-
16	-#
17	-# Unix specific
18	-#
19	-ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
20	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
21	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
22	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
23	-endif
24	-
25	-#
26	-# Windows specific
27	-#
28	-ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
29	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
30	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
31	-else
32	export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
33	-endif
34	-
35	-#
36	-# Null sound device
37	-#
38	-ifeq ($(AC_PJMEDIA_SND),null)
39	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
40	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
41	-endif
42	-
43	-#
44	-# External sound device
45	-#
46	-ifeq ($(AC_PJMEDIA_SND),external)
47	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
48	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
49	-endif
50
51	#
52	# QT video device

Removed Link Here

(-)a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h (-23 lines)
1	--- third_party/webrtc/src/webrtc/typedefs.h.orig 2017-01-07 23:05:15 UTC
2	+++ third_party/webrtc/src/webrtc/typedefs.h
3	@@ -48,7 +48,19 @@
4	#define WEBRTC_ARCH_32_BITS
5	#define WEBRTC_ARCH_LITTLE_ENDIAN
6	#else
7	-#error Please add support for your architecture in typedefs.h
8	+/* instead of failing, use typical unix defines... */
9	+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
10	+#define WEBRTC_ARCH_LITTLE_ENDIAN
11	+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
12	+#define WEBRTC_ARCH_BIG_ENDIAN
13	+#else
14	+#error __BYTE_ORDER__ is not defined
15	+#endif
16	+#if defined(__LP64__)
17	+#define WEBRTC_ARCH_64_BITS
18	+#else
19	+#define WEBRTC_ARCH_32_BITS
20	+#endif
21	#endif
22
23	#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))