Dylan Aïssi pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits:
-
f16055ed
by Dylan Aïssi at 2024-11-23T09:40:00+01:00
3 changed files:
Changes:
| 1 | +weston (14.0.1-3) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Cherry pick upstream patch allowing to build against neatvnc 0.9.0
|
|
| 4 | + |
|
| 5 | + -- Dylan Aïssi <daissi@debian.org> Sat, 23 Nov 2024 09:39:40 +0100
|
|
| 6 | + |
|
| 1 | 7 | weston (14.0.1-2) unstable; urgency=medium
|
| 2 | 8 | |
| 3 | 9 | [ Carlos Henrique Lima Melara ]
|
| 1 | +vnc_Allow_neatvnc_in_version_0.9.0.patch |
| 1 | +From b4386289d614f26e89e1c6eb17e048826e925ed1 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: Philipp Zabel <p.zabel@pengutronix.de>
|
|
| 3 | +Date: Tue, 19 Nov 2024 17:06:19 +0100
|
|
| 4 | +Subject: [PATCH] vnc: Allow neatvnc in version 0.9.0
|
|
| 5 | + |
|
| 6 | +Neat VNC 0.9.0 is backwards compatible.
|
|
| 7 | + |
|
| 8 | +Origin: upstream, https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1649
|
|
| 9 | + |
|
| 10 | +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
|
| 11 | +---
|
|
| 12 | + libweston/backend-vnc/meson.build | 2 +-
|
|
| 13 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 14 | + |
|
| 15 | +diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
|
|
| 16 | +index 39b15cf902..cf67c51cbf 100644
|
|
| 17 | +--- a/libweston/backend-vnc/meson.build
|
|
| 18 | ++++ b/libweston/backend-vnc/meson.build
|
|
| 19 | +@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
|
|
| 20 | + endif
|
|
| 21 | +
|
|
| 22 | + config_h.set('BUILD_VNC_COMPOSITOR', '1')
|
|
| 23 | +-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
|
|
| 24 | ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
|
|
| 25 | + if not dep_neatvnc.found()
|
|
| 26 | + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
|
|
| 27 | + endif
|
|
| 28 | +--
|
|
| 29 | +GitLab
|
|
| 30 | + |