summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2026-01-06 17:11:40 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2026-01-07 10:11:21 +0100
commite139d743a778dbf66715d7bc6f82a827b2ada665 (patch)
tree1e4e0f659418cc8c03e18ea08f05b4be3e59a6cd
parent48dfc5f5f33ca45ebb313cf821c988885656ad12 (diff)
downloadmeta-freescale-e139d743a778dbf66715d7bc6f82a827b2ada665.tar.gz
weston: 14.0.2.imx: sync recipe with oe-core upstream recipe
This pulls in a patch which allows weston 14.0.2 to be built with libdisplay version 0.3.0. | Dependency libdisplay-info found: NO. Found 0.3.0 but need: '< 0.3.0' ; matched: '>= 0.1.1' Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch28
-rw-r--r--recipes-graphics/wayland/weston_14.0.2.imx.bb10
2 files changed, 33 insertions, 5 deletions
diff --git a/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch
new file mode 100644
index 000000000..07916f77b
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch
@@ -0,0 +1,28 @@
1From fe8166164170465458561581afd55c325d8e138b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 17 Dec 2025 12:54:20 +0100
4Subject: [PATCH] libweston/backend-drm/meson.build: allow libdisplay-info
5 0.3.0
6
7The patch in the main branch is against top level meson.build,
8so I manually edited in the same tweak in the 14.x codebase.
9
10Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1815]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 libweston/backend-drm/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build
17index 002669e..a8f2ea5 100644
18--- a/libweston/backend-drm/meson.build
19+++ b/libweston/backend-drm/meson.build
20@@ -4,7 +4,7 @@ endif
21
22 dep_libdisplay_info = dependency(
23 'libdisplay-info',
24- version: ['>= 0.1.1', '< 0.3.0'],
25+ version: ['>= 0.1.1', '< 0.4.0'],
26 fallback: ['display-info', 'di_dep'],
27 default_options: [
28 'werror=false',
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index c4f938e5a..299796f3b 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -3,7 +3,7 @@
3# recipe. The second section customizes the recipe for i.MX. 3# recipe. The second section customizes the recipe for i.MX.
4 4
5########### OE-core copy ################## 5########### OE-core copy ##################
6# Upstream hash: 8996690a79ac42a1dee6d041eeb1c1fe29fdac84 6# Upstream hash: fc108ddb18c4986c2d24a5e730c3a7fe9c79a4d7
7 7
8SUMMARY = "Weston, a Wayland compositor" 8SUMMARY = "Weston, a Wayland compositor"
9DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" 9DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
@@ -18,9 +18,10 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo
18 file://weston.desktop \ 18 file://weston.desktop \
19 file://xwayland.weston-start \ 19 file://xwayland.weston-start \
20 file://systemd-notify.weston-start \ 20 file://systemd-notify.weston-start \
21 file://0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch \
21 " 22 "
22 23
23SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3" 24SRC_URI[sha256sum] = "b47216b3530da76d02a3a1acbf1846a9cd41d24caa86448f9c46f78f20b6e0ac"
24 25
25UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" 26UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
26UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" 27UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -97,10 +98,9 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false"
97# JPEG image loading support 98# JPEG image loading support
98PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" 99PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
99# screencasting via PipeWire 100# screencasting via PipeWire
100PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" 101PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire,pipewire"
101# VNC remote screensharing 102# VNC remote screensharing
102PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" 103PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam"
103
104 104
105do_install:append() { 105do_install:append() {
106 # Weston doesn't need the .la files to load modules, so wipe them 106 # Weston doesn't need the .la files to load modules, so wipe them