diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-08 09:08:37 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-08 09:08:37 +0800 |
| commit | d45b1a205548bcdcea5326178b8cb5de9a4ec0fb (patch) | |
| tree | 0a6bc2385ed27e51227703741fe99e963a8bc8e2 /audio/pulseaudio/files/patch-src_modules_oss-util.c | |
| parent | 21a6621966f65d8a5718724b88ec34bcba65f69c (diff) | |
| download | marcuscom-ports-d45b1a205548bcdcea5326178b8cb5de9a4ec0fb.tar.gz marcuscom-ports-d45b1a205548bcdcea5326178b8cb5de9a4ec0fb.tar.zst marcuscom-ports-d45b1a205548bcdcea5326178b8cb5de9a4ec0fb.zip | |
Attempt to workaround a deadlock which can prevent GNOME from starting
correctly.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12038 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio/files/patch-src_modules_oss-util.c')
| -rw-r--r-- | audio/pulseaudio/files/patch-src_modules_oss-util.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/audio/pulseaudio/files/patch-src_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss-util.c new file mode 100644 index 000000000..bf44d4fdd --- /dev/null +++ b/audio/pulseaudio/files/patch-src_modules_oss-util.c @@ -0,0 +1,37 @@ +--- src/modules/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500 ++++ src/modules/oss-util.c 2008-01-09 17:00:45.000000000 -0500 +@@ -44,6 +44,22 @@ + + #include "oss-util.h" + ++#ifndef DSP_CAP_COPROC ++#define DSP_CAP_COPROC 0x00000800 ++#endif ++#ifndef DSP_CAP_TRIGGER ++#define DSP_CAP_TRIGGER 0x00001000 ++#endif ++#ifndef DSP_CAP_MMAP ++#define DSP_CAP_MMAP 0x00002000 ++#endif ++#ifndef DSP_CAP_MULTI ++#define DSP_CAP_MULTI 0x00004000 ++#endif ++#ifndef DSP_CAP_BIND ++#define DSP_CAP_BIND 0x00008000 ++#endif ++ + int pa_oss_open(const char *device, int *mode, int* pcaps) { + int fd = -1; + int caps; +@@ -300,7 +316,11 @@ static int get_device_number(const char + int r; + + if (!(p = rp = pa_readlink(dev))) { ++#ifdef ENOLINK + if (errno != EINVAL && errno != ENOLINK) { ++#else ++ if (errno != EINVAL) { ++#endif + r = -1; + goto finish; + } |