From 84b0d834a4a0b0fab4bf80d85533db7b5975a09e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 2 Sep 2023 18:29:02 +0200 Subject: [PATCH] package/mesa3d-demos: add dependency on libxkbcommon for wayland support Since the bump of mesa3d-demos to version 9.0.0 in Buildroot commit 80304d9911f34f8a0173a4f37d52f93177478cc7, libxkbcommon is needed for the wayland support. Without libxkbcommon, the build fails with: Run-time dependency wayland-client, wayland-egl, xkbcommon found: NO (tried pkgconfig and cmake) ../output-1/build/mesa3d-demos-9.0.0/meson.build:62:14: ERROR: Dependency "wayland-client, wayland-egl, xkbcommon" not found, tried pkgconfig and cmake Fixes: http://autobuild.buildroot.net/results/1c01da4966b054de9c15f0eb3d738806c7d5d315/ Signed-off-by: Bernd Kuhls [Thomas: patch extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20230716145003.339645-2-bernd@kuhls.net/] Signed-off-by: Thomas Petazzoni --- package/mesa3d-demos/Config.in | 1 + package/mesa3d-demos/mesa3d-demos.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index 7848bb6faf..1761494c3a 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_MESA3D_DEMOS select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND help OpenGL demos from the Mesa 3D project. diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 29cb00bb8a..a9c9283660 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -63,7 +63,7 @@ MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEMOS_DEPENDENCIES += wayland +MESA3D_DEMOS_DEPENDENCIES += libxkbcommon wayland MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled