From: Frieder Schrempf <[email protected]> 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 <[email protected]> --- 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 <[email protected]> +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 <[email protected]> +--- + 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" -- 2.55.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#247427): https://lists.openembedded.org/g/openembedded-core/message/247427 Mute This Topic: https://lists.openembedded.org/mt/121652661/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
