diff options
| author | jlam <jlam@pkgsrc.org> | 2002-10-04 08:12:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-10-04 08:12:46 +0000 |
| commit | 76ffb35c2067ca4ae559907771a9fd81171beaed (patch) | |
| tree | 5a330b1031c79efabbb8d2aedece0e686c61c9a4 /audio/libao | |
| parent | f70dda00e1e5e80211b181d7c4930be5cd11f5ce (diff) | |
| download | pkgsrc-76ffb35c2067ca4ae559907771a9fd81171beaed.tar.gz | |
Use a smarter sequence for finding a OSS dsp device: first try /dev/dsp,
then try /dev/sound.
Diffstat (limited to 'audio/libao')
| -rw-r--r-- | audio/libao/distinfo | 4 | ||||
| -rw-r--r-- | audio/libao/patches/patch-aa | 26 |
2 files changed, 23 insertions, 7 deletions
diff --git a/audio/libao/distinfo b/audio/libao/distinfo index 4d40c7c2cbb..8889660ff63 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2002/08/25 18:38:10 jlam Exp $ +$NetBSD: distinfo,v 1.11 2002/10/04 08:12:46 jlam Exp $ SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0 Size (libao-0.8.3.tar.gz) = 210690 bytes -SHA1 (patch-aa) = 9cc59790050564de60d8ddc430bee946a12ee83d +SHA1 (patch-aa) = e1c539373dc4f4db942ee21fa1d86100d67d38f9 SHA1 (patch-ab) = a2faed5b409e5810cefa62d67e9a4ad22d5f5062 SHA1 (patch-ac) = 11c6ebce842d29866903fd05e8f20fedc0515261 diff --git a/audio/libao/patches/patch-aa b/audio/libao/patches/patch-aa index 0af572d6576..1034a15d3dc 100644 --- a/audio/libao/patches/patch-aa +++ b/audio/libao/patches/patch-aa @@ -1,15 +1,31 @@ -$NetBSD: patch-aa,v 1.6 2002/01/02 12:23:49 lukem Exp $ +$NetBSD: patch-aa,v 1.7 2002/10/04 08:12:47 jlam Exp $ ---- src/plugins/oss/ao_oss.c.orig Tue Oct 16 10:13:47 2001 +--- src/plugins/oss/ao_oss.c.orig Wed Apr 10 14:53:56 2002 +++ src/plugins/oss/ao_oss.c -@@ -82,8 +82,8 @@ +@@ -80,22 +80,22 @@ int _open_default_oss_device (char **dev char *err = NULL; char *dev = NULL; - /* default: first try the devfs path */ - *dev_path = strdup("/dev/sound/dsp"); -+ /* default: first try the NetBSD path */ -+ *dev_path = strdup("/dev/sound"); ++ /* default: first try the traditional path */ ++ *dev_path = strdup("/dev/dsp"); #ifdef BROKEN_OSS fd = open(*dev_path, O_WRONLY | O_NONBLOCK); #else + fd = open(*dev_path, O_WRONLY); + #endif /* BROKEN_OSS */ + +- /* then try the original dsp path */ ++ /* then try the NetBSD path */ + if(fd < 0) + { + /* no? then try the traditional path */ + err = strdup(strerror(errno)); + dev = strdup(*dev_path); + free(*dev_path); +- *dev_path = strdup("/dev/dsp"); ++ *dev_path = strdup("/dev/sound"); + #ifdef BROKEN_OSS + fd = open(*dev_path, O_WRONLY | O_NONBLOCK); + #else |