From: Alexander Kanavin <[email protected]> Add a weston patch to make it compatible with this version.
Signed-off-by: Alexander Kanavin <[email protected]> --- ...d-drm-meson.build-allow-libdisplay-i.patch | 28 +++++++++++++++++++ .../recipes-graphics/wayland/weston_14.0.2.bb | 1 + ...info_0.2.0.bb => libdisplay-info_0.3.0.bb} | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch rename meta/recipes-support/libdisplay-info/{libdisplay-info_0.2.0.bb => libdisplay-info_0.3.0.bb} (92%) diff --git a/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch b/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch new file mode 100644 index 0000000000..07916f77b3 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch @@ -0,0 +1,28 @@ +From fe8166164170465458561581afd55c325d8e138b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 17 Dec 2025 12:54:20 +0100 +Subject: [PATCH] libweston/backend-drm/meson.build: allow libdisplay-info + 0.3.0 + +The patch in the main branch is against top level meson.build, +so I manually edited in the same tweak in the 14.x codebase. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1815] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + libweston/backend-drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 002669e..a8f2ea5 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -4,7 +4,7 @@ endif + + dep_libdisplay_info = dependency( + 'libdisplay-info', +- version: ['>= 0.1.1', '< 0.3.0'], ++ version: ['>= 0.1.1', '< 0.4.0'], + fallback: ['display-info', 'di_dep'], + default_options: [ + 'werror=false', diff --git a/meta/recipes-graphics/wayland/weston_14.0.2.bb b/meta/recipes-graphics/wayland/weston_14.0.2.bb index 73c9ce38bf..c53b03def0 100644 --- a/meta/recipes-graphics/wayland/weston_14.0.2.bb +++ b/meta/recipes-graphics/wayland/weston_14.0.2.bb @@ -11,6 +11,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://weston.desktop \ file://xwayland.weston-start \ file://systemd-notify.weston-start \ + file://0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch \ " SRC_URI[sha256sum] = "b47216b3530da76d02a3a1acbf1846a9cd41d24caa86448f9c46f78f20b6e0ac" diff --git a/meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb b/meta/recipes-support/libdisplay-info/libdisplay-info_0.3.0.bb similarity index 92% rename from meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb rename to meta/recipes-support/libdisplay-info/libdisplay-info_0.3.0.bb index 812a30495e..3dc02261dd 100644 --- a/meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb +++ b/meta/recipes-support/libdisplay-info/libdisplay-info_0.3.0.bb @@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e4426409957080ee0352128354cea2de" DEPENDS = "hwdata-native" SRC_URI = "git://gitlab.freedesktop.org/emersion/libdisplay-info.git;branch=main;protocol=https" -SRCREV = "66b802d05b374cd8f388dc6ad1e7ae4f08cb3300" +SRCREV = "47a5590e9c4eb35d67651b8c05a55f1a48259329" inherit meson pkgconfig lib_package -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228354): https://lists.openembedded.org/g/openembedded-core/message/228354 Mute This Topic: https://lists.openembedded.org/mt/116906924/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
