From owner-svn-ports-head@freebsd.org Wed Jun 15 21:35:23 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3EFDA3144B; Wed, 15 Jun 2016 21:35:23 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76C3E1BF3; Wed, 15 Jun 2016 21:35:23 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5FLZMCj023728; Wed, 15 Jun 2016 21:35:22 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5FLZMbY023726; Wed, 15 Jun 2016 21:35:22 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201606152135.u5FLZMbY023726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 15 Jun 2016 21:35:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416939 - in head/audio/aqualung: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2016 21:35:23 -0000 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 (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 +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; +