head 1.7; access; symbols pkgsrc-2014Q2:1.6.0.12 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.10 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.8 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.6 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.2 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.5.0.2 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.4.0.6 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.4 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.2 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2; locks; strict; comment @# @; 1.7 date 2014.08.11.23.10.51; author wiz; state dead; branches; next 1.6; commitid gwOp7aGgPrCMYZLx; 1.6 date 2013.01.16.20.55.47; author adam; state Exp; branches; next 1.5; 1.5 date 2012.10.10.13.33.44; author drochner; state Exp; branches; next 1.4; 1.4 date 2012.02.03.08.43.50; author sbd; state Exp; branches; next 1.3; 1.3 date 2012.01.28.09.31.30; author marino; state Exp; branches; next 1.2; 1.2 date 2011.11.26.22.28.12; author dholland; state Exp; branches; next 1.1; 1.1 date 2011.11.22.10.51.35; author marino; state Exp; branches; next ; desc @@ 1.7 log @Remove ffplay, ffmpeg; add ffplay1, ffmpeg1 to Makefile. @ text @$NetBSD: patch-ap,v 1.6 2013/01/16 20:55:47 adam Exp $ --- libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000 +++ libavutil/common.h @@@@ -39,6 +39,22 @@@@ #include "version.h" #include "libavutil/avconfig.h" +#if defined(__cplusplus) +#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 +#endif /* FreeBSD | OpenBSD | linux */ +#if defined(__DragonFly__) || defined(__NetBSD__) +#include +#endif /* DragonFly | NetBSD */ +#endif /* __cplusplus */ + #if AV_HAVE_BIGENDIAN # define AV_NE(be, le) (be) #else @ 1.6 log @Changes 1.1: - stream disposition information printing in ffprobe - filter for loudness analysis following EBU R128 - Opus encoder using libopus - ffprobe -select_streams option - Pinnacle TARGA CineWave YUV16 decoder - TAK demuxer, decoder and parser - DTS-HD demuxer - remove -same_quant, it hasn't worked for years - FFM2 support - X-Face image encoder and decoder - 24-bit FLAC encoding - multi-channel ALAC encoding up to 7.1 - metadata (INFO tag) support in WAV muxer - subtitles raw text decoder - support for building DLLs using MSVC - LVF demuxer - ffescape tool - metadata (info chunk) support in CAF muxer - field filter ported from libmpcodecs - AVR demuxer - geq filter ported from libmpcodecs - remove ffserver daemon mode - AST muxer/demuxer - new expansion syntax for drawtext - BRender PIX image decoder - ffprobe -show_entries option - ffprobe -sections option - ADPCM IMA Dialogic decoder - BRSTM demuxer - animated GIF decoder and demuxer - PVF demuxer - subtitles filter - IRCAM muxer/demuxer - Paris Audio File demuxer - Virtual concatenation demuxer - VobSub demuxer - JSON captions for TED talks decoding support - SOX Resampler support in libswresample - aselect filter - SGI RLE 8-bit decoder - Silicon Graphics Motion Video Compressor 1 & 2 decoder - Silicon Graphics Movie demuxer - apad filter - Resolution & pixel format change support with multithreading for H.264 - documentation split into per-component manuals - pp (postproc) filter ported from MPlayer - NIST Sphere demuxer - MPL2, VPlayer, MPlayer, AQTitle, PJS and SubViewer v1 subtitles demuxers and decoders - Sony Wave64 muxer - adobe and limelight publisher authentication in RTMP - data: URI scheme - support building on the Plan 9 operating system - kerndeint filter ported from MPlayer - histeq filter ported from VirtualDub - Megalux Frame demuxer - 012v decoder - Improved AVC Intra decoding support @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @copy ffmpeg10 to ffmpeg, making it the default version @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.1 2012/09/14 14:52:35 drochner Exp $ d3 1 a3 1 --- libavutil/common.h.orig 2012-01-12 21:34:32.000000000 +0000 d5 2 a6 2 @@@@ -37,6 +37,22 @@@@ #include "attributes.h" @ 1.4 log @The fix for UINT64_C is needed on Linux to. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.3 2012/01/28 09:31:30 marino Exp $ @ 1.3 log @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 multiple times. This refinement also works on NetBSD, but OpenBSD and FreeBSD unfortunately embed UINT64_C directly within . Therefore original patch is left in place to cover those systems. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -37,6 +37,20 @@@@ d10 1 a10 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) d13 2 d19 1 a19 1 +#endif /* FreeBSD | OpenBSD */ @ 1.2 log @Extend the UINT64_C patch to NetBSD, which needs it, and FreeBSD and OpenBSD too since they probably do but we probably won't hear from anyone about that directly. PKGREVISION -> 3. Note that at least on NetBSD __STDC_CONSTANT_MACROS is apparently already defined here (at least when building graphics/osg, maybe not always) so this patch may not really be the right approach, but it works... @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.1 2011/11/22 10:51:35 marino Exp $ d3 1 a3 1 --- libavutil/common.h.orig 2011-09-07 13:34:40.000000000 +0000 d5 1 a5 1 @@@@ -37,6 +37,17 @@@@ a8 1 +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) d10 1 d17 5 a21 2 +#endif +#endif @ 1.1 log @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. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -37,6 +37,14 @@@@ d9 1 a9 1 +#if defined(__DragonFly__) d12 2 d15 1 @