From owner-svn-ports-all@freebsd.org Tue Apr 24 13:57:04 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA4FEFA566B; Tue, 24 Apr 2018 13:57:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7ADC369C77; Tue, 24 Apr 2018 13:57:04 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75D8313FDD; Tue, 24 Apr 2018 13:57:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3ODv4Gb031604; Tue, 24 Apr 2018 13:57:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3ODv4oR031603; Tue, 24 Apr 2018 13:57:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804241357.w3ODv4oR031603@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 24 Apr 2018 13:57:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468206 - head/audio/moc/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/audio/moc/files X-SVN-Commit-Revision: 468206 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2018 13:57:05 -0000 Author: jbeich Date: Tue Apr 24 13:57:04 2018 New Revision: 468206 URL: https://svnweb.freebsd.org/changeset/ports/468206 Log: audio/moc: unbreak with ffmpeg 4.0 ffmpeg.c:996:34: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if (data->codec->capabilities & CODEC_CAP_TRUNCATED) ^ ffmpeg.c:997:23: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' data->enc->flags |= CODEC_FLAG_TRUNCATED; ^ ffmpeg.c:1028:34: error: use of undeclared identifier 'CODEC_CAP_DELAY' if (data->codec->capabilities & CODEC_CAP_DELAY) ^ PR: 227726 Obtained from: Greg V Added: head/audio/moc/files/ head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c (contents, props changed) Added: head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c Tue Apr 24 13:57:04 2018 (r468206) @@ -0,0 +1,32 @@ +ffmpeg.c:996:34: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' + if (data->codec->capabilities & CODEC_CAP_TRUNCATED) + ^ +ffmpeg.c:997:23: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' + data->enc->flags |= CODEC_FLAG_TRUNCATED; + ^ +ffmpeg.c:1028:34: error: use of undeclared identifier 'CODEC_CAP_DELAY' + if (data->codec->capabilities & CODEC_CAP_DELAY) + ^ + +--- decoder_plugins/ffmpeg/ffmpeg.c.orig 2016-11-16 00:54:37 UTC ++++ decoder_plugins/ffmpeg/ffmpeg.c +@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *file) + #endif + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + #ifdef HAVE_AVCODEC_OPEN2 + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ static void *ffmpeg_open (const char *file) + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic);