diff options
Diffstat (limited to 'package/qt5/qt5webengine')
| -rw-r--r-- | package/qt5/qt5webengine/5.9.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch | 89 | ||||
| -rw-r--r-- | package/qt5/qt5webengine/qt5webengine.hash | 4 |
2 files changed, 2 insertions, 91 deletions
diff --git a/package/qt5/qt5webengine/5.9.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/package/qt5/qt5webengine/5.9.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch deleted file mode 100644 index b8ef687f99..0000000000 --- a/package/qt5/qt5webengine/5.9.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch +++ /dev/null @@ -1,89 +0,0 @@ -From d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad Mon Sep 17 00:00:00 2001 -From: Viktor Engelmann <viktor.engelmann@qt.io> -Date: Fri, 7 Jul 2017 12:56:19 +0200 -Subject: [PATCH] Load libEGL and libGLES2 symbols implicitly - -Instead of explicitly loading libraries from hard-coded locations, -we now just call dlopen(NULL, RTLD_LAZY). This returns a handle to -the host process'es context, which already contains the symbols of -both these libraries, because we link against them. -It was necessary to bypass LoadLibrary, because that expects a non-NULL -file path, so we couldn't pass NULL through that interface. - -Task-number: QTBUG-57761 -Change-Id: I29f037dfe542222b5188a33c7727c81a464a87bb -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> -Reviewed-by: Michal Klocek <michal.klocek@qt.io> -Upstream-Status: Merged -Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> ---- - src/core/surface_factory_qt.cpp | 40 ++++++++-------------------------------- - 1 file changed, 8 insertions(+), 32 deletions(-) - -diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp -index 36c05ec5..e8be8480 100644 ---- a/src/core/surface_factory_qt.cpp -+++ b/src/core/surface_factory_qt.cpp -@@ -51,51 +51,27 @@ - #if defined(USE_OZONE) - - #include <EGL/egl.h> -- --#ifndef QT_LIBDIR_EGL --#define QT_LIBDIR_EGL "/usr/lib" --#endif --#ifndef QT_LIBDIR_GLES2 --#define QT_LIBDIR_GLES2 QT_LIBDIR_EGL --#endif -+#include <dlfcn.h> - - namespace QtWebEngineCore { - --base::NativeLibrary LoadLibrary(const base::FilePath& filename) { -- base::NativeLibraryLoadError error; -- base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); -- if (!library) { -- LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString(); -- return NULL; -- } -- return library; --} -- - bool SurfaceFactoryQt::LoadEGLGLES2Bindings() - { -- base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); -- libEGLPath = libEGLPath.Append("libEGL.so.1"); -- base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); -- if (!eglLibrary) -- return false; -- -- base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2); -- libGLES2Path = libGLES2Path.Append("libGLESv2.so.2"); -- base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path); -- if (!gles2Library) -+ base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY); -+ if (!eglgles2Library) { -+ LOG(ERROR) << "Failed to open EGL/GLES2 context " << dlerror(); - return false; -+ } - -- gl::GLGetProcAddressProc get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglLibrary, "eglGetProcAddress")); -+ gl::GLGetProcAddressProc get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress")); - if (!get_proc_address) { - LOG(ERROR) << "eglGetProcAddress not found."; -- base::UnloadNativeLibrary(eglLibrary); -- base::UnloadNativeLibrary(gles2Library); -+ base::UnloadNativeLibrary(eglgles2Library); - return false; - } - - gl::SetGLGetProcAddressProc(get_proc_address); -- gl::AddGLNativeLibrary(eglLibrary); -- gl::AddGLNativeLibrary(gles2Library); -+ gl::AddGLNativeLibrary(eglgles2Library); - return true; - } - --- -2.13.2 - diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 35acf8da2c..9195c7f3b6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.2.tar.xz.mirrorlist -sha256 45ae1142fd87271c100f4d7889427738e774e86db5d8f6bcf9ceb99d18571d37 qtwebengine-opensource-src-5.9.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz.mirrorlist +sha256 04b4305489b326bbbfe32b5f1da4a33ae034e54130776e3616b9e6d45a5a8271 qtwebengine-opensource-src-5.9.4.tar.xz |
