From 626d26d5bab3b0bf57548c4c2fc94902cb5cfab9 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 4 Dec 2024 23:10:40 +0200 Subject: weston-ini-config: Move remoting conf to PipeWire The output configuration for PipeWire is much simpler, no needing any HOST, PORT or MODE. MODE seems to be acually unused so we're going to remove that as well. Bug-AGL: SPEC-5235 Change-Id: Ic171fff824101efdb5530ad790dac4137d39ff80 Signed-off-by: Marius Vlad Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30614 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in | 8 +++----- recipes-graphics/wayland/weston-ini-conf_agldemo.inc | 10 +--------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in b/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in index 940cbdd0c..3d30af64b 100644 --- a/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in +++ b/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in @@ -1,5 +1,3 @@ -[remote-output] -name=remote-1 -mode=640x720@30 -host=192.168.10.3 -port=5005 +[output] +name=pipewire +mode=420x472 diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index dc5233817..62aa9048b 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -4,17 +4,9 @@ SRC_URI += "file://remote-output.cfg.in" WESTON_FRAGMENTS_BASE += "grpc-proxy" -# Options for the user to change in local.conf -# e.g. REMOTING_OUTPUT_MODE = "1080x1488" -REMOTING_OUTPUT_MODE ??= "640x720@30" -REMOTING_OUTPUT_HOST ??= "192.168.10.3" -REMOTING_OUTPUT_PORT ??= "5005" - do_configure:append() { # Standalone cluster support version - sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \ - -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \ - ${WORKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg + cp ${WORKDIR}/remote-output.cfg.in ${WORKDIR}/remote-output.cfg } do_compile:append() { -- cgit 1.2.3-korg