CVS commit: pkgsrc/multimedia/ffmpeg

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Sat Jan 28 09:31:30 UTC 2012

Modified Files:
        pkgsrc/multimedia/ffmpeg: Makefile distinfo
        pkgsrc/multimedia/ffmpeg/patches: patch-ap

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/multimedia/ffmpeg/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/multimedia/ffmpeg/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg/patches/patch-ap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.