From eaa2ed1fffcc14bba27dc83ad13a838f009628d4 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 4 Dec 2024 17:53:50 +0200 Subject: weston_aglcore.inc: Always build the PipeWire backend We need the PipeWire backend in agl-kvm-demo but it might be useful in other builds as well, so let's build it by default. Other users can just include the package when they require it. Furthermore, with this change we remove weston-remoting and with it we no longer build remoting plug-in when agl-weston-remoting feature is supplied. Bug-AGL: SPEC-5235 Change-Id: I140c46aa33ce832100f4e696aa3bcfef6d43522a Signed-off-by: Marius Vlad Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30611 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-agl-core') diff --git a/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc index 0b5dae715..e2e18c18f 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc +++ b/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc @@ -1,13 +1,13 @@ FILESEXTRAPATHS:append := ":${THISDIR}/weston" -PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}" - SRC_URI:append = " \ file://0001-clients-Handle-missing-pointer_surface-is-there-s-no.patch \ file://0001-backend-drm-don-t-leak-gem_handle_refcnt-in-drm_dest.patch \ file://0002-backend-drm-always-create-gem_handle_refcnt-hash-tab.patch \ " +PACKAGECONFIG:append = " pipewire " +WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" # Split weston-terminal out of the main package to allow installing it # separately for use with other compositors. The icons, etc. that end @@ -16,8 +16,9 @@ SRC_URI:append = " \ # packaged in weston-examples in addition to ivi-shell in the main # package. -PACKAGE_BEFORE_PN += "${PN}-data ${PN}-terminal" +PACKAGE_BEFORE_PN += "${PN}-data ${PN}-terminal ${PN}-pipewire" +FILES:${PN}-pipewire = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/pipewire-backend.so" FILES:${PN}-data = "${datadir}/weston" FILES:${PN}-terminal = "${bindir}/weston-terminal" -- cgit 1.2.3-korg