diff options
| author | woodsb02 <woodsb02@FreeBSD.org> | 2016-06-15 21:35:22 +0000 |
|---|---|---|
| committer | woodsb02 <woodsb02@FreeBSD.org> | 2016-06-15 21:35:22 +0000 |
| commit | e0445cf023025a3ef30093816cfafd0f2dcb47fa (patch) | |
| tree | 347266e7b837938e84f57450b6a97a825b321e82 | |
| parent | 581e513a66e92d891f7a136452859e41c7e9c519 (diff) | |
| download | FreeBSD-ports-e0445cf023025a3ef30093816cfafd0f2dcb47fa.zip FreeBSD-ports-e0445cf023025a3ef30093816cfafd0f2dcb47fa.tar.gz | |
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 <portmaster@BSDforge.com> (maintainer), mat (mentor)
Differential Revision: https://reviews.freebsd.org/D6820
| -rw-r--r-- | audio/aqualung/Makefile | 2 | ||||
| -rw-r--r-- | audio/aqualung/files/patch-ffmpeg3 | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index e733eac..07309e9 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 0000000..f734c21 --- /dev/null +++ b/audio/aqualung/files/patch-ffmpeg3 @@ -0,0 +1,24 @@ +From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001 +From: Jamie Heilman <jamie@audible.transient.net> +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; + |
