XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

hw: xwayland: fix build if neither gbm nor eglstream available

Browse Source 
glamor needs to be disabled if neither gbm nor eglstream is available,
otherwise build breaks.

Closes: xorg/xserver#1631
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
(cherry picked from commit 8d2117abeb)
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-02-05 21:40:01 +01:00
committed by Alan Coopersmith
parent c66313b5aa
commit de9ce0e8f9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwayland/meson.build
View File

@@ -103,7 +103,7 @@ endif
xwayland_glamor = []
eglstream_srcs = []
if build_glamor
if build_xwayland_glamor
srcs += 'xwayland-glamor.c'
if gbm_dep.found()
srcs += [

4
include/meson.build
View File

@@ -414,8 +414,10 @@ configure_file(output : 'xwin-config.h',
input : 'xwin-config.h.meson.in',
configuration : xwin_data)
build_xwayland_glamor = build_glamor and (gbm_dep.found() or build_eglstream)
xwayland_data = configuration_data()
xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_eglstream) ? '1' : false)
xwayland_data.set('XWL_HAS_GLAMOR', build_xwayland_glamor ? '1' : false)
xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false)
xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false)
xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false)