[pkgsrc/trunk]: pkgsrc/audio/pulseaudio Avoid an assert on pthread_setschedpa...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc37e72dd710
branches:  trunk
changeset: 568924:fc37e72dd710
user:      abs <abs%pkgsrc.org@localhost>
date:      Sun Dec 27 15:06:28 2009 +0000

description:
Avoid an assert on pthread_setschedparam() if the priority was already
SCHED_OTHER - bump pkgrevision

diffstat:

 audio/pulseaudio/Makefile         |   4 ++--
 audio/pulseaudio/distinfo         |   4 ++--
 audio/pulseaudio/patches/patch-al |  27 ++++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r e02bbd984848 -r fc37e72dd710 audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Sun Dec 27 14:30:36 2009 +0000
+++ b/audio/pulseaudio/Makefile Sun Dec 27 15:06:28 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/12/27 15:06:28 abs Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss%mail.0pointer.de@localhost>
 
 DISTNAME=      pulseaudio-0.9.14
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    audio
 MASTER_SITES=  http://0pointer.de/lennart/projects/pulseaudio/
 
diff -r e02bbd984848 -r fc37e72dd710 audio/pulseaudio/distinfo
--- a/audio/pulseaudio/distinfo Sun Dec 27 14:30:36 2009 +0000
+++ b/audio/pulseaudio/distinfo Sun Dec 27 15:06:28 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2009/09/18 09:59:54 joerg Exp $
+$NetBSD: distinfo,v 1.17 2009/12/27 15:06:28 abs Exp $
 
 SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4
 RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1
@@ -14,7 +14,7 @@
 SHA1 (patch-ai) = b8e9e2dee9d1c5d9de488cfa0d06440eedacb7c6
 SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec
 SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd
-SHA1 (patch-al) = 26999d41484421c0995282045783e3c9df36d4d4
+SHA1 (patch-al) = 88f500154e8345572ebaf12ee891abe50ef19847
 SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34
 SHA1 (patch-ba) = 6b1ac267a317eed77efc2fbfc2fddebc3a8a69d2
 SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a
diff -r e02bbd984848 -r fc37e72dd710 audio/pulseaudio/patches/patch-al
--- a/audio/pulseaudio/patches/patch-al Sun Dec 27 14:30:36 2009 +0000
+++ b/audio/pulseaudio/patches/patch-al Sun Dec 27 15:06:28 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2009/02/05 21:05:07 tron Exp $
+$NetBSD: patch-al,v 1.2 2009/12/27 15:06:28 abs Exp $
 
---- src/pulsecore/core-util.c.orig     2009-02-05 14:21:35.000000000 +0000
-+++ src/pulsecore/core-util.c  2009-02-05 14:42:02.000000000 +0000
+--- src/pulsecore/core-util.c.orig     2009-12-27 14:25:19.000000000 +0000
++++ src/pulsecore/core-util.c
 @@ -105,6 +105,10 @@
  #define MSG_NOSIGNAL 0
  #endif
@@ -13,3 +13,24 @@
  #ifdef OS_IS_WIN32
  
  #define PULSE_ROOTENV "PULSE_ROOT"
+@@ -687,11 +691,19 @@ int pa_raise_priority(int nice_level) {
+ void pa_reset_priority(void) {
+ #ifdef HAVE_SYS_RESOURCE_H
+     struct sched_param sp;
++    int policy;
+ 
+     setpriority(PRIO_PROCESS, 0, 0);
+ 
+     memset(&sp, 0, sizeof(sp));
+-    pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp) == 0);
++    pa_assert_se(pthread_getschedparam(pthread_self(), &policy, &sp) == 0);
++    /*
++     * Set back to standard priority iff we previously set high_priority
++     * Avoid assert on at least NetBSD 5 in !high_priority case
++     */
++    if (policy != SCHED_OTHER)
++      pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp)
++                                                                      == 0);
+ #endif
+ 
+ #ifdef OS_IS_WIN32