Backport patch to allow neatvnc 0.9.0 as a dependency

epel10
Neal Gompa 3 months ago
parent 4b599415e1
commit 96e54f872d

@ -0,0 +1,28 @@
From b4386289d614f26e89e1c6eb17e048826e925ed1 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Tue, 19 Nov 2024 17:06:19 +0100
Subject: [PATCH] vnc: Allow neatvnc in version 0.9.0
Neat VNC 0.9.0 is backwards compatible.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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
index 39b15cf902..cf67c51cbf 100644
--- a/libweston/backend-vnc/meson.build
+++ b/libweston/backend-vnc/meson.build
@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
endif
config_h.set('BUILD_VNC_COMPOSITOR', '1')
-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
+dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
if not dep_neatvnc.found()
error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
endif
--
GitLab

@ -2,14 +2,17 @@
Name: weston
Version: 14.0.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Reference compositor for Wayland
# Automatically converted from old format: MIT and CC-BY-SA-3.0 - review is highly recommended.
License: MIT and CC-BY-SA-3.0
URL: http://wayland.freedesktop.org/
Source0: https://gitlab.freedesktop.org/wayland/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
# Backport from upstream
## Allow neatvnc 0.9.0 as a build dependency
Patch0: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1649.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: glib2-devel
@ -52,7 +55,7 @@ BuildRequires: pkgconfig(libva-drm) >= 0.34.0
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libxml-2.0) >= 2.6
BuildRequires: pkgconfig(mtdev) >= 1.1.0
BuildRequires: (pkgconfig(neatvnc) >= 0.7.0 with pkgconfig(neatvnc) < 0.9.0)
BuildRequires: (pkgconfig(neatvnc) >= 0.7.0 with pkgconfig(neatvnc) < 0.10.0)
BuildRequires: pkgconfig(pangocairo)
BuildRequires: pkgconfig(pixman-1) >= 0.25.2
BuildRequires: pkgconfig(wayland-client) >= 1.22.0
@ -214,6 +217,9 @@ Common headers for weston
%{_datadir}/libweston-%{apiver}/protocols/
%changelog
* Thu Nov 21 2024 Neal Gompa <ngompa@fedoraproject.org> - 14.0.1-2
- Backport patch to allow neatvnc 0.9.0 as a dependency
* Mon Nov 11 2024 Neal Gompa <ngompa@fedoraproject.org> - 14.0.1-1
- Update to 14.0.1

Loading…
Cancel
Save