diff options
| author | wiz <wiz@pkgsrc.org> | 2002-05-07 20:26:12 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-05-07 20:26:12 +0000 |
| commit | cd1a7bfa0cfdab6fd963d973e7c347941cb9f20c (patch) | |
| tree | 01828e44a7a86bfd5f65eb538d412dcfcc44130e | |
| parent | 425319a5abc21922c3067993764e7bf866391ba3 (diff) | |
| download | pkgsrc-cd1a7bfa0cfdab6fd963d973e7c347941cb9f20c.tar.gz | |
Slightly different version of patch-ab, provided by Veego, so
that it works better on non-NetBSD systems.
| -rw-r--r-- | graphics/mplayer/distinfo | 4 | ||||
| -rw-r--r-- | graphics/mplayer/patches/patch-ab | 29 |
2 files changed, 22 insertions, 11 deletions
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index d3821dc09e7..8a1dba413c1 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2002/05/06 11:13:45 wiz Exp $ +$NetBSD: distinfo,v 1.8 2002/05/07 20:26:12 wiz Exp $ SHA1 (MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795 Size (MPlayer-0.90pre3.tar.bz2) = 2322749 bytes SHA1 (patch-aa) = 514deb9f9e8264ba964a7d5425fa5f3d97b62829 -SHA1 (patch-ab) = c7336ba70c1a70c0e5717375930ebf61399e008d +SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63 diff --git a/graphics/mplayer/patches/patch-ab b/graphics/mplayer/patches/patch-ab index 308388e8c50..3d4cc5b8e46 100644 --- a/graphics/mplayer/patches/patch-ab +++ b/graphics/mplayer/patches/patch-ab @@ -1,27 +1,38 @@ -$NetBSD: patch-ab,v 1.4 2002/05/03 14:50:42 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2002/05/07 20:26:13 wiz Exp $ --- libdha/mtrr.c.orig Sun Apr 28 00:42:24 2002 +++ libdha/mtrr.c -@@ -13,9 +13,12 @@ +@@ -13,11 +13,14 @@ #include "AsmMacros.h" #if defined (__i386__) && defined (__NetBSD__) +#include <sys/param.h> +#if __NetBSD_Version__ > 105240000 #include <stdint.h> --#include <stdlib.h> + #include <stdlib.h> #include <machine/mtrr.h> -+#endif -+#include <stdlib.h> #include <machine/sysarch.h> #endif ++#endif -@@ -46,7 +49,7 @@ - return wr_len == strlen(sout) ? 0 : EPERM; + #if defined( __i386__ ) + int mtrr_set_type(unsigned base,unsigned size,int type) +@@ -47,6 +50,7 @@ } return ENOSYS; --#elif defined (__NetBSD__) -+#elif defined (__NetBSD__) && (__NetBSD_Version__ > 105240000) + #elif defined (__NetBSD__) ++#if __NetBSD_Version__ > 105240000 struct mtrr *mtrrp; int n; +@@ -64,6 +68,10 @@ + free(mtrrp); + return 0; + #else ++ /* NetBSD prior to 1.5Y doesn't have MTRR support */ ++ return ENOSYS; ++#endif ++#else + #warning Please port MTRR stuff!!! + return ENOSYS; + #endif |