Date: Wed, 15 Jun 2016 21:35:22 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416939 - in head/audio/aqualung: . files Message-ID: <201606152135.u5FLZMbY023726@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Wed Jun 15 21:35:22 2016 New Revision: 416939 URL: https://svnweb.freebsd.org/changeset/ports/416939 Log: 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 Added: head/audio/aqualung/files/patch-ffmpeg3 (contents, props changed) Modified: head/audio/aqualung/Makefile Modified: head/audio/aqualung/Makefile ============================================================================== --- head/audio/aqualung/Makefile Wed Jun 15 21:32:26 2016 (r416938) +++ head/audio/aqualung/Makefile Wed Jun 15 21:35:22 2016 (r416939) @@ -3,7 +3,7 @@ PORTNAME= aqualung PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF Added: head/audio/aqualung/files/patch-ffmpeg3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/aqualung/files/patch-ffmpeg3 Wed Jun 15 21:35:22 2016 (r416939) @@ -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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606152135.u5FLZMbY023726>