Sun Dec 27 15:06:28 2009 UTC ()
Avoid an assert on pthread_setschedparam() if the priority was already
SCHED_OTHER - bump pkgrevision


(abs)
diff -r1.28 -r1.29 pkgsrc/audio/pulseaudio/Makefile
diff -r1.16 -r1.17 pkgsrc/audio/pulseaudio/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/patches/patch-al
cvs diff -r1.28 -r1.29 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2009/12/15 21:30:53 1.28
+++ pkgsrc/audio/pulseaudio/Makefile 2009/12/27 15:06:28 1.29
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.28 2009/12/15 21:30:53 joerg Exp $ 1# $NetBSD: Makefile,v 1.29 2009/12/27 15:06:28 abs Exp $
2 2
3# NOTE: Please send a copy of any patches that are not pkgsrc-specific 3# NOTE: Please send a copy of any patches that are not pkgsrc-specific
4# to <pulseaudio-discuss@mail.0pointer.de> 4# to <pulseaudio-discuss@mail.0pointer.de>
5 5
6DISTNAME= pulseaudio-0.9.14 6DISTNAME= pulseaudio-0.9.14
7PKGREVISION= 5 7PKGREVISION= 6
8CATEGORIES= audio 8CATEGORIES= audio
9MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ 9MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pulseaudio.org/ 12HOMEPAGE= http://www.pulseaudio.org/
13COMMENT= Sound server for POSIX and Win32 systems 13COMMENT= Sound server for POSIX and Win32 systems
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \ 19USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \
20 autoconf automake autoreconf 20 autoconf automake autoreconf
cvs diff -r1.16 -r1.17 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2009/09/18 09:59:54 1.16
+++ pkgsrc/audio/pulseaudio/distinfo 2009/12/27 15:06:28 1.17
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.16 2009/09/18 09:59:54 joerg Exp $ 1$NetBSD: distinfo,v 1.17 2009/12/27 15:06:28 abs Exp $
2 2
3SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4 3SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4
4RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1 4RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1
5Size (pulseaudio-0.9.14.tar.gz) = 1303077 bytes 5Size (pulseaudio-0.9.14.tar.gz) = 1303077 bytes
6SHA1 (patch-aa) = 49ef2b68ef5ffd861e1339e792ab43205b7b1ed2 6SHA1 (patch-aa) = 49ef2b68ef5ffd861e1339e792ab43205b7b1ed2
7SHA1 (patch-ab) = 8e6270b50364d7d8010f2c42f8383362b315460c 7SHA1 (patch-ab) = 8e6270b50364d7d8010f2c42f8383362b315460c
8SHA1 (patch-ac) = 877f1dd615129aa7396fd3dc142474f2795fa802 8SHA1 (patch-ac) = 877f1dd615129aa7396fd3dc142474f2795fa802
9SHA1 (patch-ad) = 60caf8bc41504fc035a7264ff3c32a4b19da0645 9SHA1 (patch-ad) = 60caf8bc41504fc035a7264ff3c32a4b19da0645
10SHA1 (patch-ae) = 1cd31d18c133fdd5e8db59be319ba5b7a45fe0fe 10SHA1 (patch-ae) = 1cd31d18c133fdd5e8db59be319ba5b7a45fe0fe
11SHA1 (patch-af) = 31b8564cb91aabb5de5490659e77de984fd1920b 11SHA1 (patch-af) = 31b8564cb91aabb5de5490659e77de984fd1920b
12SHA1 (patch-ag) = 67e3330c52c605e1eec505166e4ceed1a1277b11 12SHA1 (patch-ag) = 67e3330c52c605e1eec505166e4ceed1a1277b11
13SHA1 (patch-ah) = 13cee1dc10be17f51978208843048ba9db7d9a3f 13SHA1 (patch-ah) = 13cee1dc10be17f51978208843048ba9db7d9a3f
14SHA1 (patch-ai) = b8e9e2dee9d1c5d9de488cfa0d06440eedacb7c6 14SHA1 (patch-ai) = b8e9e2dee9d1c5d9de488cfa0d06440eedacb7c6
15SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec 15SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec
16SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd 16SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd
17SHA1 (patch-al) = 26999d41484421c0995282045783e3c9df36d4d4 17SHA1 (patch-al) = 88f500154e8345572ebaf12ee891abe50ef19847
18SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34 18SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34
19SHA1 (patch-ba) = 6b1ac267a317eed77efc2fbfc2fddebc3a8a69d2 19SHA1 (patch-ba) = 6b1ac267a317eed77efc2fbfc2fddebc3a8a69d2
20SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a 20SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a
21SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c 21SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c
cvs diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-al 2009/02/05 21:05:07 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-al 2009/12/27 15:06:28 1.2
@@ -1,15 +1,36 @@ @@ -1,15 +1,36 @@
1$NetBSD: patch-al,v 1.1 2009/02/05 21:05:07 tron Exp $ 1$NetBSD: patch-al,v 1.2 2009/12/27 15:06:28 abs Exp $
2 2
3--- src/pulsecore/core-util.c.orig 2009-02-05 14:21:35.000000000 +0000 3--- src/pulsecore/core-util.c.orig 2009-12-27 14:25:19.000000000 +0000
4+++ src/pulsecore/core-util.c 2009-02-05 14:42:02.000000000 +0000 4+++ src/pulsecore/core-util.c
5@@ -105,6 +105,10 @@ 5@@ -105,6 +105,10 @@
6 #define MSG_NOSIGNAL 0 6 #define MSG_NOSIGNAL 0
7 #endif 7 #endif
8  8
9+#ifdef __APPLE__ 9+#ifdef __APPLE__
10+#include <xlocale.h> 10+#include <xlocale.h>
11+#endif 11+#endif
12+ 12+
13 #ifdef OS_IS_WIN32 13 #ifdef OS_IS_WIN32
14  14
15 #define PULSE_ROOTENV "PULSE_ROOT" 15 #define PULSE_ROOTENV "PULSE_ROOT"
 16@@ -687,11 +691,19 @@ int pa_raise_priority(int nice_level) {
 17 void pa_reset_priority(void) {
 18 #ifdef HAVE_SYS_RESOURCE_H
 19 struct sched_param sp;
 20+ int policy;
 21
 22 setpriority(PRIO_PROCESS, 0, 0);
 23
 24 memset(&sp, 0, sizeof(sp));
 25- pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp) == 0);
 26+ pa_assert_se(pthread_getschedparam(pthread_self(), &policy, &sp) == 0);
 27+ /*
 28+ * Set back to standard priority iff we previously set high_priority
 29+ * Avoid assert on at least NetBSD 5 in !high_priority case
 30+ */
 31+ if (policy != SCHED_OTHER)
 32+ pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp)
 33+ == 0);
 34 #endif
 35
 36 #ifdef OS_IS_WIN32