git: 760e074a6ff0 - main - net/pjsip: Update 2.12.1 -> 2.13

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 17 Jan 2023 07:58:51 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=760e074a6ff0083566f344c854e924e801efc6b6

commit 760e074a6ff0083566f344c854e924e801efc6b6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-01-17 07:58:19 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-01-17 07:58:44 +0000

    net/pjsip: Update 2.12.1 -> 2.13
---
 net/pjsip/Makefile                                 |  9 ++++-----
 net/pjsip/distinfo                                 |  6 +++---
 net/pjsip/files/patch-aconfigure                   |  6 +++---
 net/pjsip/files/patch-pjmedia_build_os-auto.mak.in | 21 ++++++++++-----------
 net/pjsip/pkg-plist                                |  1 +
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index ee14b43d5e76..5e92c0dbc493 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pjsip
-DISTVERSION=	2.12.1
+DISTVERSION=	2.13
 CATEGORIES=	net
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,9 +13,11 @@ LIB_DEPENDS=	libportaudio.so:audio/portaudio \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cpe gmake localbase pathfix ssl tar:bz2
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_PROJECT=	pjproject
-USE_LDCONFIG=	yes
+
 CPE_VENDOR=	teluu
 
 GNU_CONFIGURE=	yes
@@ -97,9 +99,6 @@ 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
 
diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo
index 484e68b30fac..081dc3d0c97c 100644
--- a/net/pjsip/distinfo
+++ b/net/pjsip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652189225
-SHA256 (pjsip-pjproject-2.12.1_GH0.tar.gz) = d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533
-SIZE (pjsip-pjproject-2.12.1_GH0.tar.gz) = 9660659
+TIMESTAMP = 1673941718
+SHA256 (pjsip-pjproject-2.13_GH0.tar.gz) = 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9
+SIZE (pjsip-pjproject-2.13_GH0.tar.gz) = 9744716
diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure
index 752802198ef3..06240c90982d 100644
--- a/net/pjsip/files/patch-aconfigure
+++ b/net/pjsip/files/patch-aconfigure
@@ -1,6 +1,6 @@
---- aconfigure.orig	2022-02-24 07:54:38 UTC
+--- aconfigure.orig	2022-11-24 05:24:24 UTC
 +++ aconfigure
-@@ -7888,7 +7888,7 @@ else $as_nop
+@@ -8059,7 +8059,7 @@ else $as_nop
  			FFMPEG_PREFIX=$with_ffmpeg
  			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
  printf "%s\n" "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
@@ -9,7 +9,7 @@
  		fi
  
  		for ac_prog in pkg-config "python pkgconfig.py"
-@@ -9941,7 +9941,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
+@@ -10129,7 +10129,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
  			ac_webrtc_instset=sse2
  			ac_webrtc_cflags="-msse2"
  			;;
diff --git a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in b/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
index d413004bb85f..371f9b5a8d48 100644
--- a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
+++ b/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
@@ -1,17 +1,16 @@
---- pjmedia/build/os-auto.mak.in.orig	2017-09-22 02:42:22 UTC
+--- pjmedia/build/os-auto.mak.in.orig	2022-11-24 05:24:24 UTC
 +++ pjmedia/build/os-auto.mak.in
-@@ -220,50 +220,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src
- endif
+@@ -242,49 +242,7 @@ endif
  endif
  
--
+ 
 -#
 -# MacOSX specific
 -#
 -ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
 -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 -endif
 -
 -#
@@ -19,8 +18,8 @@
 -#
 -ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
 -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 -endif
 -
 -#
@@ -28,7 +27,7 @@
 -#
 -ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
 -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
+-                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
 -else
  export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 -endif
@@ -38,7 +37,7 @@
 -#
 -ifeq ($(AC_PJMEDIA_SND),null)
 -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 -endif
 -
 -#
@@ -46,7 +45,7 @@
 -#
 -ifeq ($(AC_PJMEDIA_SND),external)
 -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
--		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+-                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 -endif
  
  #
diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist
index 0200a5304949..b52c395da3b4 100644
--- a/net/pjsip/pkg-plist
+++ b/net/pjsip/pkg-plist
@@ -249,6 +249,7 @@ include/pjnath/stun_transaction.h
 include/pjnath/turn_session.h
 include/pjnath/turn_sock.h
 include/pjnath/types.h
+include/pjnath/upnp.h
 include/pjsip-simple/errno.h
 include/pjsip-simple/evsub.h
 include/pjsip-simple/evsub_msg.h