diff options
author | tonio <tonio@pkgsrc.org> | 2008-05-25 14:34:13 +0000 |
---|---|---|
committer | tonio <tonio@pkgsrc.org> | 2008-05-25 14:34:13 +0000 |
commit | 8c50e2ac4a8198d05365418629feb37718b92148 (patch) | |
tree | 40ed471303e9399e766e53623e10ac1262c07ea7 /multimedia/libmpeg3 | |
parent | e41a860523800a8c75bdb25d46a619f2f6581a9a (diff) | |
download | pkgsrc-8c50e2ac4a8198d05365418629feb37718b92148.tar.gz |
Yet another try to fix PR pkg/38733
Use the __DARWIN_64_BIT_INO_T from sys/cdefs.h on darwin
Diffstat (limited to 'multimedia/libmpeg3')
-rw-r--r-- | multimedia/libmpeg3/distinfo | 6 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ae | 9 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ah | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo index 50213e4c77c..0eed11c4604 100644 --- a/multimedia/libmpeg3/distinfo +++ b/multimedia/libmpeg3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2008/05/24 07:24:59 tonio Exp $ +$NetBSD: distinfo,v 1.15 2008/05/25 14:34:13 tonio Exp $ SHA1 (libmpeg3-1.7-src.tar.bz2) = 577da1ddf77f1e1fcd1deb69829eec3567daed36 RMD160 (libmpeg3-1.7-src.tar.bz2) = f1989c4b52d97ee29833edc79efd731b6219f126 @@ -6,8 +6,8 @@ Size (libmpeg3-1.7-src.tar.bz2) = 320897 bytes SHA1 (patch-aa) = c05dfda5b2b43593044af2328244858453add46c SHA1 (patch-ac) = f83af5e90c93f7d02395923d2f93fb916057c434 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e -SHA1 (patch-ae) = d0575f32a5964ee06697f1a77dcf09db264f2a29 +SHA1 (patch-ae) = 7543ed5a7a146eab7e0f789d8b9e470a84bf0999 SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32 -SHA1 (patch-ah) = 9c0db87073c79094be477518f8173fbb1ed51696 +SHA1 (patch-ah) = e0adcf6674ea145f9a7ce1833ffd78df6fe97e21 SHA1 (patch-ai) = 859735f677cb469b782e27da2a14bacd3fd02003 SHA1 (patch-aj) = 48a5bcbce03d4ff91e8815b5813d2138b87bacb0 diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae index 684a4c7346f..5a8f6b19202 100644 --- a/multimedia/libmpeg3/patches/patch-ae +++ b/multimedia/libmpeg3/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.9 2008/05/24 07:24:59 tonio Exp $ +$NetBSD: patch-ae,v 1.10 2008/05/25 14:34:13 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,29 @@ +@@ -1,11 +1,32 @@ #include "mpeg3private.h" #include "mpeg3protos.h" @@ -16,7 +16,10 @@ $NetBSD: patch-ae,v 1.9 2008/05/24 07:24:59 tonio Exp $ +# include <sys/param.h> +# include <sys/mount.h> + -+# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_STRUCT_STAT64) /* MacOSX < 10.5 */) ++# if defined(__APPLE__) && defined(__MACH__) ++#include <sys/cdefs.h> ++# endif ++# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) +# define fopen64 fopen +# define fseeko64 fseek +# define stat64 stat diff --git a/multimedia/libmpeg3/patches/patch-ah b/multimedia/libmpeg3/patches/patch-ah index 9677b5cd2fa..6ec669fe1a8 100644 --- a/multimedia/libmpeg3/patches/patch-ah +++ b/multimedia/libmpeg3/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.5 2008/05/24 07:24:59 tonio Exp $ +$NetBSD: patch-ah,v 1.6 2008/05/25 14:34:13 tonio Exp $ --- mpeg3tocutil.c.orig 2008-02-19 19:21:30.000000000 +0100 +++ mpeg3tocutil.c 2008-02-19 19:22:41.000000000 +0100 -@@ -5,8 +5,23 @@ +@@ -5,8 +5,26 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -12,7 +12,10 @@ $NetBSD: patch-ah,v 1.5 2008/05/24 07:24:59 tonio Exp $ +# include <sys/param.h> +# include <sys/mount.h> + -+# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_STRUCT_STAT64) /* MacOSX < 10.5 */) ++# if defined(__APPLE__) && defined(__MACH__) ++#include <sys/cdefs.h> ++# endif ++# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) +# define stat64 stat +# endif +# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ |