From owner-svn-ports-all@freebsd.org Tue Apr 24 13:57:17 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 EDB89FA56A6; Tue, 24 Apr 2018 13:57:16 +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 9FED069D7B; Tue, 24 Apr 2018 13:57:16 +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 9AE3A13FDF; Tue, 24 Apr 2018 13:57:16 +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 w3ODvGZY031726; Tue, 24 Apr 2018 13:57:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3ODvGTk031725; Tue, 24 Apr 2018 13:57:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804241357.w3ODvGTk031725@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:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468207 - head/devel/renpy6/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/renpy6/files X-SVN-Commit-Revision: 468207 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:17 -0000 Author: jbeich Date: Tue Apr 24 13:57:16 2018 New Revision: 468207 URL: https://svnweb.freebsd.org/changeset/ports/468207 Log: devel/renpy6: unbreak with ffmpeg 4.0 ffdecode.c:840:67: error: use of undeclared identifier 'CODEC_CAP_DELAY' if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ^ ffdecode.c:1246:29: error: use of undeclared identifier 'CODEC_FLAG2_FAST' if(fast) enc->flags2 |= CODEC_FLAG2_FAST; ^ PR: 227726 Modified: head/devel/renpy6/files/patch-module_ffdecode.c (contents, props changed) Modified: head/devel/renpy6/files/patch-module_ffdecode.c ============================================================================== --- head/devel/renpy6/files/patch-module_ffdecode.c Tue Apr 24 13:57:04 2018 (r468206) +++ head/devel/renpy6/files/patch-module_ffdecode.c Tue Apr 24 13:57:16 2018 (r468207) @@ -71,6 +71,15 @@ https://github.com/renpy/renpy/commit/4aac7ca if (flush_complete) break; +@@ -836,7 +837,7 @@ static int audio_decode_frame(VideoState *is, double * + + if (!got_frame) { + /* stop sending empty packets if the decoder is finished */ +- if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ++ if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY) + flush_complete = 1; + continue; + } @@ -1231,9 +1232,9 @@ static int stream_component_open(VideoSt /* prepare audio output */ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { @@ -83,6 +92,15 @@ https://github.com/renpy/renpy/commit/4aac7ca } } +@@ -1242,7 +1243,7 @@ static int stream_component_open(VideoState *is, int s + enc->debug = debug; + enc->workaround_bugs = workaround_bugs; + enc->idct_algo= idct; +- if(fast) enc->flags2 |= CODEC_FLAG2_FAST; ++ if(fast) enc->flags2 |= AV_CODEC_FLAG2_FAST; + enc->skip_frame= skip_frame; + enc->skip_idct= skip_idct; + enc->skip_loop_filter= skip_loop_filter; @@ -1633,7 +1634,7 @@ void ffpy_stream_close(VideoState *is) for(i=0; ipictq[i];