summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorHiago De Franco <hiago.franco@toradex.com>2024-11-05 14:59:08 -0300
committerSteve Sakoman <steve@sakoman.com>2024-11-09 05:53:57 -0800
commit297776b0bfabd8260d0e0b7d332cbc8565c4ae80 (patch)
tree8ad35562cbe65769e2420b645bf03737ec9623ed /meta/recipes-graphics
parentd2da6b5c5668dbc84b905ba2fe4c9b57b580fd82 (diff)
downloadpoky-297776b0bfabd8260d0e0b7d332cbc8565c4ae80.tar.gz
weston: backport patch to allow neatvnc < v0.9.0
Currently weston 13.0.3 with neatvnc 0.8.1 does not compile when using VNC: | Dependency neatvnc found: NO found 0.8.1 but need: '< 0.8.0' ; matched: '>= 0.7.0' However weston upstream already increased the allowed version to 0.9.0, since neatvnc 0.8.0 does not introduce any changes that breaks API used by the VNC backend. Therefore, backport this patch. (From OE-Core rev: 4aa19f4444feb3968110935818d8628a95672539) Signed-off-by: Hiago De Franco <hiago.franco@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8516496018a3ee9e81a67d4682bf9784d0eab2bd) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch27
-rw-r--r--meta/recipes-graphics/wayland/weston_13.0.1.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
new file mode 100644
index 0000000000..4ac1c075fd
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
@@ -0,0 +1,27 @@
1From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001
2From: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
3Date: Mon, 3 Jun 2024 13:39:27 +0200
4Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0
5
6Neat VNC 0.8.0 does not introduce any changes that breaks API used
7by VNC backend, so it is safe to extend compatibility.
8
9Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3]
10Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
11---
12 libweston/backend-vnc/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
16index b7b6916..39b15cf 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.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
24+dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.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
diff --git a/meta/recipes-graphics/wayland/weston_13.0.1.bb b/meta/recipes-graphics/wayland/weston_13.0.1.bb
index dd9517a4dd..d8f0279b65 100644
--- a/meta/recipes-graphics/wayland/weston_13.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_13.0.1.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
8 8
9SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ 9SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
10 file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ 10 file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
11 file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \
11 file://weston.png \ 12 file://weston.png \
12 file://weston.desktop \ 13 file://weston.desktop \
13 file://xwayland.weston-start \ 14 file://xwayland.weston-start \