diff options
| author | hans <hans@pkgsrc.org> | 2012-01-12 21:13:17 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-01-12 21:13:17 +0000 |
| commit | 5d1582d7a016d44dcafc6a7ad61c21c542562eb7 (patch) | |
| tree | 9799f25fc31898eb0981a1debc0160b62f383cfc /audio | |
| parent | 1986dd6943b640a04efaaedac2341eb5c2ddaaf1 (diff) | |
| download | pkgsrc-5d1582d7a016d44dcafc6a7ad61c21c542562eb7.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/xmix/distinfo | 4 | ||||
| -rw-r--r-- | audio/xmix/patches/patch-ab | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/audio/xmix/distinfo b/audio/xmix/distinfo index 73cca2385df..78bbd9854fb 100644 --- a/audio/xmix/distinfo +++ b/audio/xmix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2011/09/04 22:17:41 dholland Exp $ +$NetBSD: distinfo,v 1.7 2012/01/12 21:13:17 hans Exp $ SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3 RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925 @@ -7,4 +7,4 @@ SHA1 (xmix-2.1.mixers.patch) = 86b423774a6afcd56a8f8931108823d702db1ea5 RMD160 (xmix-2.1.mixers.patch) = bbbc4b44ed603e54044fc1c71fa20f4373cae81a Size (xmix-2.1.mixers.patch) = 1684 bytes SHA1 (patch-aa) = a60baf409d6f9182f185fbd41676d85c31971363 -SHA1 (patch-ab) = df27582fbac4a3e0068c8ca475c840decf1839c0 +SHA1 (patch-ab) = 473f5182eb86cd6922ab9bc204d6bbbd0c93c5ad diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab index 801288fbc7f..9eaa0d8ad5d 100644 --- a/audio/xmix/patches/patch-ab +++ b/audio/xmix/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $ +$NetBSD: patch-ab,v 1.6 2012/01/12 21:13:17 hans Exp $ - support more OSes (is the first hunk actually correct?) - fix void main @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $ --- xmix.c.orig 2011-09-04 22:12:45.000000000 +0000 +++ xmix.c -@@ -77,7 +77,12 @@ to Rick! I'll call this version V2.1 +@@ -77,7 +77,14 @@ to Rick! I'll call this version V2.1 #include "square_empty.bit" #include "square_with_x.bit" @@ -14,13 +14,15 @@ $NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $ +#ifdef __NetBSD__ +#include <sys/ioctl.h> +#include <soundcard.h> ++#elif defined(__sun) ++#include <sys/soundcard.h> +#else +#include <machine/soundcard.h> +#endif #define SOUND_FULL_SCALE 100.0 #define MAX_SOUND_VOL 95 -@@ -450,7 +455,7 @@ static void set_supported(VolumeControl +@@ -450,7 +457,7 @@ static void set_supported(VolumeControl } @@ -29,7 +31,7 @@ $NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $ { XtAppContext app_context; int scroll_sep, longway; -@@ -742,7 +747,7 @@ void main (int argc, char **argv) +@@ -742,7 +749,7 @@ void main (int argc, char **argv) mic.locked = 0; reclvl.locked = 0; |