waffle: add wayland-protocols when building with wayland

Message ID 20220217141735.3776221-1-andrey.z@gmail.com
State Accepted, archived
Commit a545a0848c6526d58731bc333f2ade0ae926fcc4
Headers show
Series waffle: add wayland-protocols when building with wayland | expand

Commit Message

Andrey Zhizhikin Feb. 17, 2022, 2:17 p.m. UTC
When 'wayland is selected in ' DISTRO_FEATURES, following build error
occurs during do_configure:

| Run-time dependency wayland-protocols found: NO (tried pkgconfig)
|
| ../git/meson.build:120:2: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig

Add "wayland-protocols" to PACKAGECONFIG to resolve missing dependency.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
---
 meta/recipes-graphics/waffle/waffle_1.7.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Otavio Salvador Feb. 17, 2022, 6:08 p.m. UTC | #1
Em qui., 17 de fev. de 2022 às 11:17, Andrey Zhizhikin <andrey.z@gmail.com>
escreveu:

> When 'wayland is selected in ' DISTRO_FEATURES, following build error
> occurs during do_configure:
>
> | Run-time dependency wayland-protocols found: NO (tried pkgconfig)
> |
> | ../git/meson.build:120:2: ERROR: Dependency "wayland-protocols" not
> found, tried pkgconfig
>
> Add "wayland-protocols" to PACKAGECONFIG to resolve missing dependency.
>
> Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Patch

diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb
index ea11309940..0ff82036e7 100644
--- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb
@@ -33,7 +33,7 @@  PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx
 
 # I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
 # DISTRO_FEATURE.
-PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native wayland-protocols"
 
 # I say virtual/libgl, actually wants gbm.pc egl.pc
 PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev"