Date: Fri, 10 Sep 2021 04:33:27 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4b052e44639b - main - emulators/qemu31: unbreak with libglvnd >= 1.3.4 Message-ID: <202109100433.18A4XRb2064059@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b052e44639b8c7f1fb6f48d239015a7429df46f commit 4b052e44639b8c7f1fb6f48d239015a7429df46f Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-09-10 03:24:37 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-09-10 04:33:04 +0000 emulators/qemu31: unbreak with libglvnd >= 1.3.4 In file included from ui/egl-helpers.c:21: include/ui/egl-helpers.h:46:55: error: unknown type name 'Window' EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); ^ ui/egl-helpers.c:276:55: error: unknown type name 'Window' EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) ^ PR: 258269 Reported by: antoine (via exp-run) --- emulators/qemu31/files/patch-egl-no-x11 | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/emulators/qemu31/files/patch-egl-no-x11 b/emulators/qemu31/files/patch-egl-no-x11 new file mode 100644 index 000000000000..103a50006120 --- /dev/null +++ b/emulators/qemu31/files/patch-egl-no-x11 @@ -0,0 +1,53 @@ +Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971 +Fixed by https://gitlab.com/qemu-project/qemu/-/commit/fbd57c754f32 + +In file included from ui/egl-helpers.c:21: +include/ui/egl-helpers.h:46:55: error: unknown type name 'Window' +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); + ^ +ui/egl-helpers.c:276:55: error: unknown type name 'Window' +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) + ^ + +--- include/ui/egl-helpers.h.orig 2019-10-01 22:31:45 UTC ++++ include/ui/egl-helpers.h +@@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); + + #endif + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win); + + int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode); + int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode); +--- ui/egl-helpers.c.orig 2019-10-01 22:31:46 UTC ++++ ui/egl-helpers.c +@@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) + + /* ---------------------------------------------------------------------- */ + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win) + { + EGLSurface esurface; + EGLBoolean b; + + esurface = eglCreateWindowSurface(qemu_egl_display, + qemu_egl_config, +- (EGLNativeWindowType)win, NULL); ++ win, NULL); + if (esurface == EGL_NO_SURFACE) { + error_report("egl: eglCreateWindowSurface failed"); + return NULL; +--- ui/gtk-egl.c.orig 2019-10-01 22:31:46 UTC ++++ ui/gtk-egl.c +@@ -54,7 +54,8 @@ void gd_egl_init(VirtualConsole *vc) + } + + vc->gfx.ectx = qemu_egl_init_ctx(); +- vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window); ++ vc->gfx.esurface = qemu_egl_init_surface_x11 ++ (vc->gfx.ectx, (EGLNativeWindowType)x11_window); + + assert(vc->gfx.esurface); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109100433.18A4XRb2064059>