From patchwork Thu Oct 8 10:30:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 100189 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 06C55CA600B for ; Thu, 8 Oct 2026 10:30:57 +0000 (UTC) Received: from mail.fris.de (mail.fris.de [116.203.77.234]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12777.1791455453415916091 for ; Thu, 08 Oct 2026 03:30:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@fris.de header.s=mail header.b=AkFpxI/r; spf=pass (domain: fris.de, ip: 116.203.77.234, mailfrom: frieder@fris.de) From: Frieder Schrempf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=mail; t=1791455450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=AxGTqlFi8UNhabvSnfrxXaXpuTpfE1hRNzQuMZMWQr8=; b=AkFpxI/rjfklAQLM8dpJvqTYLWLmTuYDrJdiEojibIbmE0YoQ0R7MxpTClCgv9c+d4bD9b xEvScOrsSrQDZ4mf+Uu2idckUpOrW2vNcF6A5UjvrwdphUGeRReUPDgFGDQQvgbzynBA3l 3/RSXGjYBLtaqO+gTQm9kQUmzFBsoPNlbrMCSRAv+RUA28uV2W4jj7Dz++olpm5ctr4iS4 ssIlGmDtaEqcWgOIG10Ci26ja0CHrAChOgH6pHv836Hc6pWrTCWpR+9IOpE9I3qVSpGT/R sKfrzTcI2tOTzedeEXtFSj6sFj5tfD/6zye7uRZyedxIiEzQMcqYgRZcrJblDw== To: openembedded-core@lists.openembedded.org Cc: Frieder Schrempf Subject: [wrynose][PATCH v2] weston: fix VNC backend build with aml 1.0 Date: Thu, 8 Oct 2026 12:30:47 +0200 Message-ID: <20261008103047.2786980-1-frieder@fris.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 08 Oct 2026 10:30:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/247427 From: Frieder Schrempf meta-oe's aml 1.0 installs aml1.pc, but weston 15 looks for aml 0.3.x, so enabling the vnc PACKAGECONFIG fails at configure time. Backport the aml part of the upstream fix from weston 16 and add aml to the vnc dependencies, as weston uses it directly. Tested by building weston with PACKAGECONFIG vnc for ARMv7. AI-Generated: Uses Claude Code (Claude Opus 5.5) Signed-off-by: Frieder Schrempf --- Changes for v2: * Add missing Signed-off-by in patch file --- .../weston/0001-backend-vnc-Use-aml-v1.patch | 24 +++++++++++++++++++ .../recipes-graphics/wayland/weston_15.0.0.bb | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/weston/0001-backend-vnc-Use-aml-v1.patch diff --git a/meta/recipes-graphics/wayland/weston/0001-backend-vnc-Use-aml-v1.patch b/meta/recipes-graphics/wayland/weston/0001-backend-vnc-Use-aml-v1.patch new file mode 100644 index 0000000000..c752a2b362 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-backend-vnc-Use-aml-v1.patch @@ -0,0 +1,24 @@ +From: Frieder Schrempf +Subject: [PATCH] backend-vnc: Use aml v1 + +aml 1.0 installs aml1.pc and neatvnc already uses it. Only the aml part +of the upstream commit is taken, as the rest needs Neat VNC 1.0. + +Upstream-Status: Backport [partial, https://gitlab.freedesktop.org/wayland/weston/-/commit/8a1c91e7] +Signed-off-by: Frieder Schrempf +--- + libweston/backend-vnc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build +--- a/libweston/backend-vnc/meson.build ++++ b/libweston/backend-vnc/meson.build +@@ -8,7 +8,7 @@ if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif + +-dep_aml = dependency('aml', version: ['>= 0.3.0', '< 0.4.0'], required: false, fallback: ['aml', 'aml_dep']) ++dep_aml = dependency('aml1', version: ['>= 1.0.0', '< 2.0.0'], required: false, fallback: ['aml', 'aml_dep']) + if not dep_aml.found() + error('VNC backend requires libaml which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif diff --git a/meta/recipes-graphics/wayland/weston_15.0.0.bb b/meta/recipes-graphics/wayland/weston_15.0.0.bb index da347659f1..3f9fff51fd 100644 --- a/meta/recipes-graphics/wayland/weston_15.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_15.0.0.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://0001-vulkan-renderer-guard-surface-output-creation-with-b.patch \ file://0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch \ + file://0001-backend-vnc-Use-aml-v1.patch \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ @@ -98,7 +99,7 @@ PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" # screencasting via PipeWire PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire,pipewire" # VNC remote screensharing -PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam" +PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc aml libpam" # Perfetto performance analysis support PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto"