diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-11-09 04:46:21 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-11-09 04:46:21 +0000 |
| commit | 95bfb657f51ba323d4577cf6eeb32dc8d9c62fad (patch) | |
| tree | e6e57be97ffd47a56fdf5ae0a600cf6cab95125f | |
| parent | f3d48b3df4698cf43183d3d49bd115d3d472e267 (diff) | |
| download | pkgsrc-95bfb657f51ba323d4577cf6eeb32dc8d9c62fad.tar.gz | |
If compiled with esound (or rather, esound is found at compilation time), and
xlock is called with "+sound" to not play sound, actually do so. (Worked
w/o esound).
Patch submitted in PR 11185 by Mark Davies <mark@MCS.VUW.AC.NZ>
| -rw-r--r-- | x11/xlockmore/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/xlockmore/patches/patch-ab | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11/xlockmore/files/patch-sum b/x11/xlockmore/files/patch-sum index 41213125a38..b10d29a4a1e 100644 --- a/x11/xlockmore/files/patch-sum +++ b/x11/xlockmore/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.7 2000/08/21 20:31:51 hubertf Exp $ +$NetBSD: patch-sum,v 1.8 2000/11/09 04:46:21 hubertf Exp $ MD5 (patch-aa) = ef89b7291b0d3c6351330887741cd7ae -MD5 (patch-ab) = 755a2fa6b00e109dd3149f4ad9848d9b +MD5 (patch-ab) = 4e4e61c9a827f268dc6a80bdcf555d98 MD5 (patch-ac) = 982191521403c38e1804c7b078e4f45d MD5 (patch-ad) = c8f16f930ebc3a759cc6dbb85da43ffd MD5 (patch-ae) = 9dab989b9c932f21d88f08f080221a38 diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab index 69b25d0fc39..67a617a5a28 100644 --- a/x11/xlockmore/patches/patch-ab +++ b/x11/xlockmore/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.9 2000/08/21 20:31:51 hubertf Exp $ +$NetBSD: patch-ab,v 1.10 2000/11/09 04:46:22 hubertf Exp $ --- xlock/xlock.c.orig Mon Aug 21 16:14:05 2000 -+++ xlock/xlock.c Mon Aug 21 22:26:06 2000 ++++ xlock/xlock.c @@ -597,7 +597,9 @@ #include <X11/extensions/dpms.h> #else /* XFree86 < 4.x */ @@ -12,3 +12,13 @@ $NetBSD: patch-ab,v 1.9 2000/08/21 20:31:51 hubertf Exp $ extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *); extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short); #endif +@@ -3084,7 +3086,8 @@ + #endif + + #if defined( USE_SOUND ) && defined( USE_ESOUND ) +- sound =( init_sound() != -1 ); ++ /* only enable sound if not disabled - see NetBSD PR pkg/11185 */ ++ sound = sound && ( init_sound() != -1 ); + #endif + + #ifdef USE_DTSAVER |