A *much* better fix would be to introduce a wayland PACKAGECONFIG,
that would set PIGLIT_USE_WAYLAND (per
https://gitlab.freedesktop.org/mesa/piglit/-/blob/main/CMakeLists.txt?ref_type=heads#L195)
and relocate all the wayland-scanner, protocols, libraries, etc
dependencies from unconditional DEPENDS to under that option.

Alex

On Thu, 29 Aug 2024 at 20:45, Dmitry Baryshkov via
lists.openembedded.org <[email protected]>
wrote:
>
> On Tue, 27 Aug 2024 at 12:37, Dmitry Baryshkov via
> lists.openembedded.org <[email protected]>
> wrote:
> >
> > After the recent piglit update it fails X11 builds reporting that it can
> > not find wayland-client package. Add missing dependency.
> >
> > Fixes: 9662bdabf3f6 ("piglit: upgrade 22eaf6a91c -> c11c9374c1")
> > Cc: Trevor Gamblin <[email protected]>
> > Signed-off-by: Dmitry Baryshkov <[email protected]>
>
> Gracious ping. See the build.log at
> https://tuxapi.tuxsuite.com/v1/groups/linaro/projects/dmitry.baryshkov/oebuilds/2lKYJUouynr7OoOtfUeOLDTDZYY
>
> Relevant part of the failure log:
>
> | -- Found OpenGL:
> /oe/build/tmp-rpb-glibc/work/armv8a-linaro-linux/piglit/1.0+gitr/recipe-sysroot/usr/lib/libGL.so
> | -- Checking for module 'waffle-1'
> | --   Found waffle-1, version 1.8.1
> | -- Checking for module 'gbm>=17.1'
> | --   Found gbm, version 24.0.7
> | -- Looking for gbm_bo_map
> | -- Looking for gbm_bo_map - found
> | -- Looking for gbm_bo_get_fd_for_plane
> | -- Looking for gbm_bo_get_fd_for_plane - found
> | -- Checking for module 'wayland-client'
> | --   No package 'wayland-client' found
> | -- Configuring incomplete, errors occurred!
> | WARNING: exit code 1 from a shell command.
> | CMake Error at
> /oe/build/tmp-rpb-glibc/work/armv8a-linaro-linux/piglit/1.0+gitr/recipe-sysroot-native/usr/share/cmake-3.30/Modules/FindPkgConfig.cmake:645
> (message):
> |   The following required packages were not found:
> |
> |    - wayland-client
> |
> | Call Stack (most recent call first):
> |   
> /oe/build/tmp-rpb-glibc/work/armv8a-linaro-linux/piglit/1.0+gitr/recipe-sysroot-native/usr/share/cmake-3.30/Modules/FindPkgConfig.cmake:873
> (_pkg_check_modules_internal)
> |   CMakeLists.txt:196 (pkg_check_modules)
> |
> |
> NOTE: recipe piglit-1.0+gitr-r0: task do_configure: Failed
>
>
> > ---
> >  meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/piglit/piglit_git.bb 
> > b/meta/recipes-graphics/piglit/piglit_git.bb
> > index 3a2dec34d7e0..7cdd38d823cc 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 wayland-native wayland 
> > wayland-protocols"
> >
> >  inherit cmake pkgconfig python3native features_check bash-completion
>
>
>
> --
> With best wishes
> Dmitry
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203944): 
https://lists.openembedded.org/g/openembedded-core/message/203944
Mute This Topic: https://lists.openembedded.org/mt/108120289/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to