From a346fc26be1bca770fa55341358837c7d3c5660e Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Wed, 15 Jun 2016 21:35:22 +0000 Subject: audio/aqualung: Fix build with FFmpeg 3.0.x Add patch-ffmpeg3, obtained from upstream [1], to allow aqualung to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this patch is backwards compatible with ffmpeg 2.8.x. [1] https://github.com/jeremyevans/aqualung/commit/3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Approved by: Chris Hutchinson (maintainer), mat (mentor) Differential Revision: https://reviews.freebsd.org/D6820 --- audio/aqualung/Makefile | 2 +- audio/aqualung/files/patch-ffmpeg3 | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 audio/aqualung/files/patch-ffmpeg3 (limited to 'audio/aqualung') diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index e733eac31664..07309e9a642e 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -3,7 +3,7 @@ PORTNAME= aqualung PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/aqualung/files/patch-ffmpeg3 b/audio/aqualung/files/patch-ffmpeg3 new file mode 100644 index 000000000000..f734c21d5b9b --- /dev/null +++ b/audio/aqualung/files/patch-ffmpeg3 @@ -0,0 +1,24 @@ +From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001 +From: Jamie Heilman +Date: Sun, 8 May 2016 19:34:36 +0000 +Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later + +With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer() +were deprecated; the new default AVCodecContext.get_buffer2() +implementation works fine for us. + +--- src/decoder/dec_lavc.c.orig ++++ src/decoder/dec_lavc.c +@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) { + return DECODER_OPEN_BADLIB; + + pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec; ++#if LIBAVCODEC_VERSION_MAJOR < 55 + #if LIBAVCODEC_VERSION_MAJOR >= 53 + pd->avCodecCtx->get_buffer = avcodec_default_get_buffer; + pd->avCodecCtx->release_buffer = avcodec_default_release_buffer; + #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */ ++#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */ + + pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base; + -- cgit v1.2.3