diff -ruN qemu-9999.orig/meson.build qemu-9999/meson.build --- qemu-9999.orig/meson.build 2023-03-12 01:17:38.273756012 +0100 +++ qemu-9999/meson.build 2023-03-12 01:18:44.854716789 +0100 @@ -667,6 +667,8 @@ if get_option('xkbcommon').auto() and not have_system and not have_tools xkbcommon = not_found +elif get_option('xkbcommon').disabled() + xkbcommon = not_found else xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'), method: 'pkg-config', kwargs: static_kwargs) diff -ruN qemu-9999.orig/pc-bios/keymaps/meson.build qemu-9999/pc-bios/keymaps/meson.build --- qemu-9999.orig/pc-bios/keymaps/meson.build 2023-03-12 01:17:38.321756706 +0100 +++ qemu-9999/pc-bios/keymaps/meson.build 2023-03-12 01:20:22.015111600 +0100 @@ -33,8 +33,10 @@ 'tr': '-l tr', } -if meson.is_cross_build() or not xkbcommon.found() +if meson.is_cross_build() native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true) +elif get_option('xkbcommon').disabled() + native_qemu_keymap = not_found else native_qemu_keymap = qemu_keymap endif