From b991074395203f1d27ae2d4882c9fa8e49c93ee5 Mon Sep 17 00:00:00 2001 From: Chris Brannon Date: Sun, 28 Aug 2016 22:52:55 -0700 Subject: [PATCH] pjproject: update to 2.5.5. (#4673) --- srcpkgs/pjproject/patches/musl-fixes.patch | 62 ---------------------- srcpkgs/pjproject/template | 15 +++--- 2 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/pjproject/patches/musl-fixes.patch diff --git a/srcpkgs/pjproject/patches/musl-fixes.patch b/srcpkgs/pjproject/patches/musl-fixes.patch deleted file mode 100644 index c6b64c4e9cc..00000000000 --- a/srcpkgs/pjproject/patches/musl-fixes.patch +++ /dev/null @@ -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 : diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index b336dbf81da..2cde8f734d5 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -1,24 +1,27 @@ # 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. pkgname=pjproject -version=2.4.5 -revision=3 +version=2.5.5 +revision=1 build_style=gnu-configure configure_args="--enable-shared \ --enable-libsamplerate \ --with-external-speex \ --with-external-gsm \ --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 - portaudio-devel libsrtp-devel libsamplerate-devel" + libsrtp-devel libsamplerate-devel" short_desc="Open source SIP and media stack" maintainer="Christopher Brannon " license="GPL-2" homepage="http://www.pjsip.org/pjsua.htm" distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2" -checksum=086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d +checksum=ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3 pre_configure() { # Remove target name from lib names