[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg The fix for UINT64_C is needed on Li...

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3be8931c7f10
branches:  trunk
changeset: 598997:3be8931c7f10
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Fri Feb 03 08:43:50 2012 +0000

description:
The fix for UINT64_C is needed on Linux to.

Bump PKGREVISION

diffstat:

 multimedia/ffmpeg/Makefile         |   4 ++--
 multimedia/ffmpeg/distinfo         |   4 ++--
 multimedia/ffmpeg/patches/patch-ap |  10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 4f8acac525b8 -r 3be8931c7f10 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Fri Feb 03 07:09:34 2012 +0000
+++ b/multimedia/ffmpeg/Makefile        Fri Feb 03 08:43:50 2012 +0000
@@ -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@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r 4f8acac525b8 -r 3be8931c7f10 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Fri Feb 03 07:09:34 2012 +0000
+++ b/multimedia/ffmpeg/distinfo        Fri Feb 03 08:43:50 2012 +0000
@@ -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 @@
 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 -r 4f8acac525b8 -r 3be8931c7f10 multimedia/ffmpeg/patches/patch-ap
--- a/multimedia/ffmpeg/patches/patch-ap        Fri Feb 03 07:09:34 2012 +0000
+++ b/multimedia/ffmpeg/patches/patch-ap        Fri Feb 03 08:43:50 2012 +0000
@@ -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 */