diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-31 14:33:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-31 14:33:01 +0000 |
| commit | f7dd9f9c08bd3bc49ef62ec7a394bd73e89766d2 (patch) | |
| tree | a02247273829d4d7af87ba89c3c5eed5f505ddc3 /main/pjproject/musl-fixes.patch | |
| parent | 87ea013cdf67df6d6516ffa43be5fe393fc3e6d1 (diff) | |
| download | aports-f7dd9f9c08bd3bc49ef62ec7a394bd73e89766d2.tar.bz2 aports-f7dd9f9c08bd3bc49ef62ec7a394bd73e89766d2.tar.xz | |
main/pjproject: upgrade to 2.1 and fix building on musl
Diffstat (limited to 'main/pjproject/musl-fixes.patch')
| -rw-r--r-- | main/pjproject/musl-fixes.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/main/pjproject/musl-fixes.patch b/main/pjproject/musl-fixes.patch new file mode 100644 index 0000000000..7d6a66e5aa --- /dev/null +++ b/main/pjproject/musl-fixes.patch @@ -0,0 +1,62 @@ +--- ./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>: |