diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-03 08:43:50 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-03 08:43:50 +0000 |
| commit | a45e7dfe83dd2cdcbae90c58845618f443458e9c (patch) | |
| tree | 6aef2824cc6154887d91f10c2702399298130ba2 /multimedia | |
| parent | fe1a4da0c544245be5a24b51da395e880f57d316 (diff) | |
| download | pkgsrc-a45e7dfe83dd2cdcbae90c58845618f443458e9c.tar.gz | |
The fix for UINT64_C is needed on Linux to.
Bump PKGREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ap | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5b263e31556..65f93464fb5 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.84 2012/02/01 17:56:07 drochner Exp $ +# $NetBSD: Makefile,v 1.85 2012/02/03 08:43:50 sbd Exp $ # XXX This is release 0.7.11 but we had date-based pkgnames before. PKGNAME= ffmpeg-20120112.${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 7aeea933c56..efe2ded937c 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2012/01/28 09:31:29 marino Exp $ +$NetBSD: distinfo,v 1.54 2012/02/03 08:43:50 sbd Exp $ SHA1 (ffmpeg-0.7.11.tar.bz2) = 32f78f8990077dc045a52450c2ca2535eb6c7317 RMD160 (ffmpeg-0.7.11.tar.bz2) = 5e9a7ba857c4d4542bc1631981959ab91a2a73d1 @@ -6,5 +6,5 @@ Size (ffmpeg-0.7.11.tar.bz2) = 4532990 bytes SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382 SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6 -SHA1 (patch-ap) = 1a85793873c60f654afbdc6893bf16cd6f8f76a1 +SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3 SHA1 (patch-configure) = 242f16e06a30b8e55193ee647ab78e9fb2645231 diff --git a/multimedia/ffmpeg/patches/patch-ap b/multimedia/ffmpeg/patches/patch-ap index 6ef99d020fb..2dea6ee4d6d 100644 --- a/multimedia/ffmpeg/patches/patch-ap +++ b/multimedia/ffmpeg/patches/patch-ap @@ -1,20 +1,22 @@ -$NetBSD: patch-ap,v 1.3 2012/01/28 09:31:30 marino Exp $ +$NetBSD: patch-ap,v 1.4 2012/02/03 08:43:50 sbd Exp $ --- libavutil/common.h.orig 2012-01-12 21:34:32.000000000 +0000 +++ libavutil/common.h -@@ -37,6 +37,20 @@ +@@ -37,6 +37,22 @@ #include "attributes.h" #include "libavutil/avconfig.h" +#if defined(__cplusplus) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) +#undef _STDINT_H_ +#undef _SYS_STDINT_H_ ++#undef _STDINT_H ++#undef _GCC_WRAP_STDINT_H +#ifndef __STDC_CONSTANT_MACROS +#define __STDC_CONSTANT_MACROS +#endif +#include <stdint.h> -+#endif /* FreeBSD | OpenBSD */ ++#endif /* FreeBSD | OpenBSD | linux */ +#if defined(__DragonFly__) || defined(__NetBSD__) +#include <machine/int_const.h> +#endif /* DragonFly | NetBSD */ |