Attachment 249183 Details for Bug 277445 – Suggested Updates v2

[patch] Suggested Updates v2

0002-improvements-as-suggested-by-dizzy.patch (text/plain), 7.00 KB, created by Oliver Epper on 2024-03-15 09:23:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Epper

Created: 2024-03-15 09:23:57 UTC

Size: 7.00 KB

patch

obsolete

>From d3b807125ee3117fb1703ba34d19b5e22f3ca2b5 Mon Sep 17 00:00:00 2001
>From: Oliver Epper <oliver.epper@gmail.com>
>Date: Tue, 12 Mar 2024 09:02:35 +0100
>Subject: [PATCH 2/2] improvements as suggested by dizzy
>
>KQUEUE_CONFIGURE_ON
>
>GSM codec
>
>more codecs and unbundled speex
>
>AMR codec support
>
>G7221 and iLBC
>
>libsrtp
>
>less bundled libs
>
>libresample
>
>options sorted
>
>options sorted
>
>make amr default option
>
>fix for missing dependency
>
>resample and resample-dll as options
>---
> net/pjsip/Makefile  | 123 +++++++++++++++++++++++++++++---------------
> net/pjsip/pkg-plist |  27 ++++------
> 2 files changed, 91 insertions(+), 59 deletions(-)
>
>diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
>index 7ff2aef965aa..5ac0c58d940c 100644
>--- a/net/pjsip/Makefile
>+++ b/net/pjsip/Makefile
>@@ -1,56 +1,107 @@
>-PORTNAME=	pjsip
>-DISTVERSION=	2.14
>-PORTREVISION=	1
>-CATEGORIES=	net
>+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/
>+MAINTAINER=		oliver.epper@gmail.com
>+COMMENT=		Multimedia communication library written in C language
>+WWW=			https://www.pjsip.org/
> 
>-LICENSE=	GPLv2+
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE=		GPLv2+
>+LICENSE_FILE=		${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libportaudio.so:audio/portaudio
>+LIB_DEPENDS=		libportaudio.so:audio/portaudio
> 
>-USES=		cpe gmake localbase ssl
>-USE_LDCONFIG=	yes
>+USES=			cpe gmake localbase ssl pkgconfig
>+USE_LDCONFIG=		yes
> 
>-USE_GITHUB=	yes
>-GH_PROJECT=	pjproject
>+USE_GITHUB=		yes
>+GH_PROJECT=		pjproject
> 
>-CPE_VENDOR=	teluu
>+CPE_VENDOR=		teluu
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-external-pa
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ARGS=		--with-external-pa
> 
>-PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
>+PLIST_SUB=		CONFIGURE_TARGET="${CONFIGURE_TARGET}"
> 
>-OPTIONS_DEFINE=	SHARED OPUS WEBRTC VIDEO KQUEUE UPNP PJSUA FFMPEG DEBUG
>+OPTIONS_DEFINE=		AMR DEBUG FFMPEG G711 G722 G7221 GSM ILBC KQUEUE L16 OPUS PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SHARED SPEEX SPEEXAEC SRTP UPNP VIDEO WEBRTC
> 
>-OPTIONS_DEFAULT=SHARED OPUS WEBRTC VIDEO UPNP FFMPEG
>+OPTIONS_DEFAULT=	AMR FFMPEG G711 G722 G7221 GSM ILBC L16 OPUS RESAMPLE SHARED SPEEX SPEEXAEC SRTP UPNP VIDEO WEBRTC
> 
>-SHARED_DESC=	Build shared libraries (other ports may depend on this)
>-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
> 
>-OPTIONS_SUB=	yes
>+G711_DESC=		G.711 codec support
>+G7221_DESC=		G.722.1 codec support
>+G722_DESC=		G.722 codec support
>+ILBC_DESC=		iLBC codec support
>+KQUEUE_DESC=		Use kqueue ioqueue on macos/BSD (experimental)
>+L16_DESC=		Linear/L16 codec support
>+PJSUA_DESC=		Command line SIP agent
>+RESAMPLE_DESC=		Enable resampling implementations
>+RESAMPLEDLL_DESC=	Build libresample as a shared library
>+SHARED_DESC=		Build shared libraries (other ports may depend on this)
>+SPEEXAEC_DESC=		Speex Acoustic Echo Canceller/AEC
>+SRTP_DESC=		Secure Real-Time Transport Protocol â SRTP support
>+WEBRTC_DESC=		Build libwebrtc
>+
>+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
>-SHARED_CONFIGURE_ENABLE=	shared
>+
>+FFMPEG_CONFIGURE_OFF=		--disable-ffmpeg
>+FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
>+
>+G711_CONFIGURE_ENABLE=		g711-codec
>+
>+G7221_CONFIGURE_ENABLE=		g7221-codec
>+
>+G722_CONFIGURE_ENABLE=		g722-codec
>+
>+GSM_CONFIGURE_ENABLE=		gsm-codec
>+GSM_CONFIGURE_ON=		--with-external-gsm
>+GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
>+
>+ILBC_CONFIGURE_ENABLE=		ilbc-codec
>+
>+# This can become KQUEUE_CONFIGURE_ENABLE once
>+# https://github.com/pjsip/pjproject/commit/c36802585ddefb3ca477d1f6d773d179510c5412
>+# is included in the next release (> 2.14).
>+KQUEUE_CONFIGURE_ON=		--enable-kqueue
>+
>+L16_CONFIGURE_ENABLE=		l16-codec
>+
> OPUS_CONFIGURE_OFF=		--disable-opus
> OPUS_LIB_DEPENDS=		libopus.so:audio/opus
> 
>-WEBRTC_CONFIGURE_OFF=		--disable-libwebrtc
>-VIDEO_CONFIGURE_ENABLE=		video
>+RESAMPLE_CONFIGURE_ENABLE=	resample
>+RESAMPLEDLL_CONFIGURE_ENABLE=	resample-dll
>+
>+SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
>+SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
>+
>+SHARED_CONFIGURE_ENABLE=	shared
>+
>+SPEEXAEC_CONFIGURE_ENABLE=	speex-aec
>+
>+SPEEX_CONFIGURE_ENABLE=		speex-codec
>+SPEEX_CONFIGURE_ON=		--with-external-speex
>+SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex \
>+				libspeexdsp.so:audio/speexdsp
>+
>+SRTP_CONFIGURE_ENABLE=		libsrtp
>+SRTP_CONFIGURE_ON=		--with-external-srtp
>+SRTP_LIB_DEPENDS=		libsrtp2.so:net/libsrtp2
> 
> UPNP_CONFIGURE_OFF=		--disable-upnp
> UPNP_LIB_DEPENDS=		libupnp.so:devel/upnp
> 
>-FFMPEG_CONFIGURE_OFF=		--disable-ffmpeg
>-FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
>+VIDEO_CONFIGURE_ENABLE=		video
>+
>+WEBRTC_CONFIGURE_OFF=		--disable-libwebrtc
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>@@ -74,13 +125,3 @@ post-install-PJSUA-on:
> 	${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
>diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist
>index 8ecfca2ed806..9b9608463407 100644
>--- a/net/pjsip/pkg-plist
>+++ b/net/pjsip/pkg-plist
>@@ -316,15 +316,12 @@ 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
>+%%G7221%%lib/libg7221codec-%%CONFIGURE_TARGET%%.a
>+%%G7221%%%%SHARED%%lib/libg7221codec.so
>+%%G7221%%%%SHARED%%lib/libg7221codec.so.2
>+%%ILBC%%lib/libilbccodec-%%CONFIGURE_TARGET%%.a
>+%%ILBC%%%%SHARED%%lib/libilbccodec.so
>+%%ILBC%%%%SHARED%%lib/libilbccodec.so.2
> lib/libpj-%%CONFIGURE_TARGET%%.a
> %%SHARED%%lib/libpj.so
> %%SHARED%%lib/libpj.so.2
>@@ -361,15 +358,9 @@ lib/libpjsua-%%CONFIGURE_TARGET%%.a
> 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
>+%%NO_SAMPLERATE%%lib/libresample-%%CONFIGURE_TARGET%%.a
>+%%NO_SAMPLERATE%%%%SHARED%%lib/libresample.so
>+%%NO_SAMPLERATE%%%%SHARED%%lib/libresample.so.2
> %%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a
> %%WEBRTC%%%%SHARED%%lib/libwebrtc.so
> %%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 277445: 248892 | 249022 | 249035 | 249121 | 249183 | 249281 | 249508 | 249536 | 249659 | 249719 | 249805