diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-06 03:16:15 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-06 03:16:15 +0000 |
| commit | 99decc199ac5ea436ac98699e68e749b9cc38691 (patch) | |
| tree | 4a7c19de2fc9ff0b10e71c72367e41e11ae26707 /audio/xmix/patches | |
| parent | 93c880b9a1e41fdaa1a735fd770bfe6c37eade5f (diff) | |
| download | pkgsrc-99decc199ac5ea436ac98699e68e749b9cc38691.tar.gz | |
Include <linux/soundcard.h> on Linux.
Diffstat (limited to 'audio/xmix/patches')
| -rw-r--r-- | audio/xmix/patches/patch-ab | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab index 9eaa0d8ad5d..02bb2c47312 100644 --- a/audio/xmix/patches/patch-ab +++ b/audio/xmix/patches/patch-ab @@ -1,17 +1,18 @@ -$NetBSD: patch-ab,v 1.6 2012/01/12 21:13:17 hans Exp $ +$NetBSD: patch-ab,v 1.7 2012/02/06 03:16:15 sbd Exp $ - support more OSes (is the first hunk actually correct?) - fix void main - remove debug printout ---- xmix.c.orig 2011-09-04 22:12:45.000000000 +0000 +--- xmix.c.orig 2012-02-06 03:11:54.306900057 +0000 +++ xmix.c -@@ -77,7 +77,14 @@ to Rick! I'll call this version V2.1 +@@ -77,7 +77,16 @@ to Rick! I'll call this version V2.1 #include "square_empty.bit" #include "square_with_x.bit" --#include <linux/soundcard.h> -+#ifdef __NetBSD__ ++#if defined(__linux__) + #include <linux/soundcard.h> ++#elif defined(__NetBSD__) +#include <sys/ioctl.h> +#include <soundcard.h> +#elif defined(__sun) @@ -22,7 +23,7 @@ $NetBSD: patch-ab,v 1.6 2012/01/12 21:13:17 hans Exp $ #define SOUND_FULL_SCALE 100.0 #define MAX_SOUND_VOL 95 -@@ -450,7 +457,7 @@ static void set_supported(VolumeControl +@@ -450,7 +459,7 @@ static void set_supported(VolumeControl } @@ -31,7 +32,7 @@ $NetBSD: patch-ab,v 1.6 2012/01/12 21:13:17 hans Exp $ { XtAppContext app_context; int scroll_sep, longway; -@@ -742,7 +749,7 @@ void main (int argc, char **argv) +@@ -742,7 +751,7 @@ void main (int argc, char **argv) mic.locked = 0; reclvl.locked = 0; |