[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/

[Alexis Ballier]

commit:     aca6a611eb0cda805b60113ccd0a6f56369ef41a
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 12:12:58 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 12:13:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca6a611

media-libs/openimageio: backport upstream fix for ffmpeg4

Closes: https://bugs.gentoo.org/654160
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../files/openimageio-1.8.7-ffmpeg4.patch          | 26 ++++++++++++++++++++++
 media-libs/openimageio/openimageio-1.8.7.ebuild    |  4 ++++
 2 files changed, 30 insertions(+)

diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
new file mode 100644
index 00000000000..92cad26c933
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
@@ -0,0 +1,26 @@
+commit 810a0235837d6f31d8b3c05544f99461df71403e
+Author: Larry Gritz <lg@××××××××××.com>
+Date:   Mon Apr 23 15:50:14 2018 -0700
+
+    Changes to allow building against the new ffmpeg 4.0 (#1926)
+
+diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
+index 4e0cb3b9..548ddba4 100644
+--- a/src/ffmpeg.imageio/ffmpeginput.cpp
++++ b/src/ffmpeg.imageio/ffmpeginput.cpp
+@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
+ }
+ #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 <boost/thread/once.hpp>
+ 
+ #include <OpenImageIO/imageio.h>

diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
index 1c69cf3c6d6..22956201293 100644
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -65,6 +65,10 @@ RDEPEND=">=dev-libs/boost-1.62:=
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg4.patch"
+)
+
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
 
 pkg_setup() {