From 5dbea455199d8033bdd45ca27db839e3fbcc8a12 Mon Sep 17 00:00:00 2001 From: Bartłomiej Burdukiewicz Date: Wed, 29 Apr 2020 22:27:44 +0200 Subject: libva: add PACKAGECONFIG and additonal rules for glx. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * glx PACKAGECONFIG by default is selected when x11 and opengl flag is present in DISTRO_FEATURES. * virtual/mesa is only required when glx driver is selected to build. (From OE-Core rev: 65b7b48cd6c7ec88da4dc8bcc3e93fe2703a8fef) Signed-off-by: Bartłomiej Burdukiewicz Signed-off-by: Richard Purdie --- meta/recipes-graphics/libva/libva_2.6.1.bb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics/libva') diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb index 92cea83bc1..8c495bad70 100644 --- a/meta/recipes-graphics/libva/libva_2.6.1.bb +++ b/meta/recipes-graphics/libva/libva_2.6.1.bb @@ -23,15 +23,21 @@ SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e4862940 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" -DEPENDS = "libdrm virtual/mesa" +DEPENDS = "libdrm" inherit meson pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes" -PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no,wayland-native wayland" +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \ +" + +PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes" +PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa" + +PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland" PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" -- cgit v1.2.3-54-g00ecf