From owner-svn-ports-head@freebsd.org Tue Apr 24 17:44:28 2018 Return-Path: Delivered-To: svn-ports-head@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 D704FFAD3A6; Tue, 24 Apr 2018 17:44:27 +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 7D19381C39; Tue, 24 Apr 2018 17:44:27 +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 7817516591; Tue, 24 Apr 2018 17:44:27 +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 w3OHiRrw047695; Tue, 24 Apr 2018 17:44:27 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3OHiRQC047694; Tue, 24 Apr 2018 17:44:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804241744.w3OHiRQC047694@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 17:44:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468225 - head/emulators/vice/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/vice/files X-SVN-Commit-Revision: 468225 X-SVN-Commit-Repository: ports 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.25 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: Tue, 24 Apr 2018 17:44:28 -0000 Author: jbeich Date: Tue Apr 24 17:44:27 2018 New Revision: 468225 URL: https://svnweb.freebsd.org/changeset/ports/468225 Log: emulators/vice: unbreak with ffmpeg 4.0 ffmpegdrv.c:363:34: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE' if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { ^ ffmpegdrv.c:457:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ ffmpegdrv.c:790:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ ffmpegdrv.c:970:40: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { ^ PR: 227726 Added: head/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c (contents, props changed) Added: head/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c Tue Apr 24 17:44:27 2018 (r468225) @@ -0,0 +1,61 @@ +ffmpegdrv.c:363:34: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE' + if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { + ^ +ffmpegdrv.c:457:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + c->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ +ffmpegdrv.c:790:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + c->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ +ffmpegdrv.c:970:40: error: use of undeclared identifier 'AVFMT_RAWPICTURE' + if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { + ^ + +--- src/gfxoutputdrv/ffmpegdrv.c.orig 2017-03-30 20:32:40 UTC ++++ src/gfxoutputdrv/ffmpegdrv.c +@@ -360,7 +360,7 @@ static int ffmpegdrv_open_audio(AVFormatContext *oc, A + } + + audio_is_open = 1; +- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { ++ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) { + audio_inbuf_samples = 10000; + } else { + audio_inbuf_samples = c->frame_size; +@@ -454,7 +454,7 @@ static int ffmpegmovie_init_audio(int speed, int chann + + /* Some formats want stream headers to be separate. */ + if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + /* create resampler context */ + #ifndef HAVE_FFMPEG_AVRESAMPLE +@@ -787,7 +787,7 @@ static void ffmpegdrv_init_video(screenshot_t *screens + + /* Some formats want stream headers to be separate. */ + if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) { +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + if (audio_init_done) { +@@ -967,6 +967,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot) + + video_st.frame->pts = video_st.next_pts++; + ++#ifdef AVFMT_RAWPICTURE + if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { + AVPacket pkt; + VICE_P_AV_INIT_PACKET(&pkt); +@@ -977,7 +978,9 @@ static int ffmpegdrv_record(screenshot_t *screenshot) + pkt.pts = pkt.dts = video_st.frame->pts; + + ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt); +- } else { ++ } else ++#endif ++ { + AVPacket pkt = { 0 }; + int got_packet; +