Commit 5cc3817e authored by Simon Zeni's avatar Simon Zeni
Browse files

meson: fix wayland build after rebase

parent 39a7138a
Pipeline #262812 passed with stages
in 1 minute and 27 seconds
......@@ -107,7 +107,13 @@ else
dep_wayland_egl = dependency(
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found()
dep_wayland_protocols = dependency(
'wayland-protocols', version : '>=1.17', required : get_option('wayland')
)
dep_wayland_scanner = dependency('wayland-scanner', required: false, native: true)
build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() \
and dep_wayland_protocols.found() and dep_wayland_scanner.found()
# We're interested only in the headers provided
# FINISHME: make x11_xcb and udev compile-only dependency
......@@ -117,24 +123,6 @@ else
d = d.partial_dependency(compile_args : true)
endif
endforeach
dep_wayland_protocols = dependency(
'wayland-protocols', version : '>=1.17', required : get_option('wayland')
)
dep_wayland_scanner = dependency('wayland-scanner', required: false, native: true)
dep_x11_xcb = dependency('x11-xcb', required : get_option('glx'))
if not dep_x11_xcb.found()
dep_x11_xcb = dependency('x11-xcb', required : get_option('x11_egl'))
endif
dep_gbm = dependency('gbm', required : get_option('gbm'))
dep_udev = dependency('libudev', required : get_option('gbm'))
build_x11_egl = dep_egl.found()
build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() \
and dep_wayland_protocols.found() and dep_wayland_scanner.found()
build_glx = dep_gl.found()
build_gbm = dep_gbm.found() and dep_udev.found()
build_surfaceless = dep_egl.found()
endif
dep_bash = dependency('bash-completion', required : false)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment