media-libs/openimageio: backport upstream fix for ffmpeg4

Closes: https://bugs.gentoo.org/654160
Package-Manager: Portage-2.3.31, Repoman-2.3.9
This commit is contained in:
Alexis Ballier
2018-04-27 14:12:58 +02:00
parent 0a55bc9813
commit aca6a611eb
2 changed files with 30 additions and 0 deletions

View File

@@ -0,0 +1,26 @@
commit 810a0235837d6f31d8b3c05544f99461df71403e
Author: Larry Gritz <lg@larrygritz.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>

View File

@@ -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() {