diff options
| -rw-r--r-- | backend/meson.build | 9 | ||||
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | render/meson.build | 2 | ||||
| -rw-r--r-- | types/meson.build | 2 | ||||
| -rw-r--r-- | xwayland/meson.build | 1 |
5 files changed, 10 insertions, 6 deletions
diff --git a/backend/meson.build b/backend/meson.build index bac43063..c0ed76f1 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -28,14 +28,15 @@ backend_files = files( ) backend_deps = [ - wayland_server, + drm, egl, gbm, libinput, - wlr_render, - wlr_protos, - drm, pixman, + xkbcommon, + wayland_server, + wlr_protos, + wlr_render, ] if host_machine.system().startswith('freebsd') diff --git a/render/egl.c b/render/egl.c index f1208a72..21c446f1 100644 --- a/render/egl.c +++ b/render/egl.c @@ -132,7 +132,9 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display, wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor); wlr_log(L_INFO, "Supported EGL extensions: %s", egl->egl_exts_str); + wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR)); wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION)); + wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR)); wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", egl->gl_exts_str); if (strstr(egl->egl_exts_str, "EGL_WL_bind_wayland_display") == NULL || diff --git a/render/meson.build b/render/meson.build index 1a5a85b8..8aa70cea 100644 --- a/render/meson.build +++ b/render/meson.build @@ -22,7 +22,7 @@ lib_wlr_render = static_library( glapi[0], glapi[1], include_directories: wlr_inc, - dependencies: [glesv2, egl, pixman], + dependencies: [egl, glesv2, pixman, wayland_server], ) wlr_render = declare_dependency( diff --git a/types/meson.build b/types/meson.build index 2731f9bc..329009bf 100644 --- a/types/meson.build +++ b/types/meson.build @@ -28,5 +28,5 @@ lib_wlr_types = static_library( 'wlr_xdg_shell_v6.c', ), include_directories: wlr_inc, - dependencies: [wayland_server, pixman, wlr_protos], + dependencies: [pixman, xkbcommon, wayland_server, wlr_protos], ) diff --git a/xwayland/meson.build b/xwayland/meson.build index de05cfaa..2ccdf4cb 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -15,6 +15,7 @@ lib_wlr_xwayland = static_library( xcb_image, xcb_render, xcb_icccm, + xkbcommon, pixman, ], ) |