diff options
| author | marino <marino> | 2011-11-22 10:51:35 +0000 |
|---|---|---|
| committer | marino <marino> | 2011-11-22 10:51:35 +0000 |
| commit | 9a75390ba73b53acca85d6eb4ac24e52566056ad (patch) | |
| tree | 0f5c5b85d114c8f9d68bd98b4086146bf0c7fc19 /multimedia | |
| parent | b018aa15bb64adeeb5798cf5f94411dfefd4ce27 (diff) | |
| download | pkgsrc-9a75390ba73b53acca85d6eb4ac24e52566056ad.tar.gz | |
multimedia/ffmpeg: Fix UINT64_C error on DragonFly
ffmpeg itself built fine on DragonFly, but other code trying to use this
library (e.g. audio/akode-plugins-ffmpeg) would not build, stopping with
an error like:
common.h:154 error: `UINT64_C` was not declared in this scope
The provided patch fixes this breakage. For conservative reasons, the
code only applies to DragonFly, but if other platforms are seeing the
same error, then the patch's macro should be expanded to include those
other platforms as well.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ap | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 7df11565165..e7268d42544 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2011/11/16 00:35:07 sbd Exp $ +# $NetBSD: Makefile,v 1.76 2011/11/22 10:51:35 marino Exp $ # XXX This is release 0.7.7 but we had date-based pkgnames before. PKGNAME= ffmpeg-20111104.${DISTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index f8c28608043..e3391afad72 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2011/11/07 10:43:35 drochner Exp $ +$NetBSD: distinfo,v 1.47 2011/11/22 10:51:35 marino Exp $ SHA1 (ffmpeg-0.7.7.tar.bz2) = 30cc01d359d99bb6304b7fecbd5ff909843d93f4 RMD160 (ffmpeg-0.7.7.tar.bz2) = 1123b0e38811dfd4f4f1cb0f7678518f90849034 @@ -6,4 +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-configure) = 355743ab745fb4c47ff6c5ca403573660ec7ecb6 diff --git a/multimedia/ffmpeg/patches/patch-ap b/multimedia/ffmpeg/patches/patch-ap new file mode 100644 index 00000000000..07a43273626 --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-ap @@ -0,0 +1,19 @@ +$NetBSD: patch-ap,v 1.1 2011/11/22 10:51:35 marino Exp $ + +--- libavutil/common.h.orig 2011-09-07 13:34:40.000000000 +0000 ++++ libavutil/common.h +@@ -37,6 +37,14 @@ + #include "attributes.h" + #include "libavutil/avconfig.h" + ++#if defined(__DragonFly__) ++#if defined(__cplusplus) ++#undef _STDINT_H_ ++#define __STDC_CONSTANT_MACROS ++#include <stdint.h> ++#endif ++#endif ++ + #if AV_HAVE_BIGENDIAN + # define AV_NE(be, le) (be) + #else |