commit: f4bdd7b8461e2224d8e121341137cf3ba8bc65e7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 16 11:41:48 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Sep 16 11:42:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bdd7b8
media-libs/libextractor: Fix build with ffmpeg-4 Closes: https://bugs.gentoo.org/666162 Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../files/libextractor-1.6-ffmpeg-4.patch | 20 ++++++++++++++++++++ media-libs/libextractor/libextractor-1.6.ebuild | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch new file mode 100644 index 00000000000..90360afd60a --- /dev/null +++ b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch @@ -0,0 +1,20 @@ +--- a/src/plugins/thumbnailffmpeg_extractor.c 2018-05-09 23:14:02.721105141 +0200 ++++ b/src/plugins/thumbnailffmpeg_extractor.c 2018-05-09 23:14:48.491629162 +0200 +@@ -107,7 +107,7 @@ + /** + * Number of bytes to feed to libav in one go, with padding (padding is zeroed). + */ +-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) ++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) + + /** + * Global handle to MAGIC data. +@@ -355,7 +355,7 @@ + encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA; + encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA; + #endif +- encoder_codec_ctx->flags = CODEC_FLAG_QSCALE; ++ encoder_codec_ctx->flags = AV_CODEC_FLAG_QSCALE; + encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA; + + dst_frame->pts = 1; diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild index cf862f1f85c..e870331de79 100644 --- a/media-libs/libextractor/libextractor-1.6.ebuild +++ b/media-libs/libextractor/libextractor-1.6.ebuild @@ -57,7 +57,10 @@ RDEPEND="${COMMON_DEPEND} !sci-biology/glimmer " -PATCHES=( "${FILESDIR}/${P}-CVE-2017-17440.patch" ) +PATCHES=( + "${FILESDIR}/${P}-CVE-2017-17440.patch" + "${FILESDIR}/${P}-ffmpeg-4.patch" +) src_prepare() { default
