From owner-svn-ports-head@freebsd.org Wed May 2 13:25:56 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 E1808FA96D2; Wed, 2 May 2018 13:25:55 +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 9730A77397; Wed, 2 May 2018 13:25:55 +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 91727118A9; Wed, 2 May 2018 13:25:55 +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 w42DPtub046778; Wed, 2 May 2018 13:25:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42DPtX0046777; Wed, 2 May 2018 13:25:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805021325.w42DPtX0046777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 13:25:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468831 - head/cad/opencascade/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/cad/opencascade/files X-SVN-Commit-Revision: 468831 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: Wed, 02 May 2018 13:25:56 -0000 Author: jbeich Date: Wed May 2 13:25:55 2018 New Revision: 468831 URL: https://svnweb.freebsd.org/changeset/ports/468831 Log: cad/opencascade: unbreak with ffmpeg 4.0 src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx (contents, props changed) Added: head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx Wed May 2 13:25:55 2018 (r468831) @@ -0,0 +1,34 @@ +src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ +src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + ^ + +--- src/Image/Image_VideoRecorder.cxx.orig 2017-08-30 13:28:21 UTC ++++ src/Image/Image_VideoRecorder.cxx +@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream ( + // some formats want stream headers to be separate + if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER) + { +- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + return Standard_True; + #else +@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + AVPacket aPacket; + memset (&aPacket, 0, sizeof(aPacket)); + av_init_packet (&aPacket); ++#ifdef AVFMT_RAWPICTURE + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + && !theToFlush) + { +@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + aResAv = av_interleaved_write_frame (myAVContext, &aPacket); + } + else ++#endif + { + // encode the image + myFrame->pts = myFrameCount;