diff --git a/contrib/src/pjproject/0002-win-vs-gnutls.patch b/contrib/src/pjproject/0002-win-vs-gnutls.patch index c65d8f6b110415d6dd3bca9f273fceb0ee1e5d1c..5ec6f012d0e0d8677bfe459ac0b0ba79f9269fbd 100644 --- a/contrib/src/pjproject/0002-win-vs-gnutls.patch +++ b/contrib/src/pjproject/0002-win-vs-gnutls.patch @@ -1,6 +1,6 @@ - pjlib/build/pjlib.vcxproj | 12 +++++++++--- + pjlib/build/pjlib.vcxproj | 12 +++++++++--- + pjmedia/build/pjmedia.vcxproj | 12 +++++++++--- pjlib/include/pj/config_site.h | 3 +++ - pjmedia/build/pjmedia.vcxproj | 12 +++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj @@ -42,17 +42,6 @@ index 227c3f045..b85c896bd 100644 </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <Midl /> -diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h -index 85cf2ed..fe65725 100644 ---- a/pjlib/include/pj/config_site.h -+++ b/pjlib/include/pj/config_site.h -@@ -29,3 +29,6 @@ - * WINDOWS settings. - */ - #define THIRD_PARTY_MEDIA 0 -+#define PJ_OS_HAS_CHECK_STACK 0 -+#define PJ_HAS_SSL_SOCK 1 -+#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj index 146bfa8de..1dac92caf 100644 --- a/pjmedia/build/pjmedia.vcxproj @@ -92,3 +81,14 @@ index 146bfa8de..1dac92caf 100644 </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <Midl /> +diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h +index 85cf2ed..fe65725 100644 +--- a/pjlib/include/pj/config_site.h ++++ b/pjlib/include/pj/config_site.h +@@ -29,3 +29,6 @@ + * WINDOWS settings. + */ + #define THIRD_PARTY_MEDIA 0 ++#define PJ_OS_HAS_CHECK_STACK 0 ++#define PJ_HAS_SSL_SOCK 1 ++#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS diff --git a/contrib/src/pjproject/0004-ios-16.patch b/contrib/src/pjproject/0004-ios-16.patch index 5fe662980ee5d8869d2a9e9b5e997e99ab63196a..d9a7af2ad136778ec378384463d4d1aeda142d1c 100644 --- a/contrib/src/pjproject/0004-ios-16.patch +++ b/contrib/src/pjproject/0004-ios-16.patch @@ -1,20 +1,78 @@ - pjlib/include/pj/compat/os_auto.h.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + 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 10e08f0bd..dd5e642ea 100644 +index b37b1aef0..43957ff6e 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in -@@ -199,7 +199,11 @@ - /* Is multitasking support available? (see ticket #1107) */ - # define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 1 - /* Enable activesock TCP background mode support */ --# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 1 -+# ifdef __IPHONE_16_0 -+# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 0 -+# else -+# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 1 -+# endif - # endif +@@ -1,4 +1,4 @@ +-/* ++/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> + * +@@ -14,7 +14,7 @@ + * + * 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 + */ + #ifndef __PJ_COMPAT_OS_AUTO_H__ + #define __PJ_COMPAT_OS_AUTO_H__ +@@ -108,7 +108,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. + * Default: 0 + */ + #undef PJ_SOCKADDR_HAS_LEN +@@ -192,27 +192,31 @@ + + # include "TargetConditionals.h" + # if TARGET_OS_IPHONE +-# include "Availability.h" +- /* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */ +-# ifndef PJ_GETADDRINFO_USE_CFHOST +-# define PJ_GETADDRINFO_USE_CFHOST 0 +-# endif +-# ifdef __IPHONE_4_0 +- /* Is multitasking support available? (see ticket #1107) */ +-# define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 1 +- /* Activesock TCP background mode support (VoIP socket). +- * Disabled by default, VoIP socket deprecated since iOS 9 and +- * on iOS16 using VoIP socket causes app getting killed. +- */ +-# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 0 +-# endif ++# include "Availability.h" ++ /* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */ ++# ifndef PJ_GETADDRINFO_USE_CFHOST ++# define PJ_GETADDRINFO_USE_CFHOST 0 ++# endif ++# ifdef __IPHONE_4_0 ++ /* Is multitasking support available? (see ticket #1107) */ ++# define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 1 ++ /* Activesock TCP background mode support (VoIP socket). ++ * Disabled by default, VoIP socket deprecated since iOS 9 and ++ * on iOS16 using VoIP socket causes app getting killed. ++ */ ++# ifdef __IPHONE_16_0 ++# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 0 ++# else ++# define PJ_ACTIVESOCK_TCP_IPHONE_OS_BG 1 ++# endif ++# 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 + * threads. + * Default: 0 (let OS decide the thread's stack size). + */ diff --git a/contrib/src/pjproject/SHA512SUMS b/contrib/src/pjproject/SHA512SUMS index 2836cecfd550d295437cbedd817ddc73811024df..d8faa18cc9d5ee7ca0cf50d0e041a14e6ccc60b9 100644 --- a/contrib/src/pjproject/SHA512SUMS +++ b/contrib/src/pjproject/SHA512SUMS @@ -1,2 +1 @@ -617f3a5cd38423a429b17553bb73ad467694ce3e899a788aaf20d0540f6a6904c06a2fc35bf9e0d1c9ab07ba821ca0e1d6d2b002e473bfa9850ff6f8b96447c0 pjproject-e4b83585a0bdf1523e808a4fc1946ec82ac733d0.tar.gz -b9fa03bb2586262849859f025c9b0d7742a7da8a528c4c09b75e6fcc448d82fe90e9fe79aba2efe9c3485c079222b0b0fbd5c8f5d55c842b869e97297993f58c pjproject-97f45c2040c2b0cf6f3349a365b0e900a2267333.tar.gz +a487b84caa76e8d918dc82337cac99a51d5c557f61a30cf27b2b545a091943c920deceee2345127721473ccee19d0b4ebcb4e4ff4a7ac83dad2dd9ee39a727e5 pjproject-16bf8a31cb05a596b6181a95b9cc42f344ec24e8.tar.gz diff --git a/contrib/src/pjproject/package.json b/contrib/src/pjproject/package.json index 86ab764830323e88bfdc23a3a139ac1275dac1bc..0bc341d03bbf73e975970adb915b4223f71e9b41 100644 --- a/contrib/src/pjproject/package.json +++ b/contrib/src/pjproject/package.json @@ -1,6 +1,6 @@ { "name": "pjproject", - "version": "97f45c2040c2b0cf6f3349a365b0e900a2267333", + "version": "16bf8a31cb05a596b6181a95b9cc42f344ec24e8", "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 226472825d1ca0b6e0534b04706f2ede8ec7eca6..9d99aeb5fe3c0cad42dcb370b4953f6a979b97c6 100644 --- a/contrib/src/pjproject/rules.mak +++ b/contrib/src/pjproject/rules.mak @@ -1,5 +1,5 @@ # PJPROJECT -PJPROJECT_VERSION := 97f45c2040c2b0cf6f3349a365b0e900a2267333 +PJPROJECT_VERSION := 16bf8a31cb05a596b6181a95b9cc42f344ec24e8 PJPROJECT_URL := https://github.com/savoirfairelinux/pjproject/archive/${PJPROJECT_VERSION}.tar.gz PJPROJECT_OPTIONS := --disable-sound \ @@ -21,7 +21,7 @@ PJPROJECT_OPTIONS := --disable-sound \ --disable-openh264 \ --disable-resample \ --disable-libwebrtc \ - --with-gnutls=$(PREFIX) + --with-gnutls=yes PKGS += pjproject