Add comments to most patches.

Also add a patch by drochner:
pthread_key_create returns 0 on success; return values on failure are
not defined.

Remaining patches without comments:
patch-ab: adding an ifdef notyet in src/daemon/main.c
patch-a{c,e}: --start -> -D (no idea why)
patch-af: allow some Linux-only code also on NetBSD
This commit is contained in:
wiz 2011-05-21 15:32:59 +00:00
parent 3ed3c091ff
commit 094cf71274
13 changed files with 79 additions and 25 deletions

View file

@ -1,21 +1,22 @@
$NetBSD: distinfo,v 1.24 2011/01/20 13:08:59 ahoka Exp $
$NetBSD: distinfo,v 1.25 2011/05/21 15:32:59 wiz Exp $
SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650
SHA1 (patch-aa) = b8d6bf8ce8642bc987a7dce5d14df51a2a92d2ae
SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
SHA1 (patch-ad) = 5c7b5254233c8e0d36c6659454af0780af872cc3
SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442
SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a
SHA1 (patch-ah) = 8327883adcbc679fdb97de9a0f10a89438ea9fd7
SHA1 (patch-ba) = 3e5f28049363676d4bf3061605529253bea24f25
SHA1 (patch-ag) = 64c93717f864605ba66cc6c4be84a594aeda943c
SHA1 (patch-ah) = b4ce6535ca9dfc695bd04c5fae0a5bc614bec2eb
SHA1 (patch-ba) = 7a57cbd68026c72804bb705d2a23e562c59b86a7
SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8
SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171
SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20
SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864
SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982
SHA1 (patch-dd) = 83e51035ff871cef9c39bf670173e30705df8fe5
SHA1 (patch-poll_c-build-fix) = 4250be8c4a1f2dbe6ca3621b285d11258b34a62b
SHA1 (patch-ca) = 14ea426afebad99b53e6f8d594ff2f5adac07e30
SHA1 (patch-da) = 3d63c7a2e76e41b9400869badda0d0e008c4b9bc
SHA1 (patch-db) = 1bd6b5c35a38476de4bfdb606b5ecf8243ddf91f
SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c
SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f
SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8
SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0

View file

@ -1,4 +1,10 @@
$NetBSD: patch-aa,v 1.6 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-aa,v 1.7 2011/05/21 15:32:59 wiz Exp $
SNDDSP_GETODELAY isn't defined on NetBSD-4.x.
ioctl() takes u_long argument on NetBSD.
On NetBSD, use third parameter in ioctl instead of varargs.
stat() system call has been versioned, use latest version when dlopen()ing.
Try more typical device names.
--- src/utils/padsp.c.orig 2009-09-18 20:21:44.000000000 +0000
+++ src/utils/padsp.c

View file

@ -1,4 +1,10 @@
$NetBSD: patch-ad,v 1.6 2010/12/02 21:17:43 wiz Exp $
$NetBSD: patch-ad,v 1.7 2011/05/21 15:32:59 wiz Exp $
1. chunk: adapt installation paths for pkgsrc; make UDEV optional
2. chunk: adapt installation path for pkgsrc
3. chunk: adapt path for NetBSD
4. chunk: link against libossaudio where it exists (variable supplied
by pkgsrc)
--- src/Makefile.am.orig 2009-11-22 19:57:04.000000000 -0800
+++ src/Makefile.am 2010-10-01 10:11:05.000000000 -0700

View file

@ -1,4 +1,7 @@
$NetBSD: patch-ag,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-ag,v 1.3 2011/05/21 15:33:00 wiz Exp $
shm_open takes a path on NetBSD; pa_shm_create_rw needs write
permissions, so +w the shared memory when creating it.
--- src/pulsecore/shm.c.orig 2010-02-01 14:21:15.000000000 +0000
+++ src/pulsecore/shm.c

View file

@ -1,4 +1,7 @@
$NetBSD: patch-ah,v 1.3 2010/08/10 05:42:34 tsutsui Exp $
$NetBSD: patch-ah,v 1.4 2011/05/21 15:33:00 wiz Exp $
Fix build on NetBSD/arm:
Fix wrong placed #else clause against #if defined(__linux__) in cpu-arm.c.
--- src/pulsecore/cpu-arm.c.orig 2009-11-23 03:57:07.000000000 +0000
+++ src/pulsecore/cpu-arm.c 2010-08-07 08:14:36.000000000 +0000

View file

@ -1,11 +1,17 @@
$NetBSD: patch-ba,v 1.7 2010/08/10 05:42:34 tsutsui Exp $
$NetBSD: patch-ba,v 1.8 2011/05/21 15:33:00 wiz Exp $
1. chunk:
Check NetBSD's native atomic_ops in configure even in arm case.
configure checks $host_cpu first, not $host_os on checks for
native atomic operations.
(In upstream it seems fixed to see $host_os first but
it might still have problem around NetBSD version checks)
2. chunk:
Fix for security vulnerability reported in CVE-2009-1299, taken from here:
http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee
Also handle atomic_ops for NetBSD/arm.
--- configure.ac.orig 2009-11-23 04:06:47.000000000 +0000
+++ configure.ac 2010-08-07 08:06:57.000000000 +0000
@@ -220,6 +220,10 @@

View file

@ -1,4 +1,6 @@
$NetBSD: patch-ca,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-ca,v 1.3 2011/05/21 15:33:00 wiz Exp $
Avoid GNUism in iconv usage.
--- src/pulse/utf8.c.orig 2009-09-10 00:04:58.000000000 +0000
+++ src/pulse/utf8.c

View file

@ -1,4 +1,6 @@
$NetBSD: patch-da,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-da,v 1.2 2011/05/21 15:33:00 wiz Exp $
O_CLOEXEC is done differently on NetBSD (fcntl + FD_CLOEXEC).
--- src/modules/module-cli.c.orig 2009-11-23 03:57:05.000000000 +0000
+++ src/modules/module-cli.c

View file

@ -1,4 +1,6 @@
$NetBSD: patch-db,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-db,v 1.2 2011/05/21 15:33:00 wiz Exp $
Make udev optional.
--- src/daemon/default.pa.in.orig 2009-11-23 03:57:05.000000000 +0000
+++ src/daemon/default.pa.in

View file

@ -1,4 +1,7 @@
$NetBSD: patch-dc,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
$NetBSD: patch-dc,v 1.2 2011/05/21 15:33:00 wiz Exp $
If oss.originating_device hal properly isn't availble, try
sound.originating_device.
--- src/modules/module-hal-detect.c.orig 2009-09-10 00:04:58.000000000 +0000
+++ src/modules/module-hal-detect.c

View file

@ -1,4 +1,6 @@
$NetBSD: patch-dd,v 1.1 2010/02/02 12:39:14 jmcneill Exp $
$NetBSD: patch-dd,v 1.2 2011/05/21 15:33:00 wiz Exp $
Avoid autoreconf from adding a git dependency.
--- git-version-gen.orig 2010-02-02 06:54:03.000000000 -0500
+++ git-version-gen 2010-02-02 06:55:16.000000000 -0500

View file

@ -0,0 +1,16 @@
$NetBSD: patch-de,v 1.1 2011/05/21 15:33:00 wiz Exp $
pthread_key_create returns 0 on success; return values on failure are
not defined.
--- src/pulsecore/thread-posix.c.orig 2010-06-13 14:15:54.000000000 +0000
+++ src/pulsecore/thread-posix.c
@@ -172,7 +172,7 @@ pa_tls* pa_tls_new(pa_free_cb_t free_cb)
t = pa_xnew(pa_tls, 1);
- if (pthread_key_create(&t->key, free_cb) < 0) {
+ if (pthread_key_create(&t->key, free_cb)) {
pa_xfree(t);
return NULL;
}

View file

@ -1,4 +1,6 @@
$NetBSD: patch-poll_c-build-fix,v 1.1 2011/01/20 13:08:59 ahoka Exp $
$NetBSD: patch-poll_c-build-fix,v 1.2 2011/05/21 15:33:00 wiz Exp $
Fix compilation on platforms without poll().
--- src/pulsecore/poll.c.orig 2009-03-05 11:28:10.000000000 +0000
+++ src/pulsecore/poll.c