Date: Sat, 18 Apr 2020 10:40:52 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532019 - in head/net/pjsip: . files Message-ID: <202004181040.03IAeq3Z040411@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Apr 18 10:40:52 2020 New Revision: 532019 URL: https://svnweb.freebsd.org/changeset/ports/532019 Log: - Update pjsip t 2.10 - Get distfile from github - Add OPUS and VPX options, enabled by default - Make VIDEO and WEBRTC options enabled by default - Fix typo in WEBRTC option description - Fix pkgconfig patch to respect LOCALBASE PR: 245607 Submitted by: yuri Deleted: head/net/pjsip/files/patch-0030 head/net/pjsip/files/patch-0031 Modified: head/net/pjsip/Makefile head/net/pjsip/distinfo head/net/pjsip/files/patch-pkgconfig.py (contents, props changed) head/net/pjsip/pkg-plist Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Sat Apr 18 10:18:25 2020 (r532018) +++ head/net/pjsip/Makefile Sat Apr 18 10:40:52 2020 (r532019) @@ -1,11 +1,8 @@ # $FreeBSD$ PORTNAME= pjsip -PORTVERSION= 2.9 -PORTREVISION= 4 +DISTVERSION= 2.10 CATEGORIES= net -MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ -DISTNAME= pjproject-${DISTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Multimedia communication library written in C language @@ -13,13 +10,14 @@ COMMENT= Multimedia communication library written in C LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libportaudio.so:audio/portaudio +LIB_DEPENDS= libportaudio.so:audio/portaudio \ + libuuid.so:misc/e2fsprogs-libuuid USES= gmake localbase pathfix ssl tar:bz2 +USE_GITHUB= yes +GH_PROJECT= pjproject USE_LDCONFIG= yes -CONFLICTS?= pjsip-extsrtp - GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ --disable-silk @@ -28,9 +26,10 @@ PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \ - L16 OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \ - SHARED SOUND SPEEX SPEEXAEC V4L VIDEO WEBRTC -OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC + L16 OPENH264 OPUS PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \ + SHARED SOUND SPEEX SPEEXAEC V4L VIDEO VPX WEBRTC +OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 OPUS 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 @@ -45,7 +44,7 @@ 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 V4L_DESC= Video4Linux2 support -WEBRTC_DESC= Build linwebrtc +WEBRTC_DESC= Build libwebrtc OPTIONS_SUB= yes @@ -71,6 +70,8 @@ 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 RESAMPLE_CONFIGURE_ENABLE= resample RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll SAMPLERATE_CONFIGURE_ENABLE= libsamplerate @@ -89,6 +90,8 @@ V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compa 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: Modified: head/net/pjsip/distinfo ============================================================================== --- head/net/pjsip/distinfo Sat Apr 18 10:18:25 2020 (r532018) +++ head/net/pjsip/distinfo Sat Apr 18 10:40:52 2020 (r532019) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560947683 -SHA256 (pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 -SIZE (pjproject-2.9.tar.bz2) = 5009546 +TIMESTAMP = 1586797388 +SHA256 (pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de +SIZE (pjsip-pjproject-2.10_GH0.tar.gz) = 8768705 Modified: head/net/pjsip/files/patch-pkgconfig.py ============================================================================== --- head/net/pjsip/files/patch-pkgconfig.py Sat Apr 18 10:18:25 2020 (r532018) +++ head/net/pjsip/files/patch-pkgconfig.py Sat Apr 18 10:40:52 2020 (r532019) @@ -5,7 +5,7 @@ PKG_CONFIG_PATH = os.getenv("PKG_CONFIG_PATH", "").strip() if not PKG_CONFIG_PATH: - PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/lib/pkgconfig" -+ PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig" ++ PKG_CONFIG_PATH="%%LOCALBASE%%/libdata/pkgconfig" PKG_CONFIG_PATH = PKG_CONFIG_PATH.replace(";", ":") # Parse files Modified: head/net/pjsip/pkg-plist ============================================================================== --- head/net/pjsip/pkg-plist Sat Apr 18 10:18:25 2020 (r532018) +++ head/net/pjsip/pkg-plist Sat Apr 18 10:40:52 2020 (r532019) @@ -151,7 +151,7 @@ include/pjmedia-codec/ipp_codecs.h include/pjmedia-codec/l16.h include/pjmedia-codec/opencore_amr.h include/pjmedia-codec/openh264.h -include/pjmedia-codec/opus.h +%%OPUS%%include/pjmedia-codec/opus.h include/pjmedia-codec/passthrough.h include/pjmedia-codec/silk.h include/pjmedia-codec/speex.h @@ -229,6 +229,7 @@ include/pjmedia/wav_playlist.h include/pjmedia/wav_port.h include/pjmedia/wave.h include/pjmedia/wsola.h +%%VPX%%include/pjmedia-codec/vpx.h include/pjnath.h include/pjnath/config.h include/pjnath/errno.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004181040.03IAeq3Z040411>