Message ID | 20241101141354.44546-1-hiagofranco@gmail.com |
---|---|
State | New |
Headers | show |
Series | weston: backport patch to allow neatvnc < v0.9.0 | expand |
On Fri, Nov 01, 2024 at 11:13:54AM -0300, Hiago De Franco wrote: > From: Hiago De Franco <hiago.franco@toradex.com> > > 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. LGTM. Thanks! > Signed-off-by: Hiago De Franco <hiago.franco@toradex.com> > --- > ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 +++++++++++++++++++ > .../recipes-graphics/wayland/weston_13.0.3.bb | 1 + > 2 files changed, 28 insertions(+) > create mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch > > 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 000000000000..4ac1c075fdce > --- /dev/null > +++ b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch > @@ -0,0 +1,27 @@ > +From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001 > +From: Lukasz Czechowski <lukasz.czechowski@thaumatec.com> > +Date: Mon, 3 Jun 2024 13:39:27 +0200 > +Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0 > + > +Neat VNC 0.8.0 does not introduce any changes that breaks API used > +by VNC backend, so it is safe to extend compatibility. > + > +Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3] > +Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com> > +--- > + 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 b7b6916..39b15cf 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.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) > ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.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 > diff --git a/meta/recipes-graphics/wayland/weston_13.0.3.bb b/meta/recipes-graphics/wayland/weston_13.0.3.bb > index dd5b2e2b2700..471dc52bb361 100644 > --- a/meta/recipes-graphics/wayland/weston_13.0.3.bb > +++ b/meta/recipes-graphics/wayland/weston_13.0.3.bb > @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ > > SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ > file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ > + file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \ > file://weston.png \ > file://weston.desktop \ > file://xwayland.weston-start \ >
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 000000000000..4ac1c075fdce --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch @@ -0,0 +1,27 @@ +From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001 +From: Lukasz Czechowski <lukasz.czechowski@thaumatec.com> +Date: Mon, 3 Jun 2024 13:39:27 +0200 +Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0 + +Neat VNC 0.8.0 does not introduce any changes that breaks API used +by VNC backend, so it is safe to extend compatibility. + +Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3] +Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com> +--- + 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 b7b6916..39b15cf 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.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.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 diff --git a/meta/recipes-graphics/wayland/weston_13.0.3.bb b/meta/recipes-graphics/wayland/weston_13.0.3.bb index dd5b2e2b2700..471dc52bb361 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.3.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ + file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \