diff options
| author | wiz <wiz@pkgsrc.org> | 2002-05-07 22:02:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-05-07 22:02:04 +0000 |
| commit | cacb8486892b160b6c6a07f22a854282f01a4472 (patch) | |
| tree | aa1ac20d9befee7484524b2dcfe80cd268e90474 /graphics/gmplayer | |
| parent | cd1a7bfa0cfdab6fd963d973e7c347941cb9f20c (diff) | |
| download | pkgsrc-cacb8486892b160b6c6a07f22a854282f01a4472.tar.gz | |
Share patches between gmplayer and mplayer.
Diffstat (limited to 'graphics/gmplayer')
| -rw-r--r-- | graphics/gmplayer/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gmplayer/patches/patch-aa | 24 | ||||
| -rw-r--r-- | graphics/gmplayer/patches/patch-ab | 27 |
3 files changed, 2 insertions, 53 deletions
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo index 6c6c943ee97..2d80b573f55 100644 --- a/graphics/gmplayer/distinfo +++ b/graphics/gmplayer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/05/06 11:13:44 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/05/07 22:02:04 wiz Exp $ SHA1 (gmplayer/MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795 Size (gmplayer/MPlayer-0.90pre3.tar.bz2) = 2322749 bytes @@ -39,4 +39,4 @@ Size (gmplayer/AlienMind.tar.bz2) = 129515 bytes SHA1 (gmplayer/CornerMP.tar.bz2) = d46a59c33abcc27ddc24be3124d3f4d23361e836 Size (gmplayer/CornerMP.tar.bz2) = 237492 bytes SHA1 (patch-aa) = 514deb9f9e8264ba964a7d5425fa5f3d97b62829 -SHA1 (patch-ab) = c7336ba70c1a70c0e5717375930ebf61399e008d +SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63 diff --git a/graphics/gmplayer/patches/patch-aa b/graphics/gmplayer/patches/patch-aa deleted file mode 100644 index 59891e26bbe..00000000000 --- a/graphics/gmplayer/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/04/30 15:09:58 veego Exp $ - ---- configure.orig Sun Apr 28 23:05:09 2002 -+++ configure Mon Apr 29 09:40:55 2002 -@@ -263,8 +263,8 @@ - _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` - ;; - --with-extralibdir=*) -- _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` --# _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` -+# _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` -+ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; - --enable-runtime-cpudetection) - _runtime_cpudetection=yes -@@ -2626,7 +2626,7 @@ - echocheck "DVD support (libmpdvdkit)" - if test "$_dvdkit" = auto ; then - _dvdkit=no -- if linux || freebsd ; then -+ if linux || freebsd | netbsd ; then - test -f "./libmpdvdkit/Makefile" && _dvdkit=yes - fi - fi diff --git a/graphics/gmplayer/patches/patch-ab b/graphics/gmplayer/patches/patch-ab deleted file mode 100644 index 214d116cf8b..00000000000 --- a/graphics/gmplayer/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/05/03 17:54:18 fredb 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 <sys/param.h> -+#if __NetBSD_Version__ > 105240000 - #include <stdint.h> --#include <stdlib.h> - #include <machine/mtrr.h> -+#endif -+#include <stdlib.h> - #include <machine/sysarch.h> - #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; - |