commit: be7f6591e4406e1f238a6b2a169f2e98295ac435 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Wed Jul 25 11:54:07 2018 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Wed Jul 25 11:54:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=be7f6591
dev-qt/qtwebengine: remove upstreamed FFmpeg patch Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 ---------------------- dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 - dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 - 3 files changed, 34 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch deleted file mode 100644 index e9ef452a..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001 -From: Xiaohan Wang <[email protected]> -Date: Mon, 29 Jan 2018 21:28:28 +0000 -Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64 - -AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg: -https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5 - -BUG=777484 - -Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db -Reviewed-on: https://chromium-review.googlesource.com/889686 -Reviewed-by: Dale Curtis <[email protected]> -Commit-Queue: Xiaohan Wang <[email protected]> -Cr-Commit-Position: refs/heads/master@{#532593} ---- - src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h -index 0341e5784f725..60ffba708b0e5 100644 ---- a/src/3rdparty/chromium/media/base/decoder_buffer.h -+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h -@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer - : public base::RefCountedThreadSafe<DecoderBuffer> { - public: - enum { -- kPaddingSize = 32, -+ kPaddingSize = 64, - #if defined(ARCH_CPU_ARM_FAMILY) - kAlignmentSize = 16 - #else diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild index acd54530..94340299 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild @@ -81,7 +81,6 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 - "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch" "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index acd54530..94340299 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -81,7 +81,6 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 - "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch" "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 )
