1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00

x11-toolkits/qt5-gui: unbreak with libglvnd >= 1.3.4

executing config test egl-x11
[...]
> main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_XDisplay *') with an rvalue of type 'EGLNativeDisplayType' (aka 'void *')
>     Display *dpy = EGL_DEFAULT_DISPLAY;
>              ^     ~~~~~~~~~~~~~~~~~~~
[...]
QPA backends:
  XCB:
    GL integrations:
      EGL-X11 Plugin ..................... no
[...]
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
Error: Missing: %%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
===> Error: Plist issues found.
*** Error code 1

PR:		258269
See also:	https://bugs.gentoo.org/810343
This commit is contained in:
Jan Beich 2021-09-05 18:12:10 +00:00
parent 21b89b4523
commit faa54c8325

View File

@ -0,0 +1,16 @@
Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971
main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_XDisplay *') with an rvalue of type 'EGLNativeDisplayType' (aka 'void *')
Display *dpy = EGL_DEFAULT_DISPLAY;
^ ~~~~~~~~~~~~~~~~~~~
--- src/gui/configure.json.orig 2020-10-27 08:02:11 UTC
+++ src/gui/configure.json
@@ -845,6 +845,7 @@
"// window and pixmap types will be different than what an X-based platform",
"// plugin would expect."
],
+ "head": [ "#define USE_X11" ],
"include": [ "EGL/egl.h", "X11/Xlib.h" ],
"main": [
"Display *dpy = EGL_DEFAULT_DISPLAY;",