From bfba446b0087b0467ce10a83a16838d0baedde6984a3ea680ec6a9eb36ebdafc Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 20 Aug 2025 15:29:56 +0200 Subject: [PATCH] Fix build with libdisplay-info 0.3.0 --- weston-libdisplay-info-0.3.0.patch | 28 ++++++++++++++++++++++++++++ weston.changes | 6 ++++++ weston.spec | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 weston-libdisplay-info-0.3.0.patch diff --git a/weston-libdisplay-info-0.3.0.patch b/weston-libdisplay-info-0.3.0.patch new file mode 100644 index 0000000..70f4945 --- /dev/null +++ b/weston-libdisplay-info-0.3.0.patch @@ -0,0 +1,28 @@ +From 394fcf054e3d1e94c254bf1915945fbb44551130 Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Wed, 20 Aug 2025 15:27:15 +0200 +Subject: [PATCH] build: Allow libdisplay-info 0.3.0 + +There are no breaking changes for the high-level API that Weston uses. + +Based on upstream change: https://gitlab.freedesktop.org/wayland/weston/-/commit/683eabb +--- + 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', +-- +2.50.1 + diff --git a/weston.changes b/weston.changes index 07edad1..b515552 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 20 13:29:34 UTC 2025 - Christophe Marin + +- Add patch to allow usage of libdisplay 0.3.0: + * weston-libdisplay-info-0.3.0.patch + ------------------------------------------------------------------- Sat Apr 26 22:08:27 UTC 2025 - Jan Engelhardt diff --git a/weston.spec b/weston.spec index 65de61d..8a5e550 100644 --- a/weston.spec +++ b/weston.spec @@ -29,6 +29,8 @@ URL: https://wayland.freedesktop.org/ #Git-Web: https://cgit.freedesktop.org/wayland/weston/ Source: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/%name-%version.tar.xz Source2: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/%name-%version.tar.xz.sig +# PATCH-FIX-UPSTREAM -- weston-libdisplay-info-0.3.0.patch +Patch0: weston-libdisplay-info-0.3.0.patch BuildRequires: Mesa-libGLESv3-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel >= 2.27 -- 2.51.1