diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile index c4ea20871383..8f11f4fd4611 100644 --- a/net/pjsip/Makefile +++ b/net/pjsip/Makefile @@ -1,117 +1,116 @@ PORTNAME= pjsip -DISTVERSION= 2.11.1 -PORTREVISION= 1 +DISTVERSION= 2.12 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= Multimedia communication library written in C language LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libportaudio.so:audio/portaudio \ libuuid.so:misc/e2fsprogs-libuuid USES= cpe gmake localbase pathfix ssl tar:bz2 USE_GITHUB= yes GH_PROJECT= pjproject USE_LDCONFIG= yes CPE_VENDOR= teluu GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ --disable-silk PATHFIX_MAKEFILEIN= Makefile PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" OPTIONS_DEFINE= AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \ L16 OPENH264 OPUS PJSUA PJSUA2 RESAMPLE RESAMPLEDLL \ SAMPLERATE SDL SHARED SOUND SPEEX SPEEXAEC V4L VIDEO VPX WEBRTC OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 OPUS PJSUA2 SHARED SPEEX SPEEXAEC \ 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 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 SOUND_CONFIGURE_ENABLE= sound 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 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 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/pkgconfig.py @${REINPLACE_CMD} -e 's/$$(APP_LDFLAGS) \{0,1\}//' \ -e 's/$$(OS_LDFLAGS)/$$(APP_LDFLAGS) &/' \ ${WRKSRC}/*/build/Makefile @${CP} ${FILESDIR}/config_site.h \ ${WRKSRC}/pjlib/include/pj/config_site.h post-install-SHARED-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-PJSUA-on: ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsua-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsua ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsystest-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsystest .include diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo index 8ece1bcfa367..b006fbdebed7 100644 --- a/net/pjsip/distinfo +++ b/net/pjsip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627082293 -SHA256 (pjsip-pjproject-2.11.1_GH0.tar.gz) = 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 -SIZE (pjsip-pjproject-2.11.1_GH0.tar.gz) = 8968747 +TIMESTAMP = 1645723790 +SHA256 (pjsip-pjproject-2.12_GH0.tar.gz) = b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a +SIZE (pjsip-pjproject-2.12_GH0.tar.gz) = 9658564 diff --git a/net/pjsip/files/patch-Makefile b/net/pjsip/files/patch-Makefile deleted file mode 100644 index 06c774de3e4d..000000000000 --- a/net/pjsip/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2021-03-17 07:34:46 UTC -+++ Makefile -@@ -123,7 +123,7 @@ install: - mkdir -p $(DESTDIR)$(libdir)/ - cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ - if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \ -- cp -af $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) $(DESTDIR)$(libdir)/; \ -+ cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \ - fi - mkdir -p $(DESTDIR)$(includedir)/ - for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure index 11deecbcd04d..936484fa4516 100644 --- a/net/pjsip/files/patch-aconfigure +++ b/net/pjsip/files/patch-aconfigure @@ -1,20 +1,20 @@ ---- aconfigure.orig 2021-03-17 07:34:46 UTC +--- aconfigure.orig 2022-02-24 07:54:38 UTC +++ aconfigure -@@ -7151,7 +7151,7 @@ else +@@ -7888,7 +7888,7 @@ else $as_nop FFMPEG_PREFIX=$with_ffmpeg - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 - $as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; } + { 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" -@@ -9162,7 +9162,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; +@@ -9941,7 +9941,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no" ac_webrtc_instset=sse2 ac_webrtc_cflags="-msse2" ;; - *win32* | *w32* | *darwin* | *linux*) + *win32* | *w32* | *darwin* | *linux* | *amd64*freebsd*) case $target in armv7l*gnueabihf) ac_webrtc_instset=neon