From owner-svn-ports-all@freebsd.org Tue Apr 24 00:17:54 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 6A16EFAEF9F; Tue, 24 Apr 2018 00:17:54 +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 1F67F6EF78; Tue, 24 Apr 2018 00:17:54 +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 1A0E53655; Tue, 24 Apr 2018 00:17:54 +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 w3O0HrVd019843; Tue, 24 Apr 2018 00:17:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3O0HrV1019842; Tue, 24 Apr 2018 00:17:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804240017.w3O0HrV1019842@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 00:17:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468158 - head/graphics/openimageio/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/openimageio/files X-SVN-Commit-Revision: 468158 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 00:17:54 -0000 Author: jbeich Date: Tue Apr 24 00:17:53 2018 New Revision: 468158 URL: https://svnweb.freebsd.org/changeset/ports/468158 Log: graphics/openimageio: unbreak with ffmpeg 4.0 src/ffmpeg.imageio/ffmpeginput.cpp:333:72: error: use of undeclared identifier 'CODEC_CAP_DELAY' m_codec_cap_delay = (bool) (m_codec_context->codec->capabilities & CODEC_CAP_DELAY); ^ PR: 227726 Obtained from: upstream Added: head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp (contents, props changed) Added: head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp Tue Apr 24 00:17:53 2018 (r468158) @@ -0,0 +1,20 @@ +https://github.com/OpenImageIO/oiio/pull/1926 + +--- src/ffmpeg.imageio/ffmpeginput.cpp.orig 2017-08-31 04:36:04 UTC ++++ src/ffmpeg.imageio/ffmpeginput.cpp +@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFram + } + #endif + ++ ++// Changes for ffmpeg 4.0 ++#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100)) ++ ++#if USE_FFMPEG_4_0 ++# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY ++#endif ++ ++ + #include + + #include "OpenImageIO/imageio.h"