[OE-core] [PATCH] libva: move wayland PACKAGECONFIG to libva.inc
Markus Volk
I encountered an error while trying to build libva under wayland. libva-i=
nitial was missing wayland-native dependency and failed like this: | Run-time dependency xfixes found: NO (tried pkgconfig and cmake) | Run-time dependency wayland-client found: YES 1.19.0 | Program wayland-scanner /usr/bin/wayland-scanner found: NO | | ../libva-2.13.0/meson.build:107:4: ERROR: Program 'wayland-scanner /usr= /bin/wayland-scanner' not found | | A full log can be found at /home/flk/build/poky/build-rock/tmp/work/cor= texa72-cortexa53-crypto-poky-linux/libva-initial/2.13.0-r0/build/meson-lo= gs/meson-log.txt | ERROR: meson failed | WARNING: exit code 1 from a shell command. This commit moves the PACKAGECONFIG[wayland] to libva.inc to make it avai= lable to libva-initial also Signed-off-by: MarkusVolk <f_l_k@...> --- meta/recipes-graphics/libva/libva.inc | 7 +++++++ meta/recipes-graphics/libva/libva_2.13.0.bb | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libva/libva.inc b/meta/recipes-graphic= s/libva/libva.inc index bcf9757c1a..0e2721e291 100644 --- a/meta/recipes-graphics/libva/libva.inc +++ b/meta/recipes-graphics/libva/libva.inc @@ -27,3 +27,10 @@ UPSTREAM_CHECK_URI =3D "https://github.com/intel/libva= /releases" DEPENDS =3D "libdrm" =20 inherit meson pkgconfig + +PACKAGECONFIG:append =3D " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" + +PACKAGECONFIG[wayland] =3D "-Dwith_wayland=3Dyes,-Dwith_wayland=3Dno,way= land-native wayland" + diff --git a/meta/recipes-graphics/libva/libva_2.13.0.bb b/meta/recipes-g= raphics/libva/libva_2.13.0.bb index ed2be289fc..a8c6355b01 100644 --- a/meta/recipes-graphics/libva/libva_2.13.0.bb +++ b/meta/recipes-graphics/libva/libva_2.13.0.bb @@ -2,14 +2,12 @@ require libva.inc =20 PACKAGECONFIG ??=3D " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)}= \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ " =20 PACKAGECONFIG[x11] =3D "-Dwith_x11=3Dyes,-Dwith_x11=3Dno,virtual/libx11 = libxext libxfixes" PACKAGECONFIG[glx] =3D "-Dwith_glx=3Dyes,-Dwith_glx=3Dno,virtual/mesa" =20 -PACKAGECONFIG[wayland] =3D "-Dwith_wayland=3Dyes,-Dwith_wayland=3Dno,way= land-native wayland" - PACKAGES =3D+ "${PN}-x11 ${PN}-glx ${PN}-wayland" =20 RDEPENDS:${PN}-x11 =3D+ "${PN}" --=20 2.25.1 |
|