From 5f380586305a74b8e2f5cecb57ae252e38b84bdc Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 30 Aug 2024 05:40:10 +0300 Subject: piglit: add missing dependency on wayland After the recent piglit update it fails X11 builds reporting that it can not find wayland-client package. Commit 9662bdabf3f6 ("piglit: upgrade 22eaf6a91c -> c11c9374c1") has added wayland-related dependencies to the recipe's DEPENDS variable, but it seems it missed the target wayland pacakge, making cross-compilation of piglit fail when building X11-targeted configurations. Pushing more and more wayland dependencies to a generic build doesn't seem to be a good idea, so introduce "wayland" PACKAGECONFIG option, move existing wayland-related dependencies to be guarded by it and add dependency on the wayland package. Suggested-by: Alexander Kanavin Fixes: 9662bdabf3f6 ("piglit: upgrade 22eaf6a91c -> c11c9374c1") Cc: Trevor Gamblin (From OE-Core rev: 6c504d03c8bd8e2a9c8d0b946dbf28e94d13b5d6) Signed-off-by: Dmitry Baryshkov Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 3a2dec34d7..fbf20de176 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}" X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}" -DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl wayland-native wayland-protocols" +DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl" inherit cmake pkgconfig python3native features_check bash-completion @@ -36,12 +36,16 @@ REQUIRED_DISTRO_FEATURES += "opengl" export TEMP = "${B}/temp/" do_compile[dirs] =+ "${B}/temp/" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ +" PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" PACKAGECONFIG[x11] = "-DPIGLIT_USE_X11=1 -DPIGLIT_BUILD_GL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON,-DPIGLIT_USE_X11=0 -DPIGLIT_BUILD_GL_TESTS=OFF -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang" +PACKAGECONFIG[wayland] = "-DPIGLIT_USE_WAYLAND=1,-DPIGLIT_USE_WAYLAND=0,wayland-native wayland wayland-protocols" export PIGLIT_BUILD_DIR = "../../../../git" -- cgit v1.2.3-54-g00ecf