diff options
| author | madpilot <madpilot@FreeBSD.org> | 2015-03-23 23:46:23 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2015-03-23 23:46:23 +0800 |
| commit | 55b504a806fd37f6885e7f4f5378ae6de8c42164 (patch) | |
| tree | 514d86ae5606a1b7e802ba7d75df9d60bbb6e983 /net/pjsip | |
| parent | 0906606feb684a70bd5fb22a12a7062068baec3a (diff) | |
| download | freebsd-ports-gnome-55b504a806fd37f6885e7f4f5378ae6de8c42164.tar.gz freebsd-ports-gnome-55b504a806fd37f6885e7f4f5378ae6de8c42164.tar.zst freebsd-ports-gnome-55b504a806fd37f6885e7f4f5378ae6de8c42164.zip | |
Due to recent changes in OpenSSL, disable SRTP support for asterisk13
by default and avoid pjsip pulling in libsrtp, otherwise a not
working package would be generated.
Add note to UPDATING to keep users informed.
Diffstat (limited to 'net/pjsip')
| -rw-r--r-- | net/pjsip/Makefile | 11 | ||||
| -rw-r--r-- | net/pjsip/pkg-plist | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile index f6ca38c8df30..2970454d59a7 100644 --- a/net/pjsip/Makefile +++ b/net/pjsip/Makefile @@ -2,7 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -12,12 +12,10 @@ COMMENT= Multimedia communication library written in C language LICENSE= GPLv2 -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ - libsrtp.so:${PORTSDIR}/net/libsrtp +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ - --with-external-srtp \ --disable-silk USES= gmake tar:bz2 USE_LDCONFIG= yes @@ -27,7 +25,7 @@ CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FFMPEG G711 G722 G7221 GSM ILBC L16 OPENH264 RESAMPLE RESAMPLEDLL \ - SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR + SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR EXTSRTP OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC G711_DESC= G.711 codec support @@ -42,6 +40,7 @@ SHARED_DESC= Build shared libraries (other ports may depend on this) SPEEXAEC_DESC= Speex Acoustic Echo Canceller/AEC V4L_DESC= Video4Linux2 support YUV_DESC= Libyuv support +EXTSRTP_DESC= Use libsrtp port (needs all ports compiled with WITH_OPENSSL_PORT=yes) OPTIONS_SUB= yes @@ -77,6 +76,8 @@ VIDEO_CONFIGURE_ENABLE= video AMR_CONFIGURE_WITH= opencore-amr AMR_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr \ libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc +EXTSRTP_CONFIGURE_WITH= external-srtp +EXTSRTP_LIB_DEPENDS= libsrtp.so:${PORTSDIR}/net/libsrtp post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist index bb1dc31721ea..975ce2a718b6 100644 --- a/net/pjsip/pkg-plist +++ b/net/pjsip/pkg-plist @@ -342,4 +342,7 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2 +%%NO_EXTSRTP%%lib/libsrtp-%%CONFIGURE_TARGET%%.a +%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so +%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2 libdata/pkgconfig/libpjproject.pc |