frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-05 21:40:01 +01:00 committed by Peter Hutterer
parent 374ee7acd7
commit 8d2117abeb
2 changed files with 4 additions and 2 deletions
Show Stats 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 = [] xwayland_glamor = []
eglstream_srcs = [] eglstream_srcs = []
if build_glamor if build_xwayland_glamor
srcs += 'xwayland-glamor.c' srcs += 'xwayland-glamor.c'
if gbm_dep.found() if gbm_dep.found()
srcs += [ srcs += [

4
include/meson.build
View File

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