[Buildroot] [git commit branch/2022.05.x] package/x11r7/xserver_xorg-server: fix xephyr build with kdrive
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2022-08-16 09:39:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=ac74ab30c16c5101fdfdfeaf7bb85564392c937b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.05.x Fix the following xephyr build failure with kdrive raised since commit eedbd6f97d51a0049ec512de26541465403ab06f: checking for XEPHYR... no configure: error: Package requirements (xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met: Package 'xcb-renderutil', required by 'virtual:world', not found Package 'xcb-aux', required by 'virtual:world', not found Package 'xcb-image', required by 'virtual:world', not found Package 'xcb-icccm', required by 'virtual:world', not found Package 'xcb-keysyms', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <redacted> (cherry picked from commit 90a6572e102d72ce01eaae6ab12065148f6a1a36) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/x11r7/xserver_xorg-server/Config.in | 4 ++++ package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++++ 2 files changed, 11 insertions(+)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 4fb03051dd..daf4d81702 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in@@ -85,6 +85,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR bool "Xephyr server" + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE help Xephyr nested X server; successor to Xnest.
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0f1779dcab..fa5d2a802d 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk@@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-glx \ --disable-dri +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y) +XSERVER_XORG_SERVER_DEPENDENCIES += \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xcb-util-wm +endif else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot