diff options
| -rw-r--r-- | multimedia/libmpeg3/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/libmpeg3/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmpeg3/patches/patch-ae | 14 |
3 files changed, 12 insertions, 10 deletions
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index 10eb2ebf831..49706873b56 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/04/03 09:41:25 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2009/01/24 12:29:51 tonio Exp $ # DISTNAME= libmpeg3-1.7-src @@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" -.if (${MACHINE_ARCH} == "i386") +.if (${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin") MAKE_ENV+= USE_MMX=1 MAKE_ENV+= USE_CSS=1 BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo index b6612841f02..244ebf2d0b1 100644 --- a/multimedia/libmpeg3/distinfo +++ b/multimedia/libmpeg3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2008/06/21 11:45:55 drochner Exp $ +$NetBSD: distinfo,v 1.17 2009/01/24 12:29:51 tonio Exp $ SHA1 (libmpeg3-1.7-src.tar.bz2) = 577da1ddf77f1e1fcd1deb69829eec3567daed36 RMD160 (libmpeg3-1.7-src.tar.bz2) = f1989c4b52d97ee29833edc79efd731b6219f126 @@ -6,7 +6,7 @@ Size (libmpeg3-1.7-src.tar.bz2) = 320897 bytes SHA1 (patch-aa) = c05dfda5b2b43593044af2328244858453add46c SHA1 (patch-ac) = f83af5e90c93f7d02395923d2f93fb916057c434 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e -SHA1 (patch-ae) = 4228069c44de3240f91765d952991812fcf340d7 +SHA1 (patch-ae) = ccd6908e29c779a83df9ef1e3b5cf785cfa1dcef SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32 SHA1 (patch-ah) = d39f80c08cc0b624486389893c8e8ac061953fa2 SHA1 (patch-ai) = 859735f677cb469b782e27da2a14bacd3fd02003 diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae index 9dbce2f1361..d92d789cadf 100644 --- a/multimedia/libmpeg3/patches/patch-ae +++ b/multimedia/libmpeg3/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.11 2008/06/21 11:45:56 drochner Exp $ +$NetBSD: patch-ae,v 1.12 2009/01/24 12:29:51 tonio Exp $ --- mpeg3io.c.orig 2005-05-01 07:57:56.000000000 +0200 -+++ mpeg3io.c 2008-02-19 19:25:09.000000000 +0100 -@@ -1,11 +1,32 @@ ++++ mpeg3io.c +@@ -1,11 +1,34 @@ #include "mpeg3private.h" #include "mpeg3protos.h" @@ -19,10 +19,12 @@ $NetBSD: patch-ae,v 1.11 2008/06/21 11:45:56 drochner Exp $ +# if defined(__APPLE__) && defined(__MACH__) +#include <sys/cdefs.h> +# endif -+# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) ++# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) +# define fopen64 fopen +# define fseeko64 fseek ++# if (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) +# define stat64 stat ++# endif +# endif +# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define statfs statvfs @@ -37,7 +39,7 @@ $NetBSD: patch-ae,v 1.11 2008/06/21 11:45:56 drochner Exp $ mpeg3_fs_t* mpeg3_new_fs(char *path) { -@@ -215,16 +231,26 @@ +@@ -215,16 +238,26 @@ void mpeg3io_complete_path(char *complet int mpeg3io_device(char *path, char *device) { @@ -64,7 +66,7 @@ $NetBSD: patch-ae,v 1.11 2008/06/21 11:45:56 drochner Exp $ fp = setmntent(MOUNTED, "r"); while(fp && (mnt = getmntent(fp))) { -@@ -236,6 +262,7 @@ +@@ -236,6 +269,7 @@ int mpeg3io_device(char *path, char *dev } } endmntent(fp); |