Date: Sat, 18 Nov 2017 20:56:00 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r454459 - in branches/2017Q4/net: asterisk13 pjsip pjsip/files Message-ID: <201711182056.vAIKu0LJ026528@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Nov 18 20:56:00 2017 New Revision: 454459 URL: https://svnweb.freebsd.org/changeset/ports/454459 Log: MFH: r451278 r451306 r451358 r451461 r451734 r454258 Register conflict with libsrtp. Reported by: rodrigo - Update net/pjsip to 2.7 - Bump PORTVERSION on asterisk13 port to avoid ABI problems - While here, sort the plist Fix CONFLICTS to not overwrite slave port setting. PR: 222804 Submitted by: vvd@unislabs.com Correctly handle option caused conflict. PR: 222845 Submitted by: O. Hartmann <ohartmann@walstatt.org> Update pjsip patch to work with libressl after the latest update to 2.7, which broke it. PR: 216898 Submitted by: OlivierW <olivierw1+bugzilla-freebsd@hotmail.com> - Update pjsip to 2.7.1 - Import patches from the asterisk project - Regenrate patches Security: 19b052c9-c533-11e7-8da5-001999f8d30b Approved by: ports-secteam (swills) Added: branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c - copied unchanged from r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c - copied unchanged from r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c Deleted: branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c Modified: branches/2017Q4/net/asterisk13/Makefile branches/2017Q4/net/pjsip/Makefile branches/2017Q4/net/pjsip/distinfo branches/2017Q4/net/pjsip/files/patch-aconfigure branches/2017Q4/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c branches/2017Q4/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in branches/2017Q4/net/pjsip/files/patch-third__party_build_os-auto.mak.in branches/2017Q4/net/pjsip/pkg-plist Directory Properties: branches/2017Q4/ (props changed) Modified: branches/2017Q4/net/asterisk13/Makefile ============================================================================== --- branches/2017Q4/net/asterisk13/Makefile Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/asterisk13/Makefile Sat Nov 18 20:56:00 2017 (r454459) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.18.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2017Q4/net/pjsip/Makefile ============================================================================== --- branches/2017Q4/net/pjsip/Makefile Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/Makefile Sat Nov 18 20:56:00 2017 (r454459) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pjsip -PORTVERSION= 2.6 -PORTREVISION= 2 +PORTVERSION= 2.7.1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -14,7 +13,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libportaudio.so:audio/portaudio -CONFLICTS= pjsip-extsrtp-[0-9]* +CONFLICTS?= pjsip-extsrtp-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ @@ -87,6 +86,7 @@ AMR_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore- libvo-amrwbenc.so:audio/vo-amrwbenc EXTSRTP_CONFIGURE_WITH= external-srtp EXTSRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp +EXTSRTP_CONFLICTS_OFF= libsrtp-[0-9]* WEBRTC_CONFIGURE_OFF= --disable-libwebrtc post-patch: Modified: branches/2017Q4/net/pjsip/distinfo ============================================================================== --- branches/2017Q4/net/pjsip/distinfo Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/distinfo Sat Nov 18 20:56:00 2017 (r454459) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486460881 -SHA256 (pjproject-2.6.tar.bz2) = 2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4 -SIZE (pjproject-2.6.tar.bz2) = 4933273 +TIMESTAMP = 1510760850 +SHA256 (pjproject-2.7.1.tar.bz2) = 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126 +SIZE (pjproject-2.7.1.tar.bz2) = 4880007 Modified: branches/2017Q4/net/pjsip/files/patch-aconfigure ============================================================================== --- branches/2017Q4/net/pjsip/files/patch-aconfigure Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/files/patch-aconfigure Sat Nov 18 20:56:00 2017 (r454459) @@ -1,6 +1,6 @@ ---- aconfigure.orig 2017-01-25 11:23:08 UTC +--- aconfigure.orig 2017-11-01 05:23:36 UTC +++ aconfigure -@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend... null sound" +@@ -6362,14 +6362,7 @@ $as_echo "Checking sound device backend... null sound" ;; *) ac_pjmedia_snd=alsa @@ -15,7 +15,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5 -@@ -6941,7 +6934,7 @@ else +@@ -7022,7 +7015,7 @@ else 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; } @@ -24,7 +24,7 @@ fi for ac_prog in pkg-config "python pkgconfig.py" -@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; +@@ -8669,7 +8662,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; ac_webrtc_instset=sse2 ac_webrtc_cflags="-msse2" ;; Modified: branches/2017Q4/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c ============================================================================== --- branches/2017Q4/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c Sat Nov 18 20:56:00 2017 (r454459) @@ -1,7 +1,7 @@ ---- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-01-24 05:41:05 UTC +--- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-09-14 05:03:45 UTC +++ pjlib/src/pj/ssl_sock_ossl.c -@@ -54,7 +54,7 @@ - #include <openssl/engine.h> +@@ -53,7 +53,7 @@ + #include <openssl/rand.h> #include <openssl/opensslconf.h> -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL @@ -9,7 +9,7 @@ # include <openssl/obj_mac.h> -@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigned cid) +@@ -111,7 +111,7 @@ static unsigned get_nid_from_cid(unsigned cid) #endif @@ -18,8 +18,42 @@ # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */ # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) # define M_ASN1_STRING_length(x) ASN1_STRING_length(x) -@@ -452,7 +452,7 @@ static pj_status_t init_openssl(void) +@@ -126,7 +126,7 @@ static unsigned get_nid_from_cid(unsigned cid) + + #ifdef _MSC_VER +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + # pragma comment(lib, "libcrypto") + # pragma comment(lib, "libssl") + # pragma comment(lib, "crypt32") +@@ -535,13 +535,13 @@ static pj_status_t init_openssl(void) + pj_assert(status == PJ_SUCCESS); + + /* Init OpenSSL lib */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + SSL_load_error_strings(); + #else + OPENSSL_init_ssl(0, NULL); + #endif +-#if OPENSSL_VERSION_NUMBER < 0x009080ffL ++#if OPENSSL_VERSION_NUMBER < 0x009080ffL || defined(LIBRESSL_VERSION_NUMBER) + /* This is now synonym of SSL_library_init() */ + OpenSSL_add_all_algorithms(); + #endif +@@ -556,7 +556,7 @@ static pj_status_t init_openssl(void) + int nid; + const char *cname; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + meth = (SSL_METHOD*)SSLv23_server_method(); + if (!meth) + meth = (SSL_METHOD*)TLSv1_server_method(); +@@ -599,7 +599,7 @@ static pj_status_t init_openssl(void) + SSL_set_session(ssl, SSL_SESSION_new()); -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL @@ -27,8 +61,44 @@ openssl_curves_num = SSL_get_shared_curve(ssl,-1); if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves)) openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves); -@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc +@@ -768,7 +768,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) + BIO *bio; + DH *dh; + long options; +-#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER) + EC_KEY *ecdh; + #endif + SSL_METHOD *ssl_method = NULL; +@@ -791,7 +791,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) + ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23; + /* Determine SSL method to use */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + switch (ssock->param.proto) { + case PJ_SSL_SOCK_PROTO_TLS1: + ssl_method = (SSL_METHOD*)TLSv1_method(); +@@ -927,7 +927,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) + if (dh != NULL) { + if (SSL_CTX_set_tmp_dh(ctx, dh)) { + options = SSL_OP_CIPHER_SERVER_PREFERENCE | +- #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++ #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_OP_SINGLE_ECDH_USE | + #endif + SSL_OP_SINGLE_DH_USE; +@@ -995,7 +995,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) + if (SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL)) { + PJ_LOG(4,(ssock->pool->obj_name, "SSL ECDH initialized " + "(automatic), faster PFS ciphers enabled")); +- #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++ #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER) + } else { + /* enables AES-128 ciphers, to get AES-256 use NID_secp384r1 */ + ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); +@@ -1228,7 +1228,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc + static pj_status_t set_curves_list(pj_ssl_sock_t *ssock) { -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL @@ -36,7 +106,7 @@ int ret; int curves[PJ_SSL_SOCK_MAX_CURVES]; unsigned cnt; -@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc +@@ -1259,7 +1259,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock) { Modified: branches/2017Q4/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in ============================================================================== --- branches/2017Q4/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Sat Nov 18 20:56:00 2017 (r454459) @@ -1,6 +1,6 @@ ---- pjmedia/build/os-auto.mak.in.orig 2016-08-25 01:36:33 UTC +--- pjmedia/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC +++ pjmedia/build/os-auto.mak.in -@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src +@@ -220,50 +220,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src endif endif Copied: branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c (from r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c Sat Nov 18 20:56:00 2017 (r454459, copy of r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c) @@ -0,0 +1,20 @@ +--- pjsip/src/pjsip/sip_parser.c.orig 2017-11-08 02:58:18 UTC ++++ pjsip/src/pjsip/sip_parser.c +@@ -834,13 +834,13 @@ PJ_DEF(pj_status_t) pjsip_find_msg( const char *buf, p + pj_bool_t is_datagram, pj_size_t *msg_size) + { + #if PJ_HAS_TCP +- const char *hdr_end; +- const char *body_start; ++ const char *volatile hdr_end; ++ const char *volatile body_start; + const char *pos; +- const char *line; ++ const char *volatile line; + int content_length = -1; + pj_str_t cur_msg; +- pj_status_t status = PJ_SUCCESS; ++ volatile pj_status_t status = PJSIP_EMISSINGHDR; + const pj_str_t end_hdr = { "\n\r\n", 3}; + + *msg_size = size; Copied: branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c (from r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c Sat Nov 18 20:56:00 2017 (r454459, copy of r454258, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c) @@ -0,0 +1,25 @@ +--- pjsip/src/pjsip/sip_transport.c.orig 2017-11-08 02:58:18 UTC ++++ pjsip/src/pjsip/sip_transport.c +@@ -974,7 +974,21 @@ static pj_bool_t is_transport_valid(pjsip_transport *t + const pjsip_transport_key *key, + int key_len) + { +- return (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp); ++ transport *tp_iter; ++ ++ if (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp) { ++ return PJ_TRUE; ++ } ++ ++ tp_iter = tpmgr->tp_list.next; ++ while (tp_iter != &tpmgr->tp_list) { ++ if (tp_iter->tp == tp) { ++ return PJ_TRUE; ++ } ++ tp_iter = tp_iter->next; ++ } ++ ++ return PJ_FALSE; + } + + /* Modified: branches/2017Q4/net/pjsip/files/patch-third__party_build_os-auto.mak.in ============================================================================== --- branches/2017Q4/net/pjsip/files/patch-third__party_build_os-auto.mak.in Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/files/patch-third__party_build_os-auto.mak.in Sat Nov 18 20:56:00 2017 (r454459) @@ -1,6 +1,6 @@ ---- third_party/build/os-auto.mak.in.orig 2016-12-22 09:33:55 UTC +--- third_party/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC +++ third_party/build/os-auto.mak.in -@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),) +@@ -112,8 +112,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),) else # Generic fixed point WEBRTC_SRC = \ modules/audio_processing/aecm/aecm_core_c.o \ Modified: branches/2017Q4/net/pjsip/pkg-plist ============================================================================== --- branches/2017Q4/net/pjsip/pkg-plist Sat Nov 18 20:30:35 2017 (r454458) +++ branches/2017Q4/net/pjsip/pkg-plist Sat Nov 18 20:56:00 2017 (r454459) @@ -1,16 +1,5 @@ -include/pj++/file.hpp -include/pj++/hash.hpp -include/pj++/list.hpp -include/pj++/lock.hpp -include/pj++/os.hpp -include/pj++/pool.hpp -include/pj++/proactor.hpp -include/pj++/scanner.hpp -include/pj++/sock.hpp -include/pj++/string.hpp -include/pj++/timer.hpp -include/pj++/tree.hpp -include/pj++/types.hpp +%%PJSUA%%bin/pjsua +%%PJSUA%%bin/pjsystest include/pj/activesock.h include/pj/addr_resolv.h include/pj/array.h @@ -25,6 +14,7 @@ include/pj/compat/cc_mwcc.h include/pj/compat/ctype.h include/pj/compat/errno.h include/pj/compat/high_precision.h +include/pj/compat/limits.h include/pj/compat/m_alpha.h include/pj/compat/m_armv4.h include/pj/compat/m_auto.h @@ -38,14 +28,14 @@ include/pj/compat/malloc.h include/pj/compat/os_auto.h include/pj/compat/os_auto.h.in include/pj/compat/os_darwinos.h -include/pj/compat/os_linux.h include/pj/compat/os_linux_kernel.h +include/pj/compat/os_linux.h include/pj/compat/os_palmos.h include/pj/compat/os_rtems.h include/pj/compat/os_sunos.h include/pj/compat/os_symbian.h -include/pj/compat/os_win32.h include/pj/compat/os_win32_wince.h +include/pj/compat/os_win32.h include/pj/compat/os_winphone8.h include/pj/compat/os_winuwp.h include/pj/compat/rand.h @@ -56,9 +46,9 @@ include/pj/compat/stdarg.h include/pj/compat/stdfileio.h include/pj/compat/string.h include/pj/compat/time.h -include/pj/config.h -include/pj/config_site.h include/pj/config_site_sample.h +include/pj/config_site.h +include/pj/config.h include/pj/ctype.h include/pj/doxygen.h include/pj/errno.h @@ -70,38 +60,51 @@ include/pj/guid.h include/pj/hash.h include/pj/ioqueue.h include/pj/ip_helper.h -include/pj/list.h +include/pj/limits.h include/pj/list_i.h +include/pj/list.h include/pj/lock.h include/pj/log.h include/pj/math.h include/pj/os.h -include/pj/pool.h include/pj/pool_alt.h include/pj/pool_buf.h include/pj/pool_i.h +include/pj/pool.h include/pj/rand.h include/pj/rbtree.h -include/pj/sock.h include/pj/sock_qos.h include/pj/sock_select.h +include/pj/sock.h include/pj/ssl_sock.h -include/pj/string.h include/pj/string_i.h +include/pj/string.h include/pj/timer.h include/pj/types.h include/pj/unicode.h -include/pjlib++.hpp +include/pj++/file.hpp +include/pj++/hash.hpp +include/pj++/list.hpp +include/pj++/lock.hpp +include/pj++/os.hpp +include/pj++/pool.hpp +include/pj++/proactor.hpp +include/pj++/scanner.hpp +include/pj++/sock.hpp +include/pj++/string.hpp +include/pj++/timer.hpp +include/pj++/tree.hpp +include/pj++/types.hpp include/pjlib-util.h include/pjlib-util/base64.h -include/pjlib-util/cli.h include/pjlib-util/cli_console.h include/pjlib-util/cli_imp.h include/pjlib-util/cli_telnet.h +include/pjlib-util/cli.h include/pjlib-util/config.h include/pjlib-util/crc32.h -include/pjlib-util/dns.h include/pjlib-util/dns_server.h +include/pjlib-util/dns.h include/pjlib-util/errno.h include/pjlib-util/getopt.h include/pjlib-util/hmac_md5.h @@ -111,9 +114,9 @@ include/pjlib-util/json.h include/pjlib-util/md5.h include/pjlib-util/pcap.h include/pjlib-util/resolver.h -include/pjlib-util/scanner.h include/pjlib-util/scanner_cis_bitwise.h include/pjlib-util/scanner_cis_uint.h +include/pjlib-util/scanner.h include/pjlib-util/sha1.h include/pjlib-util/srv_resolver.h include/pjlib-util/string.h @@ -121,8 +124,11 @@ include/pjlib-util/stun_simple.h include/pjlib-util/types.h include/pjlib-util/xml.h include/pjlib.h -include/pjmedia-audiodev/audiodev.h +include/pjlib++.hpp +include/pjmedia_audiodev.h +include/pjmedia_videodev.h include/pjmedia-audiodev/audiodev_imp.h +include/pjmedia-audiodev/audiodev.h include/pjmedia-audiodev/audiotest.h include/pjmedia-audiodev/config.h include/pjmedia-audiodev/errno.h @@ -130,13 +136,14 @@ include/pjmedia-codec.h include/pjmedia-codec/amr_helper.h include/pjmedia-codec/amr_sdp_match.h include/pjmedia-codec/audio_codecs.h -include/pjmedia-codec/config.h +include/pjmedia-codec/bcg729.h include/pjmedia-codec/config_auto.h include/pjmedia-codec/config_auto.h.in +include/pjmedia-codec/config.h include/pjmedia-codec/ffmpeg_vid_codecs.h include/pjmedia-codec/g722.h -include/pjmedia-codec/g7221.h include/pjmedia-codec/g7221_sdp_match.h +include/pjmedia-codec/g7221.h include/pjmedia-codec/gsm.h include/pjmedia-codec/h263_packetizer.h include/pjmedia-codec/h264_packetizer.h @@ -150,30 +157,31 @@ 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-videodev/avi_dev.h include/pjmedia-videodev/config.h include/pjmedia-videodev/errno.h include/pjmedia-videodev/opengl_dev.h -include/pjmedia-videodev/videodev.h include/pjmedia-videodev/videodev_imp.h +include/pjmedia-videodev/videodev.h include/pjmedia.h include/pjmedia/alaw_ulaw.h include/pjmedia/audiodev.h -include/pjmedia/avi.h include/pjmedia/avi_stream.h +include/pjmedia/avi.h include/pjmedia/bidirectional.h include/pjmedia/circbuf.h include/pjmedia/clock.h include/pjmedia/codec.h include/pjmedia/conference.h -include/pjmedia/config.h include/pjmedia/config_auto.h include/pjmedia/config_auto.h.in +include/pjmedia/config.h include/pjmedia/converter.h include/pjmedia/delaybuf.h include/pjmedia/doxygen.h -include/pjmedia/echo.h include/pjmedia/echo_port.h +include/pjmedia/echo.h include/pjmedia/endpoint.h include/pjmedia/errno.h include/pjmedia/event.h @@ -187,31 +195,31 @@ include/pjmedia/null_port.h include/pjmedia/plc.h include/pjmedia/port.h include/pjmedia/resample.h -include/pjmedia/rtcp.h include/pjmedia/rtcp_xr.h +include/pjmedia/rtcp.h include/pjmedia/rtp.h -include/pjmedia/sdp.h include/pjmedia/sdp_neg.h +include/pjmedia/sdp.h include/pjmedia/session.h include/pjmedia/signatures.h include/pjmedia/silencedet.h -include/pjmedia/sound.h include/pjmedia/sound_port.h +include/pjmedia/sound.h include/pjmedia/splitcomb.h include/pjmedia/stereo.h -include/pjmedia/stream.h include/pjmedia/stream_common.h +include/pjmedia/stream.h include/pjmedia/symbian_sound_aps.h include/pjmedia/tonegen.h -include/pjmedia/transport.h include/pjmedia/transport_adapter_sample.h include/pjmedia/transport_ice.h include/pjmedia/transport_loop.h include/pjmedia/transport_srtp.h include/pjmedia/transport_udp.h +include/pjmedia/transport.h include/pjmedia/types.h -include/pjmedia/vid_codec.h include/pjmedia/vid_codec_util.h +include/pjmedia/vid_codec.h include/pjmedia/vid_port.h include/pjmedia/vid_stream.h include/pjmedia/vid_tee.h @@ -220,8 +228,6 @@ include/pjmedia/wav_playlist.h include/pjmedia/wav_port.h include/pjmedia/wave.h include/pjmedia/wsola.h -include/pjmedia_audiodev.h -include/pjmedia_videodev.h include/pjnath.h include/pjnath/config.h include/pjnath/errno.h @@ -237,9 +243,12 @@ include/pjnath/stun_transaction.h include/pjnath/turn_session.h include/pjnath/turn_sock.h include/pjnath/types.h +include/pjsip_auth.h +include/pjsip_simple.h +include/pjsip_ua.h include/pjsip-simple/errno.h -include/pjsip-simple/evsub.h include/pjsip-simple/evsub_msg.h +include/pjsip-simple/evsub.h include/pjsip-simple/iscomposing.h include/pjsip-simple/mwi.h include/pjsip-simple/pidf.h @@ -256,10 +265,10 @@ include/pjsip-ua/sip_timer.h include/pjsip-ua/sip_xfer.h include/pjsip.h include/pjsip/print_util.h -include/pjsip/sip_auth.h include/pjsip/sip_auth_aka.h include/pjsip/sip_auth_msg.h include/pjsip/sip_auth_parser.h +include/pjsip/sip_auth.h include/pjsip/sip_autoconf.h include/pjsip/sip_autoconf.h.in include/pjsip/sip_config.h @@ -275,20 +284,17 @@ include/pjsip/sip_private.h include/pjsip/sip_resolve.h include/pjsip/sip_tel_uri.h include/pjsip/sip_transaction.h -include/pjsip/sip_transport.h include/pjsip/sip_transport_loop.h include/pjsip/sip_transport_tcp.h include/pjsip/sip_transport_tls.h include/pjsip/sip_transport_udp.h +include/pjsip/sip_transport.h include/pjsip/sip_types.h include/pjsip/sip_ua_layer.h include/pjsip/sip_uri.h include/pjsip/sip_util.h -include/pjsip_auth.h -include/pjsip_simple.h -include/pjsip_ua.h -include/pjsua-lib/pjsua.h include/pjsua-lib/pjsua_internal.h +include/pjsua-lib/pjsua.h include/pjsua.h include/pjsua2.hpp include/pjsua2/account.hpp @@ -344,9 +350,6 @@ lib/libpjsua-%%CONFIGURE_TARGET%%.a lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjsua2.so %%SHARED%%lib/libpjsua2.so.2 -%%SHARED%%%%VIDEO%%lib/libyuv.so -%%SHARED%%%%VIDEO%%lib/libyuv.so.2 -%%VIDEO%%lib/libyuv-%%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 @@ -356,6 +359,7 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%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 libdata/pkgconfig/libpjproject.pc -%%PJSUA%%bin/pjsua -%%PJSUA%%bin/pjsystest
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711182056.vAIKu0LJ026528>