From owner-svn-ports-all@freebsd.org Tue Apr 24 13:56:42 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 1FC9DFA55AF; Tue, 24 Apr 2018 13:56:42 +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 C065369A9C; Tue, 24 Apr 2018 13:56:41 +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 A143213FD7; Tue, 24 Apr 2018 13:56:41 +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 w3ODufV1031342; Tue, 24 Apr 2018 13:56:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3ODufFu031341; Tue, 24 Apr 2018 13:56:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804241356.w3ODufFu031341@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:56:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468204 - head/graphics/gegl3/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/gegl3/files X-SVN-Commit-Revision: 468204 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:56:42 -0000 Author: jbeich Date: Tue Apr 24 13:56:41 2018 New Revision: 468204 URL: https://svnweb.freebsd.org/changeset/ports/468204 Log: graphics/gegl3: unbreak with ffmpeg 4.0 ./ff-save.c:293:17: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ ./ff-save.c:634:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ ./ff-save.c:702:30: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) ^ ./ff-save.c:806:28: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if (oc->oformat->flags & AVFMT_RAWPICTURE) ^ PR: 227726 Added: head/graphics/gegl3/files/ head/graphics/gegl3/files/patch-operations_external_ff-save.c (contents, props changed) Added: head/graphics/gegl3/files/patch-operations_external_ff-save.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gegl3/files/patch-operations_external_ff-save.c Tue Apr 24 13:56:41 2018 (r468204) @@ -0,0 +1,46 @@ +--- operations/external/ff-save.c.orig 2017-07-01 17:19:54 UTC ++++ operations/external/ff-save.c +@@ -290,7 +290,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * + c->codec_type = AVMEDIA_TYPE_AUDIO; + + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return st; + } +@@ -631,7 +631,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * + #endif + + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return st; + } +@@ -699,7 +699,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, A + } + + p->video_outbuf = NULL; ++#ifdef AVFMT_RAWPICTURE + if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) ++#endif + { + /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */ + p->video_outbuf_size = 1024 * 1024; +@@ -803,6 +805,7 @@ write_video_frame (GeglProperties *o, + picture_ptr = p->picture; + picture_ptr->pts = p->frame_count; + ++#ifdef AVFMT_RAWPICTURE + if (oc->oformat->flags & AVFMT_RAWPICTURE) + { + /* raw video case. The API will change slightly in the near +@@ -821,6 +824,7 @@ write_video_frame (GeglProperties *o, + ret = av_write_frame (oc, &pkt); + } + else ++#endif + { + /* encode the image */ + AVPacket pkt2;