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 AC9B0138334 for ; Sun, 16 Sep 2018 11:42:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 936E0E0D34; Sun, 16 Sep 2018 11:42:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6573BE0D34 for ; Sun, 16 Sep 2018 11:42:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0C7B4335CEC for ; Sun, 16 Sep 2018 11:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98C7B3C4 for ; Sun, 16 Sep 2018 11:42:39 +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: <1537098134.f4bdd7b8461e2224d8e121341137cf3ba8bc65e7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch media-libs/libextractor/libextractor-1.6.ebuild X-VCS-Directories: media-libs/libextractor/files/ media-libs/libextractor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4bdd7b8461e2224d8e121341137cf3ba8bc65e7 X-VCS-Branch: master Date: Sun, 16 Sep 2018 11:42:39 +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-Archives-Salt: f5f666f5-8578-47a4-915b-9b5814a28053 X-Archives-Hash: f7cfa84f795cba8c265fa414b4b26d33 commit: f4bdd7b8461e2224d8e121341137cf3ba8bc65e7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 16 11:41:48 2018 +0000 Commit: Andreas Sturmlechner gentoo 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