From 068828e46e5dea64b7362f286923456bafb3d741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kelemen=20=28vudiq=29?= Date: Sat, 1 Feb 2025 12:13:38 +0100 Subject: [PATCH] wayland: copy wayland.xml to SYSROOT vulkan-tools requires wayland.xml when building wayland target with vulkan support. when wayland.xml is missing, build of vulkan-tools fails with following error: CMake Error in cube/CMakeLists.txt: Cannot find source file: [...]/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/share/wayland/wayland.xml Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .ccm .cxxm .c++m .h .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc also wayland-protocols is needed by the vulkan-tools package as per testing by @heitbaum. --- packages/graphics/vulkan/vulkan-tools/package.mk | 2 +- packages/wayland/wayland/package.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk index a562277624..5684ff81f8 100644 --- a/packages/graphics/vulkan/vulkan-tools/package.mk +++ b/packages/graphics/vulkan/vulkan-tools/package.mk @@ -16,7 +16,7 @@ configure_package() { if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" libxcb libX11" elif [ "${DISPLAYSERVER}" = "wl" ]; then - PKG_DEPENDS_TARGET+=" wayland" + PKG_DEPENDS_TARGET+=" wayland wayland-protocols" fi } diff --git a/packages/wayland/wayland/package.mk b/packages/wayland/wayland/package.mk index 62e34900bb..c0e71d0fd9 100644 --- a/packages/wayland/wayland/package.mk +++ b/packages/wayland/wayland/package.mk @@ -30,4 +30,6 @@ pre_configure_target() { post_makeinstall_host() { cp ${TOOLCHAIN}/lib/pkgconfig/wayland-scanner.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig/ + mkdir -p ${SYSROOT_PREFIX}/usr/share/wayland + cp ${TOOLCHAIN}/share/wayland/wayland.xml ${SYSROOT_PREFIX}/usr/share/wayland/ }