From patchwork Fri Dec 10 05:38:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 32 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E636C433EF for ; Fri, 10 Dec 2021 05:40:03 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web08.3559.1639114801972658973 for ; Thu, 09 Dec 2021 21:40:02 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd78.dcpf.telekom.de (fwd78.aul.t-online.de [10.223.144.104]) by mailout01.t-online.de (Postfix) with SMTP id 9AB7121CF for ; Fri, 10 Dec 2021 06:38:46 +0100 (CET) Received: from localhost.localdomain ([84.163.46.27]) by fwd78.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1mvYcD-0RyrYX0; Fri, 10 Dec 2021 06:38:41 +0100 From: MarkusVolk To: yocto@lists.yoctoproject.org Cc: MarkusVolk Subject: [OE-core] [PATCH] libva: move wayland PACKAGECONFIG to libva.inc Date: Fri, 10 Dec 2021 06:38:16 +0100 Message-Id: <20211210053816.1298142-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1639114721-0000146A-586646E3/0/0 CLEAN NORMAL X-TOI-MSGID: 5a6a56d0-b834-45c3-8b4f-cde16c2bd153 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Dec 2021 05:40:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/55544 I encountered an error while trying to build libva under wayland. libva-initial 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/cortexa72-cortexa53-crypto-poky-linux/libva-initial/2.13.0-r0/build/meson-logs/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 available to libva-initial also Signed-off-by: MarkusVolk --- 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-graphics/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 = "https://github.com/intel/libva/releases" DEPENDS = "libdrm" inherit meson pkgconfig + +PACKAGECONFIG:append = " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" + +PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland" + diff --git a/meta/recipes-graphics/libva/libva_2.13.0.bb b/meta/recipes-graphics/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 PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', 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" RDEPENDS:${PN}-x11 =+ "${PN}"