From ef8c4d27d716ceccbe0588efc0da5a40a1f0f69a Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Thu, 23 Sep 2021 17:43:53 -0400 Subject: [PATCH] wayland: Require xkbcommon 0.5.0 or newer (2014-10-18) Fixes #4645 --- cmake/sdlchecks.cmake | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake index 3401769f4..5e70eaedc 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake @@ -597,7 +597,7 @@ endmacro() # - HAVE_SDL_LOADSO opt macro(CheckWayland) if(VIDEO_WAYLAND) - pkg_check_modules(WAYLAND wayland-client wayland-scanner wayland-egl wayland-cursor egl xkbcommon) + pkg_check_modules(WAYLAND wayland-client wayland-scanner wayland-egl wayland-cursor egl "xkbcommon>=0.5.0") pkg_check_modules(WAYLAND_SCANNER_1_15 "wayland-scanner>=1.15") if(WAYLAND_FOUND AND HAVE_VIDEO_OPENGL_EGL) diff --git a/configure.ac b/configure.ac index 5a00b1462..a5f659bcf 100644 --- a/configure.ac +++ b/configure.ac @@ -1530,7 +1530,7 @@ CheckWayland() video_wayland=no if test x$video_opengl_egl = xyes && \ test x$video_opengles_v2 = xyes; then - if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-egl wayland-cursor egl xkbcommon ; then + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-egl wayland-cursor egl 'xkbcommon >= 0.5.0'; then WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`