diff options
-rw-r--r-- | multimedia/mpeg_encode/distinfo | 5 | ||||
-rw-r--r-- | multimedia/mpeg_encode/patches/patch-ac | 16 | ||||
-rw-r--r-- | multimedia/mpeg_encode/patches/patch-ao | 24 |
3 files changed, 34 insertions, 11 deletions
diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo index 778fd55b505..c4254f12bc5 100644 --- a/multimedia/mpeg_encode/distinfo +++ b/multimedia/mpeg_encode/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.4 2005/10/05 11:45:46 salo Exp $ +$NetBSD: distinfo,v 1.5 2006/01/03 14:20:41 joerg Exp $ SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed RMD160 (mpeg_encode-1.5b-src.tar.gz) = 24c0a1090076630c292936639c5fb275778f6470 Size (mpeg_encode-1.5b-src.tar.gz) = 2028724 bytes SHA1 (patch-aa) = 04221eb3d4cf85b206d27a2f425719ed7c4a5ec1 SHA1 (patch-ab) = f2cdf02d49b726b4fb7fb210074e7ba53b9b380b -SHA1 (patch-ac) = 8f89257bd93584cd028b659bb8c3379d713339da +SHA1 (patch-ac) = 152c0bd7737a307d1aa89ae820e219300c124085 SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8 SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474 SHA1 (patch-ag) = 8cc4ffab9263f33e4a7da6779cdbbb59d010b475 @@ -16,3 +16,4 @@ SHA1 (patch-ak) = f28929b16bb804c691565adbe3f4c1814154ced7 SHA1 (patch-al) = be13795b7db10224974f222ce174fb1305d0e582 SHA1 (patch-am) = 983546e7384fc96f0f182ae23bf5ddd19f7a0008 SHA1 (patch-an) = 69e70b75b558637b3a2afb612871f7d4a8538c92 +SHA1 (patch-ao) = a771c6445fb792f0ea0fd41710302601d45d81fe diff --git a/multimedia/mpeg_encode/patches/patch-ac b/multimedia/mpeg_encode/patches/patch-ac index 87286cc1460..72840c4160f 100644 --- a/multimedia/mpeg_encode/patches/patch-ac +++ b/multimedia/mpeg_encode/patches/patch-ac @@ -1,24 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $ +$NetBSD: patch-ac,v 1.2 2006/01/03 14:20:41 joerg Exp $ ---- libpnmrw.c.orig Thu Aug 17 00:24:26 1995 +--- libpnmrw.c.orig 1995-08-16 22:24:26.000000000 +0000 +++ libpnmrw.c -@@ -28,6 +28,9 @@ +@@ -28,6 +28,7 @@ #endif #include <stdio.h> -+#ifdef __NetBSD__ -+# include <errno.h> -+#endif ++#include <errno.h> #include "libpnmrw.h" /* if don't have string.h, try strings.h */ -@@ -126,8 +129,10 @@ +@@ -126,8 +127,9 @@ static void pm_perror( reason ) char* reason; { -+#ifndef __NetBSD__ ++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) extern char* sys_errlist[]; - extern int errno; +- extern int errno; +#endif char* e; diff --git a/multimedia/mpeg_encode/patches/patch-ao b/multimedia/mpeg_encode/patches/patch-ao new file mode 100644 index 00000000000..249092bfb32 --- /dev/null +++ b/multimedia/mpeg_encode/patches/patch-ao @@ -0,0 +1,24 @@ +$NetBSD: patch-ao,v 1.1 2006/01/03 14:20:41 joerg Exp $ + +--- headers/libpnmrw.h.orig 2006-01-03 14:15:10.000000000 +0000 ++++ headers/libpnmrw.h +@@ -13,18 +13,7 @@ + #ifndef _PNMRW_H_ + #define _PNMRW_H_ + +-/* CONFIGURE: On some systems, malloc.h doesn't declare these, so we have +-** to do it. On other systems, for example HP/UX, it declares them +-** incompatibly. And some systems, for example Dynix, don't have a +-** malloc.h at all. A sad situation. If you have compilation problems +-** that point here, feel free to tweak or remove these declarations. +-*/ +-#include <malloc.h> +-#if !defined(sco) && !defined(sgi) && !defined(IRIX) +-extern char* malloc(); +-#endif +-/* End of configurable definitions. */ +- ++#include <stdlib.h> + + /* Definitions to make PBMPLUS work with either ANSI C or C Classic. */ + |