openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-18 07:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build with upcomming Mesa update

Browse Source 
From upstram:
https://invent.kde.org/qt/qt/qtbase/-/commit/7a44796c813ab9661a68d42a67c18759d0a3f9ed

Cater for upstream changes in eglplatform.h

EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
code out there, including Qt:
https://github.com/KhronosGroup/EGL-Registry/pull/130

Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
This commit is contained in:
rsadowski
2023-01-16 07:26:13 +00:00
parent 1fa29cfc24
commit cc264f1cdc
3 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/qt5/qtbase/Makefile
+2
View File
@@ -12,6 +12,8 @@ PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
REVISION-main = 0
PKG_ARCH-global = *
PKG_ARCH-examples = *
x11/qt5/qtbase/patches/patch-src_gui_configure_json
+27
View File
@@ -0,0 +1,27 @@
EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
code out there, including Qt:
https://github.com/KhronosGroup/EGL-Registry/pull/130
Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
Fixes: QTBUG-96392
Pick-to: 6.2
Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
Reviewed-by: default avatarAndy Nichols <andy.nichols@qt.io>
(cherry picked from commit 4cc54285)
https://invent.kde.org/qt/qt/qtbase/-/commit/7a44796c813ab9661a68d42a67c18759d0a3f9ed
Index: src/gui/configure.json
--- src/gui/configure.json.orig
+++ src/gui/configure.json
@@ -834,7 +834,8 @@
"// embedded devices, are not intended to be used together with X. EGL support",
"// has to be disabled in plugins like xcb in this case since the native display,",
"// window and pixmap types will be different than what an X-based platform",
- "// plugin would expect."
+ "// plugin would expect.",
+ "#define USE_X11"
],
"include": [ "EGL/egl.h", "X11/Xlib.h" ],
"main": [
x11/qt5/qtbase/patches/patch-src_platformsupport_eglconvenience_qt_egl_p_h
+30
View File
@@ -0,0 +1,30 @@
EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
code out there, including Qt:
https://github.com/KhronosGroup/EGL-Registry/pull/130
Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
Fixes: QTBUG-96392
Pick-to: 6.2
Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
Reviewed-by: default avatarAndy Nichols <andy.nichols@qt.io>
(cherry picked from commit 4cc54285)
https://invent.kde.org/qt/qt/qtbase/-/commit/7a44796c813ab9661a68d42a67c18759d0a3f9ed
Index: src/platformsupport/eglconvenience/qt_egl_p.h
--- src/platformsupport/eglconvenience/qt_egl_p.h.orig
+++ src/platformsupport/eglconvenience/qt_egl_p.h
@@ -61,7 +61,11 @@
# if !defined(Q_OS_INTEGRITY)
# define WIN_INTERFACE_CUSTOM // NV
# endif // Q_OS_INTEGRITY
-#endif // QT_EGL_NO_X11
+#else // QT_EGL_NO_X11
+// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130
+// that needs USE_X11 to be defined.
+# define USE_X11
+#endif
#ifdef QT_EGL_WAYLAND
# define WAYLAND // NV