diff options
author | fredb <fredb> | 2003-12-25 18:49:56 +0000 |
---|---|---|
committer | fredb <fredb> | 2003-12-25 18:49:56 +0000 |
commit | 1822c877e3e504c38f6c5ab09f05de486d8e573c (patch) | |
tree | 4dd92dc2602641ac5793b123cfa565ba615fed3d /graphics/ffmpeg | |
parent | 97fddc76a9694cf5d192a4dc34769dd47528c214 (diff) | |
download | pkgsrc-1822c877e3e504c38f6c5ab09f05de486d8e573c.tar.gz |
Generalize *BSD support, but try INT64_MAX first, only falling back to
QUAD_MAX as a last resort if it's defined. Reviewed by tron. Partial fix
for PR pkg/23879.
Diffstat (limited to 'graphics/ffmpeg')
-rw-r--r-- | graphics/ffmpeg/distinfo | 4 | ||||
-rw-r--r-- | graphics/ffmpeg/patches/patch-af | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index ed8cd910d1e..6084c4cf800 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/03/30 08:27:26 tron Exp $ +$NetBSD: distinfo,v 1.4 2003/12/25 18:49:56 fredb Exp $ SHA1 (ffmpeg-0.4.5.tar.gz) = 7d99250eb20c45b77a08e00ecad1f73d11f57cb8 Size (ffmpeg-0.4.5.tar.gz) = 280506 bytes @@ -7,4 +7,4 @@ SHA1 (patch-ab) = 812984db77f24c49d492162d83106d859b50d0f6 SHA1 (patch-ac) = 1b009f7878ec4b85c0204db210ce26b337422820 SHA1 (patch-ad) = db06e7ab8d60f523e02051339c5a0b66f8ac497f SHA1 (patch-ae) = d0f681ed5878c5e49c3daa956a7e0f28bdaf2b05 -SHA1 (patch-af) = 7eb856297df7793ab06b3107824483de64b922e1 +SHA1 (patch-af) = baaaf9349633d7e210d2841b80608100650432e2 diff --git a/graphics/ffmpeg/patches/patch-af b/graphics/ffmpeg/patches/patch-af index 7cd64acaf3a..49c2e66cac3 100644 --- a/graphics/ffmpeg/patches/patch-af +++ b/graphics/ffmpeg/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2002/03/30 08:27:26 tron Exp $ +$NetBSD: patch-af,v 1.2 2003/12/25 18:49:56 fredb Exp $ ---- ffmpeg.c.orig Mon Aug 13 23:24:19 2001 -+++ ffmpeg.c Sat Mar 30 09:25:11 2002 -@@ -31,11 +31,18 @@ +--- ffmpeg.c.orig 2001-08-13 16:24:19.000000000 -0500 ++++ ffmpeg.c +@@ -31,11 +31,22 @@ #include <sys/time.h> #include <sys/resource.h> #include <ctype.h> @@ -11,13 +11,17 @@ $NetBSD: patch-af,v 1.1 2002/03/30 08:27:26 tron Exp $ #include "avformat.h" ++#ifdef INT64_MAX ++#define MAXINT64 INT64_MAX ++#else +#ifdef INT64_C #define MAXINT64 INT64_C(0x7fffffffffffffff) +#else -+#ifdef __NetBSD__ ++#ifdef QUAD_MAX +#define MAXINT64 QUAD_MAX +#endif +#endif ++#endif typedef struct { const char *name; |