Commit 29af2bf5 authored by Dmitry Shachnev's avatar Dmitry Shachnev 🐧

Backport upstream patch to fix loading OpenGL library in GLX plugin.

Closes: #886400.
parent c7f53e6a
......@@ -3,6 +3,10 @@ qtbase-opensource-src (5.10.1+dfsg-6) UNRELEASED; urgency=medium
[ Simon Quigley ]
* Add my name to Uploaders.
[ Dmitry Shachnev ]
* Backport upstream patch to fix loading OpenGL library in the GLX
integration plugin (closes: #886400).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 08 Apr 2018 11:21:11 -0500
qtbase-opensource-src (5.10.1+dfsg-5) unstable; urgency=medium
......
Description: glx: fix loading OpenGL library when libGL.so symlink is missing
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a35c6a49c938fefb
Last-Update: 2018-05-02
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -585,6 +585,8 @@ QFunctionPointer QGLXContext::getProcAdd
extern const QString qt_gl_library_name();
// QLibrary lib(qt_gl_library_name());
QLibrary lib(QLatin1String("GL"));
+ if (!lib.load())
+ lib.setFileNameAndVersion(QLatin1String("GL"), 1);
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
#endif
}
......@@ -3,6 +3,7 @@ dead_key_symbols.diff
extend_mariadb_define_check.diff
resources_for_examples.diff
mesa_18.diff
fix_loading_opengl.diff
# Debian specific.
gnukfreebsd.diff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment