diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-06-11 14:45:09 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-06-11 14:45:09 +0000 |
| commit | f71f00b93ee376c5b70d632977fa7d37196f0858 (patch) | |
| tree | 6f11858d0d724e1eab3488cd75a9842e1a541a46 /audio/alsa-utils | |
| parent | dc765789d8cc53f67a136de45c64d528dd4a1811 (diff) | |
| download | pkgsrc-f71f00b93ee376c5b70d632977fa7d37196f0858.tar.gz | |
Fix build under NetBSD 6, PR pkg/48893.
Diffstat (limited to 'audio/alsa-utils')
| -rw-r--r-- | audio/alsa-utils/distinfo | 4 | ||||
| -rw-r--r-- | audio/alsa-utils/patches/patch-alsaloop_alsaloop.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index 007603ecaab..c5a4df8f040 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2014/06/09 12:34:26 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2014/06/11 14:45:09 ryoon Exp $ SHA1 (alsa-utils-1.0.27.2.tar.bz2) = dfec4691dde6b2cee292bbd10f0f368158713e8f RMD160 (alsa-utils-1.0.27.2.tar.bz2) = 05432f3f795a43a42d43e7589235060eb83298f6 @@ -7,6 +7,6 @@ SHA1 (patch-aa) = 78087e7a7fe860e002d592b0c7b83e98b10ea2c3 SHA1 (patch-ab) = ecc172cd62997d6c645b5e798776cc98a493cd61 SHA1 (patch-ac) = 5f13043e6f7864bb88b13f0123ce8114995db8be SHA1 (patch-ad) = 4da5adfbd3fcc0611c6394bf00f2b684e735dbd2 -SHA1 (patch-alsaloop_alsaloop.c) = c8dee09e2d6e9082448f9bb003accb62ebd60d8c +SHA1 (patch-alsaloop_alsaloop.c) = 469b00a0ffa7ab3bca752bd61e458026100628fe SHA1 (patch-alsaloop_pcmjob.c) = ae340dde8532d3a1253d4ff38782f17fbf2d381e SHA1 (patch-alsamixer_volume__mapping.c) = 8c2f00a170238653a557387e878524e8d3aceb18 diff --git a/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c b/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c index c0bd39defc6..cdc3830b5c9 100644 --- a/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c +++ b/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c @@ -1,19 +1,25 @@ -$NetBSD: patch-alsaloop_alsaloop.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $ +$NetBSD: patch-alsaloop_alsaloop.c,v 1.2 2014/06/11 14:45:09 ryoon Exp $ --- alsaloop/alsaloop.c.orig 2013-07-09 15:28:37.000000000 +0000 +++ alsaloop/alsaloop.c -@@ -24,6 +24,10 @@ +@@ -24,6 +24,16 @@ #include <stdlib.h> #include <string.h> #include <sched.h> +/* For ERESTART */ +#if defined(__NetBSD__) ++#include <sys/param.h> ++/* NetBSD 6 does not have _KMEMUSER. And _KERNEL breaks build of alsa-utils. */ ++#if __NetBSD_Version__ < 699000000 ++#define ERESTART -3 ++#else +#define _KMEMUSER 1 +#endif ++#endif #include <errno.h> #include <getopt.h> #include <alsa/asoundlib.h> -@@ -34,6 +38,10 @@ +@@ -34,6 +44,10 @@ #include <sys/signal.h> #include "alsaloop.h" |