[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg multimedia/ffmpeg: rework UINT64_C f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fd24613c514
branches:  trunk
changeset: 598631:1fd24613c514
user:      marino <marino%pkgsrc.org@localhost>
date:      Sat Jan 28 09:31:29 2012 +0000

description:
multimedia/ffmpeg: rework UINT64_C fix for DragonFly and NetBSD

Due to multiple inclusions of stdint.h, DragonFly was failing to build
one of the akode plugins with a typedef redefinition error.  It had
previously built, so the UINT64_C fix for the akode mpc plugin broke
the ffmpeg plugin.

It turns out that the first patch effectively just imported
machine/int_const.h, so that header can be directly imported instead
rather than having to include the main contents of <stdint.h> multiple
times.  This refinement also works on NetBSD, but OpenBSD and FreeBSD
unfortunately embed UINT64_C directly within <stdint.h>.  Therefore
original patch is left in place to cover those systems.

diffstat:

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

diffs (63 lines):

diff -r c2edeeb68758 -r 1fd24613c514 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Sat Jan 28 09:12:03 2012 +0000
+++ b/multimedia/ffmpeg/Makefile        Sat Jan 28 09:31:29 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2012/01/17 15:08:31 drochner Exp $
+# $NetBSD: Makefile,v 1.82 2012/01/28 09:31:29 marino Exp $
 
 # XXX This is release 0.7.11 but we had date-based pkgnames before.
 PKGNAME=       ffmpeg-20120112.${DISTVERSION}
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r c2edeeb68758 -r 1fd24613c514 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Sat Jan 28 09:12:03 2012 +0000
+++ b/multimedia/ffmpeg/distinfo        Sat Jan 28 09:31:29 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2012/01/17 15:08:31 drochner Exp $
+$NetBSD: distinfo,v 1.53 2012/01/28 09:31:29 marino 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) = 85b5f775c1b66b682585bd56a304dee19e45765f
+SHA1 (patch-ap) = 1a85793873c60f654afbdc6893bf16cd6f8f76a1
 SHA1 (patch-configure) = 242f16e06a30b8e55193ee647ab78e9fb2645231
diff -r c2edeeb68758 -r 1fd24613c514 multimedia/ffmpeg/patches/patch-ap
--- a/multimedia/ffmpeg/patches/patch-ap        Sat Jan 28 09:12:03 2012 +0000
+++ b/multimedia/ffmpeg/patches/patch-ap        Sat Jan 28 09:31:29 2012 +0000
@@ -1,21 +1,24 @@
-$NetBSD: patch-ap,v 1.2 2011/11/26 22:28:12 dholland Exp $
+$NetBSD: patch-ap,v 1.3 2012/01/28 09:31:30 marino Exp $
 
---- libavutil/common.h.orig    2011-09-07 13:34:40.000000000 +0000
+--- libavutil/common.h.orig    2012-01-12 21:34:32.000000000 +0000
 +++ libavutil/common.h
-@@ -37,6 +37,17 @@
+@@ -37,6 +37,20 @@
  #include "attributes.h"
  #include "libavutil/avconfig.h"
  
-+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__cplusplus)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
 +#undef _STDINT_H_
 +#undef _SYS_STDINT_H_
 +#ifndef __STDC_CONSTANT_MACROS
 +#define __STDC_CONSTANT_MACROS
 +#endif
 +#include <stdint.h>
-+#endif
-+#endif
++#endif /* FreeBSD | OpenBSD */
++#if defined(__DragonFly__) || defined(__NetBSD__)
++#include <machine/int_const.h>
++#endif /* DragonFly | NetBSD */
++#endif /* __cplusplus */
 +
  #if AV_HAVE_BIGENDIAN
  #   define AV_NE(be, le) (be)