summaryrefslogtreecommitdiff
path: root/net/pjsip/files
diff options
context:
space:
mode:
authorOliver Epper <oliver.epper@gmail.com>2024-06-06 14:54:26 +0200
committerDaniel Engberg <diizzy@FreeBSD.org>2024-06-06 21:05:48 +0200
commitc83600fb2acbd09b013eaea21e57924a687f1352 (patch)
tree73754c379c0ac51e8c306cbe5ff8309130e6eadd /net/pjsip/files
parentwww/httest: Deprecate and set expiration date to 2024-06-30 (diff)
net/pjsip: Update to 2.14.1 and adopt port
Major rework of port for better compliance with Porters Handbook and general guidelines. Pass maintainership to submitter Changelog: https://github.com/pjsip/pjproject/releases/tag/2.14.1 PR: 277445
Diffstat (limited to 'net/pjsip/files')
-rw-r--r--net/pjsip/files/config_site.h39
-rw-r--r--net/pjsip/files/patch-aconfigure13
-rw-r--r--net/pjsip/files/patch-pjmedia_build_os-auto.mak.in52
-rw-r--r--net/pjsip/files/patch-pjsip-apps_build_Samples.mak11
-rw-r--r--net/pjsip/files/patch-pkgconfig.py2
-rw-r--r--net/pjsip/files/patch-third__party_build_os-auto.mak.in4
-rw-r--r--net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c11
-rw-r--r--net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c11
-rw-r--r--net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h23
9 files changed, 17 insertions, 149 deletions
diff --git a/net/pjsip/files/config_site.h b/net/pjsip/files/config_site.h
index a712075f513f..8e6369f3f061 100644
--- a/net/pjsip/files/config_site.h
+++ b/net/pjsip/files/config_site.h
@@ -1,38 +1 @@
-/*
- * Custom options imported from asterisk provided customizations.
- */
-
-#include <sys/select.h>
-
-#define PJ_MAX_HOSTNAME (256)
-#define PJSIP_MAX_URL_SIZE (512)
-#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)
-
-#define PJ_SCANNER_USE_BITWISE 0
-
-#define PJ_LOG_MAX_LEVEL 6
-
-#define PJSIP_MAX_TSX_COUNT ((64*1024)-1)
-#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1)
-#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024)
-#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024)
-
-#define PJSIP_MAX_PKT_LEN 32000
-
-/* Defaults too low for WebRTC */
-#define PJ_ICE_MAX_CAND 32
-#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)
-
-/* Increase limits to allow more formats */
-#define PJMEDIA_MAX_SDP_FMT 64
-#define PJMEDIA_MAX_SDP_BANDW 4
-#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*2 + 4)
-#define PJMEDIA_MAX_SDP_MEDIA 16
-
-/*
- * Turn off the periodic sending of CRLNCRLN. Default is on (90 seconds),
- * which conflicts with the global section's keep_alive_interval option in
- * pjsip.conf in asterisk.
- */
-#define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0
-#define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0
+#include <pj/config_site_sample.h>
diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure
index 06240c90982d..d2e6f97a8dca 100644
--- a/net/pjsip/files/patch-aconfigure
+++ b/net/pjsip/files/patch-aconfigure
@@ -1,15 +1,6 @@
---- aconfigure.orig 2022-11-24 05:24:24 UTC
+--- aconfigure.orig 2023-11-01 09:37:28 UTC
+++ aconfigure
-@@ -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; }
-- 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"
-@@ -10129,7 +10129,7 @@ printf "%s\n" "Checking if libwebrtc is disabled...no"
+@@ -10177,7 +10177,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 371f9b5a8d48..e69de29bb2d1 100644
--- a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
+++ b/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
@@ -1,52 +0,0 @@
---- pjmedia/build/os-auto.mak.in.orig 2022-11-24 05:24:24 UTC
-+++ pjmedia/build/os-auto.mak.in
-@@ -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
--endif
--
--#
--# Unix specific
--#
--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
--endif
--
--#
--# Windows specific
--#
--ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
--export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
-- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
--else
- export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
--endif
--
--#
--# Null sound device
--#
--ifeq ($(AC_PJMEDIA_SND),null)
--export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
--endif
--
--#
--# External sound device
--#
--ifeq ($(AC_PJMEDIA_SND),external)
--export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
--endif
-
- #
- # QT video device
diff --git a/net/pjsip/files/patch-pjsip-apps_build_Samples.mak b/net/pjsip/files/patch-pjsip-apps_build_Samples.mak
new file mode 100644
index 000000000000..eaa634e2c9e6
--- /dev/null
+++ b/net/pjsip/files/patch-pjsip-apps_build_Samples.mak
@@ -0,0 +1,11 @@
+--- pjsip-apps/build/Samples.mak.orig 2024-06-06 12:41:28 UTC
++++ pjsip-apps/build/Samples.mak
+@@ -63,7 +63,7 @@ endif
+ .PHONY: $(EXES)
+ .PHONY: $(PJSUA2_EXES)
+
+-all: $(EXES) $(PJSUA2_EXES)
++all: $(EXES)
+
+ $(EXES):
+ $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
diff --git a/net/pjsip/files/patch-pkgconfig.py b/net/pjsip/files/patch-pkgconfig.py
index 257688db2391..df4412c2b2db 100644
--- a/net/pjsip/files/patch-pkgconfig.py
+++ b/net/pjsip/files/patch-pkgconfig.py
@@ -1,4 +1,4 @@
---- pkgconfig.py.orig 2012-10-04 07:36:39 UTC
+--- pkgconfig.py.orig 2024-03-04 22:10:19 UTC
+++ pkgconfig.py
@@ -117,7 +117,7 @@ if __name__ == "__main__":
# Fix search path
diff --git a/net/pjsip/files/patch-third__party_build_os-auto.mak.in b/net/pjsip/files/patch-third__party_build_os-auto.mak.in
index 6db8ff765d52..1264143fe321 100644
--- a/net/pjsip/files/patch-third__party_build_os-auto.mak.in
+++ b/net/pjsip/files/patch-third__party_build_os-auto.mak.in
@@ -1,6 +1,6 @@
---- third_party/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC
+--- third_party/build/os-auto.mak.in.orig 2024-03-08 17:33:31 UTC
+++ third_party/build/os-auto.mak.in
-@@ -112,8 +112,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),)
+@@ -118,8 +118,7 @@ else # Generic fixed point
else # Generic fixed point
WEBRTC_SRC = \
modules/audio_processing/aecm/aecm_core_c.o \
diff --git a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c
index bf7210a54510..e69de29bb2d1 100644
--- a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c
+++ b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c
@@ -1,11 +0,0 @@
---- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c.orig 2016-08-29 08:44:54 UTC
-+++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c
-@@ -1478,7 +1478,7 @@ AecCore* WebRtcAec_CreateAec() {
- WebRtcAec_ComfortNoise = ComfortNoise;
- WebRtcAec_SubbandCoherence = SubbandCoherence;
-
--#if defined(WEBRTC_ARCH_X86_FAMILY)
-+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
- if (WebRtc_GetCPUInfo(kSSE2)) {
- WebRtcAec_InitAec_SSE2();
- }
diff --git a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c
index 1a3fd3e56331..e69de29bb2d1 100644
--- a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c
+++ b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c
@@ -1,11 +0,0 @@
---- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c.orig 2016-08-25 01:36:33 UTC
-+++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c
-@@ -571,7 +571,7 @@ void aec_rdft_init(void) {
- cftfsub_128 = cftfsub_128_C;
- cftbsub_128 = cftbsub_128_C;
- bitrv2_128 = bitrv2_128_C;
--#if defined(WEBRTC_ARCH_X86_FAMILY)
-+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
- if (WebRtc_GetCPUInfo(kSSE2)) {
- aec_rdft_init_sse2();
- }
diff --git a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h
index 03e4a7fa921f..e69de29bb2d1 100644
--- a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h
+++ b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_typedefs.h
@@ -1,23 +0,0 @@
---- third_party/webrtc/src/webrtc/typedefs.h.orig 2017-01-07 23:05:15 UTC
-+++ third_party/webrtc/src/webrtc/typedefs.h
-@@ -48,7 +48,19 @@
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #else
--#error Please add support for your architecture in typedefs.h
-+/* instead of failing, use typical unix defines... */
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#else
-+#error __BYTE_ORDER__ is not defined
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #endif
-
- #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))