From 4fb5f8e558d1c5ca63cdb4a51058db845a7653d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
Date: Mon, 24 Feb 2025 17:10:59 -0500
Subject: [PATCH] contrib: bump pjproject
This upgrades the upstream version of PJPROJECT used from 2.13.1 to
2.15.1.
Change-Id: Ica6a94e7010a41839a57afc226f3c48e9e72f897
---
.../0003-disable-ios-pointtopoint.patch | 41 ++++++++++---------
contrib/src/pjproject/0004-ios-16.patch | 27 ++++++------
contrib/src/pjproject/SHA512SUMS | 2 +-
contrib/src/pjproject/package.json | 2 +-
contrib/src/pjproject/rules.mak | 3 +-
5 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/contrib/src/pjproject/0003-disable-ios-pointtopoint.patch b/contrib/src/pjproject/0003-disable-ios-pointtopoint.patch
index 30aa08858e..88f0290770 100644
--- a/contrib/src/pjproject/0003-disable-ios-pointtopoint.patch
+++ b/contrib/src/pjproject/0003-disable-ios-pointtopoint.patch
@@ -2,12 +2,12 @@
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/pjlib/src/pj/ip_helper_generic.c b/pjlib/src/pj/ip_helper_generic.c
-index ab441a504..c818468b3 100644
+index 7a4d85447..bf0c1c46f 100644
--- a/pjlib/src/pj/ip_helper_generic.c
+++ b/pjlib/src/pj/ip_helper_generic.c
-@@ -102,6 +102,13 @@ static pj_status_t if_enum_by_af(int af,
- continue; /* Skip when interface is not running */
- }
+@@ -101,6 +101,13 @@ static pj_status_t if_enum_by_af(int af,
+ continue; /* Skip when interface is not running */
+ }
+#if defined(__APPLE__)
+ if (it->ifa_flags & IFF_POINTOPOINT) {
@@ -17,11 +17,11 @@ index ab441a504..c818468b3 100644
+#endif
+
#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
- if (it->ifa_flags & IFF_LOOPBACK) {
- TRACE_((THIS_FILE, " loopback interface"));
-@@ -231,6 +238,13 @@ static pj_status_t if_enum_by_af(int af,
- continue; /* Skip when interface is not running */
- }
+ if (it->ifa_flags & IFF_LOOPBACK) {
+ TRACE_((THIS_FILE, " loopback interface"));
+@@ -230,6 +237,13 @@ static pj_status_t if_enum_by_af(int af,
+ continue; /* Skip when interface is not running */
+ }
+#if defined(__APPLE__)
+ if (iff.ifr_flags & IFF_POINTOPOINT) {
@@ -31,17 +31,17 @@ index ab441a504..c818468b3 100644
+#endif
+
#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
- if (iff.ifr_flags & IFF_LOOPBACK) {
- TRACE_((THIS_FILE, " loopback interface"));
-@@ -322,11 +336,18 @@ static pj_status_t if_enum_by_af(int af, unsigned *p_cnt, pj_sockaddr ifs[])
- continue; /* Skip when interface is down */
- }
+ if (iff.ifr_flags & IFF_LOOPBACK) {
+ TRACE_((THIS_FILE, " loopback interface"));
+@@ -321,11 +335,18 @@ static pj_status_t if_enum_by_af(int af, unsigned *p_cnt, pj_sockaddr ifs[])
+ continue; /* Skip when interface is down */
+ }
- if ((ifreq.ifr_flags & IFF_RUNNING)==0) {
+ if ((ifreq.ifr_flags & IFF_RUNNING)==0) {
- TRACE_((THIS_FILE, " interface is not running"));
- continue; /* Skip when interface is not running */
- }
+ TRACE_((THIS_FILE, " interface is not running"));
+ continue; /* Skip when interface is not running */
+ }
+#if defined(__APPLE__)
+ if (ifreq.ifr_flags & IFF_POINTOPOINT) {
@@ -51,5 +51,8 @@ index ab441a504..c818468b3 100644
+#endif
+
#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
- if (ifreq.ifr_flags & IFF_LOOPBACK) {
- TRACE_((THIS_FILE, " loopback interface"));
+ if (ifreq.ifr_flags & IFF_LOOPBACK) {
+ TRACE_((THIS_FILE, " loopback interface"));
+--
+2.34.1
+
diff --git a/contrib/src/pjproject/0004-ios-16.patch b/contrib/src/pjproject/0004-ios-16.patch
index d9a7af2ad1..ca25632cb0 100644
--- a/contrib/src/pjproject/0004-ios-16.patch
+++ b/contrib/src/pjproject/0004-ios-16.patch
@@ -1,12 +1,12 @@
- pjlib/include/pj/compat/os_auto.h.in | 40 ++++++++++++++++++++++------------------
+ pjlib/include/pj/compat/os_auto.h.in | 40 +++++++++++++++-------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in
-index b37b1aef0..43957ff6e 100644
+index b8ff5769a..929f68841 100644
--- a/pjlib/include/pj/compat/os_auto.h.in
+++ b/pjlib/include/pj/compat/os_auto.h.in
@@ -1,4 +1,4 @@
--/*
+-/*
+/*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -15,22 +15,22 @@ index b37b1aef0..43957ff6e 100644
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __PJ_COMPAT_OS_AUTO_H__
#define __PJ_COMPAT_OS_AUTO_H__
-@@ -108,7 +108,7 @@
+@@ -109,7 +109,7 @@
/* Does pthread_mutexattr_t has "recursive" member? */
#undef PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE
-
--/* Set 1 if native sockaddr_in has sin_len member.
+
+-/* Set 1 if native sockaddr_in has sin_len member.
+/* Set 1 if native sockaddr_in has sin_len member.
* Default: 0
*/
#undef PJ_SOCKADDR_HAS_LEN
-@@ -192,27 +192,31 @@
-
+@@ -193,27 +193,31 @@
+
# include "TargetConditionals.h"
# if TARGET_OS_IPHONE
-# include "Availability.h"
@@ -67,12 +67,15 @@ index b37b1aef0..43957ff6e 100644
+# endif
# endif
#endif
-
+
/* If 1, use Read/Write mutex emulation for platforms that don't support it */
#undef PJ_EMULATE_RWMUTEX
-
--/* If 1, pj_thread_create() should enforce the stack size when creating
+
+-/* If 1, pj_thread_create() should enforce the stack size when creating
+/* If 1, pj_thread_create() should enforce the stack size when creating
* threads.
* Default: 0 (let OS decide the thread's stack size).
*/
+--
+2.34.1
+
diff --git a/contrib/src/pjproject/SHA512SUMS b/contrib/src/pjproject/SHA512SUMS
index 6982ca3831..87eed061f0 100644
--- a/contrib/src/pjproject/SHA512SUMS
+++ b/contrib/src/pjproject/SHA512SUMS
@@ -1 +1 @@
-62eda88458411fb846582c11008f4908f4674cbd5ebf042853c802b2efa52b0c242256178475535e94845117330190d8234a1b698df21aad7ee758f531ec1c10 pjproject-8fc165b833eea6e3c88d67a541385424b129fd3f.tar.gz
+2e9bf2bb6a87fde551723f6d1ba8c9f5f5545d5a11e78e2d2d8302c784c721b4b452cfe0b548000eb5913a1d9692839936e8ebc09ea156f5c2e6a6273d461642 pjproject-37130c943d59f25a71935803ea2d84515074a237.tar.gz
diff --git a/contrib/src/pjproject/package.json b/contrib/src/pjproject/package.json
index a35ca69b5a..4f71d0cb94 100644
--- a/contrib/src/pjproject/package.json
+++ b/contrib/src/pjproject/package.json
@@ -1,6 +1,6 @@
{
"name": "pjproject",
- "version": "8fc165b833eea6e3c88d67a541385424b129fd3f",
+ "version": "37130c943d59f25a71935803ea2d84515074a237",
"url": "https://github.com/savoirfairelinux/pjproject/archive/__VERSION__.tar.gz",
"deps": ["gnutls"],
"patches": [
diff --git a/contrib/src/pjproject/rules.mak b/contrib/src/pjproject/rules.mak
index c34a2efb98..df25f4b78b 100644
--- a/contrib/src/pjproject/rules.mak
+++ b/contrib/src/pjproject/rules.mak
@@ -1,10 +1,11 @@
# PJPROJECT
-PJPROJECT_VERSION := 8fc165b833eea6e3c88d67a541385424b129fd3f
+PJPROJECT_VERSION := 37130c943d59f25a71935803ea2d84515074a237
PJPROJECT_URL := https://github.com/savoirfairelinux/pjproject/archive/${PJPROJECT_VERSION}.tar.gz
PJPROJECT_OPTIONS := --disable-sound \
--enable-video \
--enable-ext-sound \
+ --disable-android-mediacodec \
--disable-speex-aec \
--disable-g711-codec \
--disable-l16-codec \
--
GitLab