From owner-dev-commits-ports-main@freebsd.org Fri Sep 10 04:33:27 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6A5367E902; Fri, 10 Sep 2021 04:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H5NKg3v88z4byv; Fri, 10 Sep 2021 04:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 600E226267; Fri, 10 Sep 2021 04:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18A4XRIK064060; Fri, 10 Sep 2021 04:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18A4XRb2064059; Fri, 10 Sep 2021 04:33:27 GMT (envelope-from git) Date: Fri, 10 Sep 2021 04:33:27 GMT Message-Id: <202109100433.18A4XRb2064059@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4b052e44639b - main - emulators/qemu31: unbreak with libglvnd >= 1.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b052e44639b8c7f1fb6f48d239015a7429df46f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Sep 2021 04:33:27 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b052e44639b8c7f1fb6f48d239015a7429df46f commit 4b052e44639b8c7f1fb6f48d239015a7429df46f Author: Jan Beich AuthorDate: 2021-09-10 03:24:37 +0000 Commit: Jan Beich 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); + }