From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5EA88138334 for ; Thu, 29 Nov 2018 20:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F7ABE0769; Thu, 29 Nov 2018 20:19:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53F34E0769 for ; Thu, 29 Nov 2018 20:19:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1A83335C7B for ; Thu, 29 Nov 2018 20:19:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B2544D2 for ; Thu, 29 Nov 2018 20:19:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543522726.22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch sci-libs/opencascade/opencascade-7.3.0.ebuild X-VCS-Directories: sci-libs/opencascade/files/ sci-libs/opencascade/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1 X-VCS-Branch: master Date: Thu, 29 Nov 2018 20:19:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5dc242fa-8ad7-46fd-b2a5-d6f631fed396 X-Archives-Hash: 85a38cbfd18e819d47495674bab0c1ee commit: 22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 29 20:02:59 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 29 20:18:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c33947 sci-libs/opencascade: Fix build with ffmpeg-4 Reported-by: Boris Vingradov gmail.com> Closes: https://bugs.gentoo.org/672248 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/opencascade-7.3.0-ffmpeg4.patch | 38 ++++++++++++++++++++++ sci-libs/opencascade/opencascade-7.3.0.ebuild | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch new file mode 100644 index 00000000000..fc572a4f5bc --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch @@ -0,0 +1,38 @@ +Author: jbeich +Date: Wed May 2 13:25:55 UTC 2018 +New revision: 468831 + +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 + ^ + +--- a/src/Image/Image_VideoRecorder.cxx 2017-08-30 13:28:21 UTC ++++ b/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; diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild index 48f4c0775e4..6d40cf35bba 100644 --- a/sci-libs/opencascade/opencascade-7.3.0.ebuild +++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}" PATCHES=( "${FILESDIR}/${P}-vtk-compat.patch" "${FILESDIR}/${P}-fixed-DESTDIR.patch" + "${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248 ) pkg_setup() {