diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-09-09 08:28:08 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-09-09 08:28:08 +0300 |
| commit | f57a80876377ac0274c27729c53a540f9b5f1473 (patch) | |
| tree | 02a5b2c714215bd838d133891177c737be73fa18 | |
| parent | 372b48e0f1c329fe0434e4f91c4640af8ef284c0 (diff) | |
| download | aports-f57a80876377ac0274c27729c53a540f9b5f1473.tar.bz2 aports-f57a80876377ac0274c27729c53a540f9b5f1473.tar.xz | |
main/pjproject: upgrade to 2.5.5
| -rw-r--r-- | main/pjproject/APKBUILD | 12 | ||||
| -rw-r--r-- | main/pjproject/musl-fixes.patch | 62 |
2 files changed, 4 insertions, 70 deletions
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD index 62462f3ddb..40cb2c38fd 100644 --- a/main/pjproject/APKBUILD +++ b/main/pjproject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pjproject -pkgver=2.4.5 +pkgver=2.5.5 pkgrel=0 pkgdesc="CLI Softphone" url="http://www.pjsip.org/pjsua.htm" @@ -15,7 +15,6 @@ install= subpackages="$pkgname-dev pjsua" source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2 fix-bb-cp-uniqueness.patch - musl-fixes.patch pjproject_no_third_party.patch " @@ -84,15 +83,12 @@ pjsua() { install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua } -md5sums="f58b3485977b3a700256203a554b3869 pjproject-2.4.5.tar.bz2 +md5sums="183f7144b9aa238884243c0fc52ece36 pjproject-2.5.5.tar.bz2 1f152ad611b5fb0e44676e2701b53a15 fix-bb-cp-uniqueness.patch -e92287afb144883546e39c382bd75cdd musl-fixes.patch e835a442abf0fdc6614d5ba1cb961c11 pjproject_no_third_party.patch" -sha256sums="086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d pjproject-2.4.5.tar.bz2 +sha256sums="ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3 pjproject-2.5.5.tar.bz2 cae0255ddb8b6b6e07f6da5b448ec669b0727dc6d6c795e0d1cd8ce9ae504d40 fix-bb-cp-uniqueness.patch -a9768e1ddc6e519048a5acc084ed1e9d2007bd0cd6291dde0828ea7efc837266 musl-fixes.patch f95cb0e03efd5995b2ea5e130831edbf831c01fd5bbcf10b4dcbd77133d18a12 pjproject_no_third_party.patch" -sha512sums="4d20a3fccb7b02974532b97ce25d05c72fec6369da75e84a81dec5e09ab3ccc8660d9096708c9736651f0c7ab6a9d44d1720a6266f94fca33dba6a23a1b16b2f pjproject-2.4.5.tar.bz2 +sha512sums="7204326ed7d06241f7de02111641de792274fb126bb5c06ba6d7e2fbb6c6475b84fd4e1e63d44863207cbd79e75b654588567125476ce9d66bd1397708827a09 pjproject-2.5.5.tar.bz2 cc4077c9999d4eb28cfc34080ea2cdfdc905726565afdca96d26979d734a1d70522c5e6307ec33c0d4f5f1a5b26699787cbd31fecb73b860b6b417eda50f37a1 fix-bb-cp-uniqueness.patch -1dd0d8dabe0c27f8d314a776b8873700755ae59346223a5bb5ec816ab42d4fa4c8d9281ed33ced9cba87177cdf6249e458c404c8fd0ac9ec0be8607b4a4e8a73 musl-fixes.patch fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb pjproject_no_third_party.patch" diff --git a/main/pjproject/musl-fixes.patch b/main/pjproject/musl-fixes.patch deleted file mode 100644 index 7d6a66e5aa..0000000000 --- a/main/pjproject/musl-fixes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- ./pjsip-apps/src/samples/siprtp.c.orig -+++ ./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.orig -+++ ./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>: |