snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

pjproject: update to 2.5.5. (#4673)

This commit is contained in:
Chris Brannon 2016-08-28 22:52:55 -07:00 committed by Juan RP
parent 1ee3e2f087
commit b991074395
2 changed files with 9 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
srcpkgs/pjproject/patches/musl-fixes.patch
View File

@ -1,62 +0,0 @@
--- pjsip-apps/src/samples/siprtp.c
+++ pjsip-apps/src/samples/siprtp.c
@@ -1133,7 +1133,7 @@
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) {
@@ -1142,7 +1142,7 @@
}
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
@@ -1155,10 +1155,10 @@
}
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) {
@@ -1168,7 +1168,7 @@
}
PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d",
- policy, tp.__sched_priority));
+ policy, tp.sched_priority));
}
#else
--- ./pjlib/src/pj/os_core_unix.c
+++ pjlib/src/pj/os_core_unix.c
@@ -1104,7 +1104,7 @@
if (type == PJ_MUTEX_SIMPLE) {
#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
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) || \
defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)
/* Nothing to do, default is simple */
@@ -1114,7 +1114,7 @@
} else {
#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
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) || \
defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)
// Phil Torre <ptorre@zetron.com>:

15
srcpkgs/pjproject/template
View File

@ -1,24 +1,27 @@
# Template file for 'pjproject' # Template file for 'pjproject'
# musl-fixes.patch and no-third-party.patch come from Alpine, # no-third-party.patch comes from Alpine,
# and this template is heavily based on Alpine's APKBUILD. # and this template is heavily based on Alpine's APKBUILD.
pkgname=pjproject pkgname=pjproject
version=2.4.5 version=2.5.5
revision=3 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-shared \ configure_args="--enable-shared \
--enable-libsamplerate \ --enable-libsamplerate \
--with-external-speex \ --with-external-speex \
--with-external-gsm \ --with-external-gsm \
--with-external-srtp \ --with-external-srtp \
--with-external-pa" --disable-libyuv"
# Disable libyuv for now. Seems to be optional.
# We don't have this packaged separately for Void, and I don't
# want pjproject including its own libyuv.so in the build.
makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
portaudio-devel libsrtp-devel libsamplerate-devel" libsrtp-devel libsamplerate-devel"
short_desc="Open source SIP and media stack" short_desc="Open source SIP and media stack"
maintainer="Christopher Brannon <chris@the-brannons.com>" maintainer="Christopher Brannon <chris@the-brannons.com>"
license="GPL-2" license="GPL-2"
homepage="http://www.pjsip.org/pjsua.htm" homepage="http://www.pjsip.org/pjsua.htm"
distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2" distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2"
checksum=086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d checksum=ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3
pre_configure() { pre_configure() {
# Remove target name from lib names # Remove target name from lib names