diff options
| author | dholland <dholland> | 2011-11-26 22:28:12 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-11-26 22:28:12 +0000 |
| commit | 7f172815f143116857a0c5e0778592cca1656879 (patch) | |
| tree | 77b58ad2ff79bc6bd7cf97d53526d4c70ad0ac87 | |
| parent | e00025b91e23adb8e7b983598eea353886bd8ade (diff) | |
| download | pkgsrc-7f172815f143116857a0c5e0778592cca1656879.tar.gz | |
Extend the UINT64_C patch to NetBSD, which needs it, and FreeBSD and
OpenBSD too since they probably do but we probably won't hear from
anyone about that directly. PKGREVISION -> 3.
Note that at least on NetBSD __STDC_CONSTANT_MACROS is apparently
already defined here (at least when building graphics/osg, maybe not
always) so this patch may not really be the right approach, but it
works...
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ap | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index e7268d42544..64b603282af 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.76 2011/11/22 10:51:35 marino Exp $ +# $NetBSD: Makefile,v 1.77 2011/11/26 22:28:12 dholland Exp $ # XXX This is release 0.7.7 but we had date-based pkgnames before. PKGNAME= ffmpeg-20111104.${DISTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index e3391afad72..7c6cf9fd4cb 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2011/11/22 10:51:35 marino Exp $ +$NetBSD: distinfo,v 1.48 2011/11/26 22:28:12 dholland Exp $ SHA1 (ffmpeg-0.7.7.tar.bz2) = 30cc01d359d99bb6304b7fecbd5ff909843d93f4 RMD160 (ffmpeg-0.7.7.tar.bz2) = 1123b0e38811dfd4f4f1cb0f7678518f90849034 @@ -6,5 +6,5 @@ Size (ffmpeg-0.7.7.tar.bz2) = 4531586 bytes SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382 SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6 -SHA1 (patch-ap) = e67719ab440da2036137cf6597ab52ed29eea114 +SHA1 (patch-ap) = 85b5f775c1b66b682585bd56a304dee19e45765f SHA1 (patch-configure) = 355743ab745fb4c47ff6c5ca403573660ec7ecb6 diff --git a/multimedia/ffmpeg/patches/patch-ap b/multimedia/ffmpeg/patches/patch-ap index 07a43273626..228e8706c8d 100644 --- a/multimedia/ffmpeg/patches/patch-ap +++ b/multimedia/ffmpeg/patches/patch-ap @@ -1,15 +1,18 @@ -$NetBSD: patch-ap,v 1.1 2011/11/22 10:51:35 marino Exp $ +$NetBSD: patch-ap,v 1.2 2011/11/26 22:28:12 dholland Exp $ --- libavutil/common.h.orig 2011-09-07 13:34:40.000000000 +0000 +++ libavutil/common.h -@@ -37,6 +37,14 @@ +@@ -37,6 +37,17 @@ #include "attributes.h" #include "libavutil/avconfig.h" -+#if defined(__DragonFly__) ++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__cplusplus) +#undef _STDINT_H_ ++#undef _SYS_STDINT_H_ ++#ifndef __STDC_CONSTANT_MACROS +#define __STDC_CONSTANT_MACROS ++#endif +#include <stdint.h> +#endif +#endif |