From c8e4dfde7c618ecb93b2d750e18a802f96c501bd Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 3 May 2002 14:50:42 +0000 Subject: Comment out the mtrr parts on NetBSD versions that don't support them. Might make mplayer work on 1.5.2 and similar. --- graphics/mplayer/distinfo | 3 ++- graphics/mplayer/patches/patch-ab | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 graphics/mplayer/patches/patch-ab diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index 02c204b2676..3f2feb69844 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/04/30 15:10:01 veego Exp $ +$NetBSD: distinfo,v 1.6 2002/05/03 14:50:42 wiz Exp $ SHA1 (MPlayer-0.90pre2.tar.bz2) = 51f70a14f43af7cddd17df8c3b2f59207a56ca6d Size (MPlayer-0.90pre2.tar.bz2) = 2382376 bytes SHA1 (patch-aa) = 514deb9f9e8264ba964a7d5425fa5f3d97b62829 +SHA1 (patch-ab) = c7336ba70c1a70c0e5717375930ebf61399e008d diff --git a/graphics/mplayer/patches/patch-ab b/graphics/mplayer/patches/patch-ab new file mode 100644 index 00000000000..308388e8c50 --- /dev/null +++ b/graphics/mplayer/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.4 2002/05/03 14:50:42 wiz Exp $ + +--- libdha/mtrr.c.orig Sun Apr 28 00:42:24 2002 ++++ libdha/mtrr.c +@@ -13,9 +13,12 @@ + #include "AsmMacros.h" + + #if defined (__i386__) && defined (__NetBSD__) ++#include ++#if __NetBSD_Version__ > 105240000 + #include +-#include + #include ++#endif ++#include + #include + #endif + +@@ -46,7 +49,7 @@ + return wr_len == strlen(sout) ? 0 : EPERM; + } + return ENOSYS; +-#elif defined (__NetBSD__) ++#elif defined (__NetBSD__) && (__NetBSD_Version__ > 105240000) + struct mtrr *mtrrp; + int n; + -- cgit v1.2.3