diff options
author | rh <rh> | 2000-01-28 07:18:37 +0000 |
---|---|---|
committer | rh <rh> | 2000-01-28 07:18:37 +0000 |
commit | 4a8a77f9665344fa1b9504cefed26869d1d7216b (patch) | |
tree | 129904d12a37ee62854f35a2f110dfc4f9b82e65 /audio/cdparanoia/patches | |
parent | 64f945b877b752a25868201f35ac6f17a5f782c4 (diff) | |
download | pkgsrc-4a8a77f9665344fa1b9504cefed26869d1d7216b.tar.gz |
Make cdparanoia compile under NetBSD-1.4.x (pointed out by Eric Mumpower
on the cdparanoia mailing list).
Diffstat (limited to 'audio/cdparanoia/patches')
-rw-r--r-- | audio/cdparanoia/patches/patch-ad | 16 | ||||
-rw-r--r-- | audio/cdparanoia/patches/patch-cc | 14 |
2 files changed, 21 insertions, 9 deletions
diff --git a/audio/cdparanoia/patches/patch-ad b/audio/cdparanoia/patches/patch-ad index 89b7dab1010..1bcdc333844 100644 --- a/audio/cdparanoia/patches/patch-ad +++ b/audio/cdparanoia/patches/patch-ad @@ -1,19 +1,25 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $ +$NetBSD: patch-ad,v 1.2 2000/01/28 07:18:38 rh Exp $ ---- utils.h.orig Sat Oct 9 04:18:21 1999 -+++ utils.h Sun Jan 16 19:05:14 2000 -@@ -1,5 +1,10 @@ +--- utils.h.orig Fri Oct 8 21:18:21 1999 ++++ utils.h Fri Jan 28 08:04:15 2000 +@@ -1,5 +1,16 @@ #include <stdlib.h> +#ifdef __linux__ #include <endian.h> +#endif +#ifdef __NetBSD__ ++#include <sys/param.h> ++#if __NetBSD_Version__ >= 104010000 +#include <sys/endian.h> ++#else ++#include <machine/endian.h> ++#include <machine/bswap.h> ++#endif +#endif #include <stdio.h> #include <errno.h> #include <string.h> -@@ -19,15 +24,23 @@ +@@ -19,15 +30,23 @@ } static inline size32 swap32(size32 x){ diff --git a/audio/cdparanoia/patches/patch-cc b/audio/cdparanoia/patches/patch-cc index 26418fc7ddb..4e2e5f2119a 100644 --- a/audio/cdparanoia/patches/patch-cc +++ b/audio/cdparanoia/patches/patch-cc @@ -1,13 +1,19 @@ -$NetBSD: patch-cc,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $ +$NetBSD: patch-cc,v 1.2 2000/01/28 07:18:38 rh Exp $ ---- interface/utils.h.orig Mon Aug 16 07:13:44 1999 -+++ interface/utils.h Sat Jan 15 19:51:10 2000 -@@ -1,4 +1,10 @@ +--- interface/utils.h.orig Mon Aug 16 00:13:44 1999 ++++ interface/utils.h Fri Jan 28 08:04:27 2000 +@@ -1,4 +1,16 @@ +#ifdef __linux__ #include <endian.h> +#endif +#ifdef __NetBSD__ ++#include <sys/param.h> ++#if __NetBSD_Version__ >= 104010000 +#include <sys/endian.h> ++#else ++#include <machine/endian.h> ++#include <machine/bswap.h> ++#endif +#include <err.h> /* XXX */ +#endif #include <stdio.h> |