summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'audio/pulseaudio/patches/patch-ag')
-rw-r--r--audio/pulseaudio/patches/patch-ag32
1 files changed, 19 insertions, 13 deletions
diff --git a/audio/pulseaudio/patches/patch-ag b/audio/pulseaudio/patches/patch-ag
index 9c459bd5c30..0f017c4a677 100644
--- a/audio/pulseaudio/patches/patch-ag
+++ b/audio/pulseaudio/patches/patch-ag
@@ -1,16 +1,22 @@
-$NetBSD: patch-ag,v 1.1 2008/12/23 02:15:27 hasso Exp $
+$NetBSD: patch-ag,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
---- ./src/modules/oss-util.c.orig 2008-12-21 22:03:48 +0200
-+++ ./src/modules/oss-util.c 2008-12-21 22:04:31 +0200
-@@ -298,7 +298,11 @@ static int get_device_number(const char
- int r;
+--- src/pulsecore/shm.c.orig 2010-02-01 14:21:15.000000000 +0000
++++ src/pulsecore/shm.c
+@@ -91,7 +91,7 @@ struct shm_marker {
+ #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
- if (!(p = rp = pa_readlink(dev))) {
-+#ifdef ENOLINK
- if (errno != EINVAL && errno != ENOLINK) {
-+#else
-+ if (errno != EINVAL) {
-+#endif
- r = -1;
- goto finish;
+ static char *segment_name(char *fn, size_t l, unsigned id) {
+- pa_snprintf(fn, l, "/pulse-shm-%u", id);
++ pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id);
+ return fn;
+ }
+
+@@ -142,7 +142,7 @@ int pa_shm_create_rw(pa_shm *m, size_t s
+ pa_random(&m->id, sizeof(m->id));
+ segment_name(fn, sizeof(fn), m->id);
+
+- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
++ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
+ pa_log("shm_open() failed: %s", pa_cstrerror(errno));
+ goto fail;
}