diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /dev-qt/qtwebengine/files | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'dev-qt/qtwebengine/files')
4 files changed, 0 insertions, 187 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch deleted file mode 100644 index 4b2676faa6a0..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 11 Jun 2018 16:16:55 +0300 -Subject: Add fallback lookup for eglGetProcAddress - -Use the GLContext to find address for eglGetProcAddress symbol, if it's -not found with dlopen. - -Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85 -Reviewed-by: Michal Klocek <michal.klocek@qt.io> ---- - src/core/gl_context_qt.cpp | 11 +++++++++++ - src/core/gl_context_qt.h | 1 + - src/core/gl_surface_qt.cpp | 4 ++++ - 3 files changed, 16 insertions(+) - -diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp -index 9ed1db8b..95491709 100644 ---- a/src/core/gl_context_qt.cpp -+++ b/src/core/gl_context_qt.cpp -@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress() - return get_proc_address; - } - -+QFunctionPointer GLContextHelper::getEglGetProcAddress() -+{ -+ QFunctionPointer get_proc_address = nullptr; -+#ifndef QT_NO_OPENGL -+ if (QOpenGLContext *context = qt_gl_global_share_context()) { -+ get_proc_address = context->getProcAddress("eglGetProcAddress"); -+ } -+#endif -+ return get_proc_address; -+} -+ - QT_END_NAMESPACE - - #if defined(USE_OZONE) || defined(OS_WIN) -diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h -index 8ffdad58..cecceabc 100644 ---- a/src/core/gl_context_qt.h -+++ b/src/core/gl_context_qt.h -@@ -63,6 +63,7 @@ public: - static void* getXDisplay(); - static void* getNativeDisplay(); - static QFunctionPointer getGlXGetProcAddress(); -+ static QFunctionPointer getEglGetProcAddress(); - private: - Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs); - -diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp -index 7e579246..4d38d7c2 100644 ---- a/src/core/gl_surface_qt.cpp -+++ b/src/core/gl_surface_qt.cpp -@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) { - base::GetFunctionPointerFromNativeLibrary(library, - "eglGetProcAddress")); - if (!get_proc_address) { -+ QFunctionPointer address = GLContextHelper::getEglGetProcAddress(); -+ get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address); -+ } -+ if (!get_proc_address) { - LOG(ERROR) << "eglGetProcAddress not found."; - base::UnloadNativeLibrary(library); - return false; --- -cgit v1.1-6-g87c4 - 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 e9ef452a8d95..000000000000 --- 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 <xhwang@chromium.org> -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 <dalecurtis@chromium.org> -Commit-Queue: Xiaohan Wang <xhwang@chromium.org> -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/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch deleted file mode 100644 index 8ac5b90b72c8..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/config.tests/xml2/xml2.cpp -+++ b/config.tests/xml2/xml2.cpp -@@ -27,9 +27,6 @@ - ****************************************************************************/ - - #include <libxml/xmlversion.h> --#if defined(LIBXML_CATALOG_ENABLED) --#error "libxml catalog enabled" --#endif - #if !defined(LIBXML_ICU_ENABLED) - #error "libxml icu not enabled" - #endif ---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp -+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp -@@ -28,6 +28,10 @@ - - #include <libxml/parser.h> - #include <libxml/parserInternals.h> -+#include <libxml/xmlversion.h> -+#if defined(LIBXML_CATALOG_ENABLED) -+#include <libxml/catalog.h> -+#endif - #include <libxslt/xslt.h> - #include <memory> - #include "core/css/StyleEngine.h" -@@ -538,10 +542,6 @@ - static bool ShouldAllowExternalLoad(const KURL& url) { - String url_string = url.GetString(); - -- // libxml should not be configured with catalogs enabled, so it -- // should not be asking to load default catalogs. -- CHECK(!IsLibxmlDefaultCatalogFile(url)); -- - // The most common DTD. There isn't much point in hammering www.w3c.org by - // requesting this URL for every XHTML document. - if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) -@@ -646,6 +646,9 @@ - if (did_init) - return; - -+#if defined(LIBXML_CATALOG_ENABLED) -+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); -+#endif - xmlInitParser(); - xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); - xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch deleted file mode 100644 index 352deefb22ac..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch +++ /dev/null @@ -1,41 +0,0 @@ -Bug: https://bugs.gentoo.org/634220 - ---- a/src/3rdparty/chromium/v8/BUILD.gn -+++ b/src/3rdparty/chromium/v8/BUILD.gn -@@ -661,6 +661,7 @@ action("run_mksnapshot") { - - deps = [ - ":mksnapshot($v8_snapshot_toolchain)", -+ ":run_paxmark", - ] - - script = "tools/run.py" -@@ -706,6 +707,28 @@ action("run_mksnapshot") { - args += [ rebase_path(v8_embed_script, root_build_dir) ] - } - } -+action("run_paxmark") { -+ visibility = [ ":*" ] # Only targets in this file can depend on this. -+ -+ deps = [ -+ ":mksnapshot($v8_snapshot_toolchain)", -+ ] -+ -+ script = "/usr/sbin/pypaxctl" -+ -+ sources = [] -+ -+ outputs = [ -+ "$target_out_dir/mksnapshot", -+ ] -+ -+ args = [ -+ "-sm", -+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", -+ "root_out_dir") + "/mksnapshot", -+ root_build_dir), -+ ] -+} - - action("run_mkpeephole") { - visibility = [ ":*" ] # Only targets in this file can depend on this. |