diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-05 20:39:50 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-05 20:39:50 +0000 |
| commit | f667554a2f7478b55c8b063a1aea96674e3da800 (patch) | |
| tree | 2f019f0772a942e84878c7fb9be7cc194e5b53bf | |
| parent | 0577fc68c47d1714e96cf80450013e7bdb257023 (diff) | |
| download | pkgsrc-f667554a2f7478b55c8b063a1aea96674e3da800.tar.gz | |
Linux fixes:
1) define INFTIM if needed.
2) glibc does not have a <sys/filio.h>
3) Don't build sun audio support on Linux.
While here make 'arts' a PKG_SUGGESTED_OPTIONS on Linux.
| -rw-r--r-- | audio/mad123/Makefile | 7 | ||||
| -rw-r--r-- | audio/mad123/distinfo | 5 | ||||
| -rw-r--r-- | audio/mad123/patches/patch-ab | 16 | ||||
| -rw-r--r-- | audio/mad123/patches/patch-audio__dev.h | 13 |
4 files changed, 34 insertions, 7 deletions
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile index a5c99d4a51c..a7aba814065 100644 --- a/audio/mad123/Makefile +++ b/audio/mad123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/01/13 10:54:47 obache Exp $ +# $NetBSD: Makefile,v 1.28 2012/02/05 20:39:50 sbd Exp $ # DISTNAME= mad123-0.8.5 @@ -17,9 +17,12 @@ PKG_DESTDIR_SUPPORT= user-destdir PKG_OPTIONS_VAR= PKG_OPTIONS.mad123 PKG_SUPPORTED_OPTIONS= arts oss sun PKG_SUGGESTED_OPTIONS+= oss -.if ${OPSYS} != "DragonFly" +.if ${OPSYS} != "DragonFly" && ${OPSYS} != "Linux" PKG_SUGGESTED_OPTIONS+= sun .endif +.if ${OPSYS} == "Linux" +PKG_SUGGESTED_OPTIONS+= arts +.endif .include "../../mk/bsd.options.mk" diff --git a/audio/mad123/distinfo b/audio/mad123/distinfo index 5645420b590..871606415d9 100644 --- a/audio/mad123/distinfo +++ b/audio/mad123/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2005/11/11 18:58:18 joerg Exp $ +$NetBSD: distinfo,v 1.7 2012/02/05 20:39:50 sbd Exp $ SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8 RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41 Size (mad123-0.8.5.tar.gz) = 24836 bytes SHA1 (patch-aa) = 16aecc1f75178cb62bca7d5012cea4dffe393f9c -SHA1 (patch-ab) = eea40969ca88bd65666aada085742a3bdd5d9eba +SHA1 (patch-ab) = d4522da4a3d11d6f758930a46be967b4e0fcd640 SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df +SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69 diff --git a/audio/mad123/patches/patch-ab b/audio/mad123/patches/patch-ab index 890ac97f398..c01c28464ec 100644 --- a/audio/mad123/patches/patch-ab +++ b/audio/mad123/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.1 2005/11/11 18:58:18 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2012/02/05 20:39:50 sbd Exp $ --- audio_dev.c.orig 2004-09-22 09:23:43.000000000 +0000 +++ audio_dev.c -@@ -43,6 +43,10 @@ +@@ -22,7 +22,9 @@ + #include <sys/types.h> + #include <sys/param.h> + #include <sys/fcntl.h> ++#ifndef __linux__ + #include <sys/filio.h> ++#endif + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <sys/wait.h> +@@ -43,6 +45,10 @@ #undef WORDS_BIGENDIAN #endif @@ -13,7 +23,7 @@ $NetBSD: patch-ab,v 1.1 2005/11/11 18:58:18 joerg Exp $ #define PCM_BUFFSIZE ((sizeof(((struct mad_pcm *)0)->samples) / \ sizeof(mad_fixed_t)) * 2) struct pcm_data { -@@ -97,8 +101,12 @@ static void audio_convert_dither(unsigne +@@ -97,8 +103,12 @@ static void audio_convert_dither(unsigne static const struct audio_dev_backend *audio_dev_backends[] = { diff --git a/audio/mad123/patches/patch-audio__dev.h b/audio/mad123/patches/patch-audio__dev.h new file mode 100644 index 00000000000..96a4f48f81f --- /dev/null +++ b/audio/mad123/patches/patch-audio__dev.h @@ -0,0 +1,13 @@ +$NetBSD: patch-audio__dev.h,v 1.1 2012/02/05 20:39:50 sbd Exp $ + +--- audio_dev.h.orig 2004-06-07 21:10:42.000000000 +0000 ++++ audio_dev.h +@@ -71,4 +71,8 @@ extern const struct audio_dev_backend au + extern const struct audio_dev_backend audio_dev_arts; + #endif + ++#ifndef INFTIM ++#define INFTIM (-1) ++#endif ++ + #endif /* __AUDIO_DEV_H */ |