Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pjproject: update to 2.6

Browse source 
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
This commit is contained in:
Jiri Slachta 2017-05-08 17:24:36 +02:00
parent f2c3c887f3
commit 927ddb060d
2 changed files with 10 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/pjproject/Makefile
View file

@ -1,6 +1,7 @@
# #
# Copyright (C) 2016 OpenWrt.org # Copyright (C) 2006-2017 OpenWrt.org
# Copyright (C) 2016 Cesnet, z.s.p.o. # Copyright (C) 2016 Cesnet, z.s.p.o.
# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pjproject PKG_NAME:=pjproject
PKG_VERSION:=2.4.5 PKG_VERSION:=2.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/ PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/
PKG_MD5SUM:=f58b3485977b3a700256203a554b3869 PKG_HASH:=2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -66,6 +67,8 @@ CONFIGURE_ARGS += \
--disable-ssl \ --disable-ssl \
--disable-oss \ --disable-oss \
--disable-sound \ --disable-sound \
--disable-libwebrtc \
--disable-libyuv \
--with-external-srtp="$(STAGING_DIR)/usr" \ --with-external-srtp="$(STAGING_DIR)/usr" \
--without-external-gsm \ --without-external-gsm \
--disable-small-filter \ --disable-small-filter \

54
libs/pjproject/patches/120-non-gnu-pthreads.patch
View file

@ -1,7 +1,5 @@
Index: pjproject-2.4/pjlib/src/pj/os_core_unix.c --- pjproject-2.6/pjlib/src/pj/os_core_unix.c 2016-04-13 08:24:48.000000000 +0200
=================================================================== +++ pjproject-new/pjlib/src/pj/os_core_unix.c 2017-05-08 09:51:49.980905420 +0200
--- pjproject-2.4.orig/pjlib/src/pj/os_core_unix.c
+++ pjproject-2.4/pjlib/src/pj/os_core_unix.c
@@ -1123,7 +1123,7 @@ static pj_status_t init_mutex(pj_mutex_t @@ -1123,7 +1123,7 @@ static pj_status_t init_mutex(pj_mutex_t
return PJ_RETURN_OS_ERROR(rc); return PJ_RETURN_OS_ERROR(rc);
@ -9,7 +7,7 @@ Index: pjproject-2.4/pjlib/src/pj/os_core_unix.c
-#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ -#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \ +#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \
defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
#elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
@@ -1133,7 +1133,7 @@ static pj_status_t init_mutex(pj_mutex_t @@ -1133,7 +1133,7 @@ static pj_status_t init_mutex(pj_mutex_t
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
@ -18,49 +16,5 @@ Index: pjproject-2.4/pjlib/src/pj/os_core_unix.c
-#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ -#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \ +#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \
defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
#elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
Index: pjproject-2.4/pjsip-apps/src/samples/siprtp.c
===================================================================
--- pjproject-2.4.orig/pjsip-apps/src/samples/siprtp.c
+++ pjproject-2.4/pjsip-apps/src/samples/siprtp.c
@@ -1134,7 +1134,7 @@ static void boost_priority(void)
PJ_RETURN_OS_ERROR(rc));
return;
}
- tp.__sched_priority = max_prio;
+ tp.sched_priority = max_prio;
rc = sched_setscheduler(0, POLICY, &tp);
if (rc != 0) {
@@ -1143,7 +1143,7 @@ static void boost_priority(void)
}
PJ_LOG(4, (THIS_FILE, "New process policy=%d, priority=%d",
- policy, tp.__sched_priority));
+ policy, tp.sched_priority));
/*
* Adjust thread scheduling algorithm and priority
@@ -1156,10 +1156,10 @@ static void boost_priority(void)
}
PJ_LOG(4, (THIS_FILE, "Old thread policy=%d, priority=%d",
- policy, tp.__sched_priority));
+ policy, tp.sched_priority));
policy = POLICY;
- tp.__sched_priority = max_prio;
+ tp.sched_priority = max_prio;
rc = pthread_setschedparam(pthread_self(), policy, &tp);
if (rc != 0) {
@@ -1169,7 +1169,7 @@ static void boost_priority(void)
}
PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d",
- policy, tp.__sched_priority));
+ policy, tp.sched_priority));
}
#else