| 1 |
commit: be7f6591e4406e1f238a6b2a169f2e98295ac435 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 25 11:54:07 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 25 11:54:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=be7f6591 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: remove upstreamed FFmpeg patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 11 |
|
| 12 |
.../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 ---------------------- |
| 13 |
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 - |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 - |
| 15 |
3 files changed, 34 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index e9ef452a..00000000 |
| 20 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,32 +0,0 @@ |
| 23 |
-From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Xiaohan Wang <xhwang@××××××××.org> |
| 25 |
-Date: Mon, 29 Jan 2018 21:28:28 +0000 |
| 26 |
-Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64 |
| 27 |
- |
| 28 |
-AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg: |
| 29 |
-https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5 |
| 30 |
- |
| 31 |
-BUG=777484 |
| 32 |
- |
| 33 |
-Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db |
| 34 |
-Reviewed-on: https://chromium-review.googlesource.com/889686 |
| 35 |
-Reviewed-by: Dale Curtis <dalecurtis@××××××××.org> |
| 36 |
-Commit-Queue: Xiaohan Wang <xhwang@××××××××.org> |
| 37 |
-Cr-Commit-Position: refs/heads/master@{#532593} |
| 38 |
---- |
| 39 |
- src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +- |
| 40 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 41 |
- |
| 42 |
-diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h |
| 43 |
-index 0341e5784f725..60ffba708b0e5 100644 |
| 44 |
---- a/src/3rdparty/chromium/media/base/decoder_buffer.h |
| 45 |
-+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h |
| 46 |
-@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer |
| 47 |
- : public base::RefCountedThreadSafe<DecoderBuffer> { |
| 48 |
- public: |
| 49 |
- enum { |
| 50 |
-- kPaddingSize = 32, |
| 51 |
-+ kPaddingSize = 64, |
| 52 |
- #if defined(ARCH_CPU_ARM_FAMILY) |
| 53 |
- kAlignmentSize = 16 |
| 54 |
- #else |
| 55 |
|
| 56 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
| 57 |
index acd54530..94340299 100644 |
| 58 |
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
| 59 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
| 60 |
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND} |
| 61 |
|
| 62 |
PATCHES+=( |
| 63 |
"${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 |
| 64 |
- "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch" |
| 65 |
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 |
| 66 |
) |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 70 |
index acd54530..94340299 100644 |
| 71 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 72 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 73 |
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND} |
| 74 |
|
| 75 |
PATCHES+=( |
| 76 |
"${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 |
| 77 |
- "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch" |
| 78 |
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 |
| 79 |
) |
Archives